> -----Original Message----- > From: u-boot-boun...@lists.denx.de > [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud > Sent: Friday, September 24, 2010 1:19 AM > To: u-boot@lists.denx.de > Subject: [U-Boot] [PATCH V2 1/2] [NEXT] orion5x: fix > relocation-incompatible code > > > Signed-off-by: Albert Aribaud <albert.arib...@free.fr> > --- > SUMMARY > > Device address window mapping code would not run from > FLASH due to cutting access to BOOTCS. Fixed by reordering > code. > > Timer initialization would write globals, thus would not > run correctly from FLASH. Fixed by moving the writes to a > later phase in RAM. > > PATCHSET HISTORY > > V1 Initial submission > V2 Removed useless blank line in config.mk > Fixed typo in config file > Reordered window inits in cpu.c > Added newline at end of timer.c > > These patches show 0 error or warning with checkpatch.pl --no-tree > and have been tested on edminiv2. > > arch/arm/cpu/arm926ejs/orion5x/cpu.c | 78 > +++++++++++++++++++----------- > arch/arm/cpu/arm926ejs/orion5x/timer.c | 6 ++- > arch/arm/include/asm/arch-orion5x/cpu.h | 1 + > 3 files changed, 54 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c > b/arch/arm/cpu/arm926ejs/orion5x/cpu.c > index 260f88b..c36d7bf 100644 > --- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c > +++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c > @@ -77,6 +77,17 @@ unsigned int > orion5x_winctrl_calcsize(unsigned int sizeval) > * > * If remap function not used, remap_lo must be set as base > * > + * NOTES: > + * > + * 1) in order to avoid windows with inconsistent control > and base values > + * (which could prevent access to BOOTCS and hence > execution from FLASH) > + * always disable window before writing the base value > then reenable it > + * by writing the control value. > + * > + * 2) in order to avoid losing access to BOOTCS when > disabling window 7, > + * first configure window 6 for BOOTCS, then configure > window 7 for BOOTCS, > + * then configure windows 6 for its own target. > + * > * Reference Documentation: > * Mbus-L to Mbus Bridge Registers Configuration. > * (Sec 25.1 and 25.3 of Datasheet) > @@ -86,57 +97,64 @@ int orion5x_config_adr_windows(void) > struct orion5x_win_registers *winregs = > (struct orion5x_win_registers *)ORION5X_CPU_WIN_BASE; > > - /* Window 0: PCIE MEM address space */ > - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_MEM, > - ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_MEM, > - ORION5X_WIN_ENABLE), &winregs[0].ctrl); > +/* Disable window 0, configure it for its intended target, > enable it. */ > + writel(0, &winregs[0].ctrl); > writel(ORION5X_ADR_PCIE_MEM, &winregs[0].base); > writel(ORION5X_ADR_PCIE_MEM_REMAP_LO, &winregs[0].remap_lo); > writel(ORION5X_ADR_PCIE_MEM_REMAP_HI, &winregs[0].remap_hi); > - > - /* Window 1: PCIE IO address space */ > - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_IO, > - ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_IO, > - ORION5X_WIN_ENABLE), &winregs[1].ctrl); > + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_MEM, > + ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_MEM, > + ORION5X_WIN_ENABLE), &winregs[0].ctrl); > +/* Disable window 1, configure it for its intended target, > enable it. */ > + writel(0, &winregs[1].ctrl); > writel(ORION5X_ADR_PCIE_IO, &winregs[1].base); > writel(ORION5X_ADR_PCIE_IO_REMAP_LO, &winregs[1].remap_lo); > writel(ORION5X_ADR_PCIE_IO_REMAP_HI, &winregs[1].remap_hi); > - > - /* Window 2: PCI MEM address space */ > + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_IO, > + ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_IO, > + ORION5X_WIN_ENABLE), &winregs[1].ctrl); > +/* Disable window 2, configure it for its intended target, > enable it. */ > + writel(0, &winregs[2].ctrl); > + writel(ORION5X_ADR_PCI_MEM, &winregs[2].base); > writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCI_MEM, > ORION5X_TARGET_PCI, ORION5X_ATTR_PCI_MEM, > ORION5X_WIN_ENABLE), &winregs[2].ctrl); > - writel(ORION5X_ADR_PCI_MEM, &winregs[2].base); > - > - /* Window 3: PCI IO address space */ > +/* Disable window 3, configure it for its intended target, > enable it. */ > + writel(0, &winregs[3].ctrl); > + writel(ORION5X_ADR_PCI_IO, &winregs[3].base); > writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCI_IO, > ORION5X_TARGET_PCI, ORION5X_ATTR_PCI_IO, > ORION5X_WIN_ENABLE), &winregs[3].ctrl); > - writel(ORION5X_ADR_PCI_IO, &winregs[3].base); > - > - /* Window 4: DEV_CS0 address space */ > +/* Disable window 4, configure it for its intended target, > enable it. */ > + writel(0, &winregs[4].ctrl); > + writel(ORION5X_ADR_DEV_CS0, &winregs[4].base); > writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS0, > ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS0, > ORION5X_WIN_ENABLE), &winregs[4].ctrl); > - writel(ORION5X_ADR_DEV_CS0, &winregs[4].base); > - > - /* Window 5: DEV_CS1 address space */ > +/* Disable window 5, configure it for its intended target, > enable it. */ > + writel(0, &winregs[5].ctrl); > + writel(ORION5X_ADR_DEV_CS1, &winregs[5].base); > writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS1, > ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS1, > ORION5X_WIN_ENABLE), &winregs[5].ctrl); > - writel(ORION5X_ADR_DEV_CS1, &winregs[5].base); > - > - /* Window 6: DEV_CS2 address space */ > - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS2, > - ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS2, > +/* Disable window 6, configure it for FLASH, enable it. */ > + writel(0, &winregs[6].ctrl); > + writel(ORION5X_ADR_BOOTROM, &winregs[6].base); > + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_BOOTROM, > + ORION5X_TARGET_DEVICE, ORION5X_ATTR_BOOTROM, > ORION5X_WIN_ENABLE), &winregs[6].ctrl); > - writel(ORION5X_ADR_DEV_CS2, &winregs[6].base); > - > - /* Window 7: BOOT Memory address space */ > +/* Disable window 7, configure it for FLASH, enable it. */ > + writel(0, &winregs[7].ctrl); > + writel(ORION5X_ADR_BOOTROM, &winregs[7].base); > writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_BOOTROM, > ORION5X_TARGET_DEVICE, ORION5X_ATTR_BOOTROM, > ORION5X_WIN_ENABLE), &winregs[7].ctrl); > - writel(ORION5X_ADR_BOOTROM, &winregs[7].base); > +/* Disable window 6, configure it for its intended target, > enable it. */ > + writel(0, &winregs[6].ctrl);
This conflicts with above win6 configuration. If done purposely then pls provide comments. Regards.. Prafulla . . _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
