From: jon-hunter@ti•com (Jon Hunter)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/2] ARM: OMAP2: Fix GPMC memory initialisation
Date: Fri, 1 Feb 2013 19:22:05 -0600 [thread overview]
Message-ID: <510C6A3D.70401@ti.com> (raw)
In-Reply-To: <20130201215154.GV22517@atomide.com>
On 02/01/2013 03:51 PM, Tony Lindgren wrote:
> Hi Jon,
>
> * Jon Hunter <jon-hunter@ti•com> [130201 08:42]:
>> --- a/arch/arm/mach-omap2/gpmc.c
>> +++ b/arch/arm/mach-omap2/gpmc.c
>> @@ -32,6 +32,7 @@
>>
>> #include "soc.h"
>> #include "common.h"
>> +#include "control.h"
>> #include "omap_device.h"
>> #include "gpmc.h"
>>
>> @@ -778,18 +779,26 @@ static void gpmc_mem_exit(void)
>> static int gpmc_mem_init(void)
>> {
>> int cs, rc;
>> - unsigned long boot_rom_space = 0;
>>
>> - /* never allocate the first page, to facilitate bug detection;
>> - * even if we didn't boot from ROM.
>> + /*
>> + * The first 1MB of GPMC address space is mapped to the
>> + * internal ROM. OMAP2 devices are an exception to this
>> + * where the first 1MB may be mapped to the GPMC.
>> */
>> - boot_rom_space = BOOT_ROM_SPACE;
>> - /* In apollon the CS0 is mapped as 0x0000 0000 */
>> - if (machine_is_omap_apollon())
>> - boot_rom_space = 0;
>
> This part is going away anyways with the patch dropping apollon
> board support from Kyungin.
Yes just saw that today.
>> - gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
>> + gpmc_mem_root.start = GPMC_MEM_START + BOOT_ROM_SPACE;
>> gpmc_mem_root.end = GPMC_MEM_END;
>>
>> + /*
>> + * OMAP2 devices that boot from external memory devices, will
>> + * map CS0 to the start of the GPMC address space (0x0). We can
>> + * test this by checking if SYS_BOOT3 pin is set. If not set
>> + * then CS0 is mapped to 0x0.
>> + */
>> + if (cpu_is_omap24xx())
>> + if (!(omap_ctrl_readl(OMAP24XX_CONTROL_STATUS) &
>> + OMAP2_SYSBOOT_3_MASK))
>> + gpmc_mem_root.start = GPMC_MEM_START;
>> +
>> /* Reserve all regions that has been set up by bootloader */
>> for (cs = 0; cs < GPMC_CS_NUM; cs++) {
>> u32 base, size;
>
> How about let's fix this properly to start with so we don't add
> more blockers moving this code to drivers/bus?
>
> Looks like gpmc_mem_init() gets called from gpmc_probe() so
> we can pass that information in pdev.
I wondered if you would suggest that ;-)
I definitely can and it is probably best. Things like this become
painful when we move to device-tree. We really need a generic way for
passing stuff like this to drivers for omap. Our options are auxdata or
bus notifiers. I am wondering whether we can plug pdata in the
omap_device bus notifier for device-tree. Let me know if you have any
thoughts.
Cheers
Jon
next prev parent reply other threads:[~2013-02-02 1:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 16:38 [PATCH 0/2] ARM: OMAP2+: GPMC Fixes Jon Hunter
2013-02-01 16:38 ` [PATCH 1/2] ARM: OMAP2+: Prevent potential crash if GPMC probe fails Jon Hunter
2013-02-01 22:08 ` Tony Lindgren
2013-02-08 22:56 ` Jon Hunter
2013-02-09 15:55 ` Ezequiel Garcia
2013-02-14 12:04 ` Philip, Avinash
2013-02-16 22:37 ` Grazvydas Ignotas
2013-02-01 16:38 ` [PATCH 2/2] ARM: OMAP2: Fix GPMC memory initialisation Jon Hunter
2013-02-01 21:51 ` Tony Lindgren
2013-02-02 1:22 ` Jon Hunter [this message]
2013-02-02 18:11 ` Tony Lindgren
2013-02-04 15:05 ` Jon Hunter
2013-02-04 17:45 ` Tony Lindgren
2013-02-04 18:46 ` Jon Hunter
2013-02-04 19:15 ` Tony Lindgren
2013-02-04 19:33 ` Jon Hunter
2013-02-04 19:47 ` Tony Lindgren
2013-02-04 19:51 ` Jon Hunter
2013-02-04 22:12 ` Jon Hunter
2013-02-04 22:45 ` Jon Hunter
2013-02-05 23:34 ` Tony Lindgren
2013-02-06 0:22 ` Jon Hunter
2013-02-06 17:28 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=510C6A3D.70401@ti.com \
--to=jon-hunter@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox