[PATCH] pbl updates

[PATCH] pbl updates

[Sascha Hauer]

Here are two updates for the MMU code in the decompressor. The first
one may come in handy when a JTAG debugger is connected. The second
one is more important. It actually makes turning on the MMU in the
decompressor useful by making map_cachable work. It turned out that
this didn't work leaving the whole mapping uncached.
Note that the code in current master should work, but slow. Since
it actually does work I do not want to put this into the upcoming
release.

Sascha

----------------------------------------------------------------
Sascha Hauer (2):
      ARM pbl: Provide a dummy error function for the decompressor
      ARM pbl: actually create cached mappings in the decompressor

 arch/arm/cpu/start-pbl.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/2] ARM pbl: Provide a dummy error function for the decompressor

[Sascha Hauer]

We can't do anything useful in the error function, so we just hang.
This has the advantage that at least when a JTAG debugger is connected
we can see what happens. Otherwise the code just jumps to NULL in case
of an error.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/start-pbl.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 932a3da..2cd33ce 100644
--- a/arch/arm/cpu/start-pbl.c
+++ b/arch/arm/cpu/start-pbl.c
@@ -113,6 +113,11 @@ static void mmu_disable(void)
 	__mmu_cache_off();
 }
 
+void noinline errorfn(char *error)
+{
+	while (1);
+}
+
 static void barebox_uncompress(void *compressed_start, unsigned int len)
 {
 	void (*barebox)(void);
@@ -135,7 +140,7 @@ static void barebox_uncompress(void *compressed_start, unsigned int len)
 	decompress((void *)compressed_start,
 			len,
 			NULL, NULL,
-			(void *)TEXT_BASE, NULL, NULL);
+			(void *)TEXT_BASE, NULL, errorfn);
 
 	if (use_mmu)
 		mmu_disable();
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ARM pbl: actually create cached mappings in the decompressor

[Sascha Hauer]

We called create_sections with 4096MB as size argument, but create_sections
expected the argument in bytes, so create sections was completely optimized
away due to the size >>= 20. This patch changes the size argument to be in
megabytes and adjusts map_cachable to pass the argument in megabytes.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/cpu/start-pbl.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 2cd33ce..1626eb3 100644
--- a/arch/arm/cpu/start-pbl.c
+++ b/arch/arm/cpu/start-pbl.c
@@ -56,14 +56,13 @@ extern void *input_data_end;
 
 static unsigned long *ttb;
 
-static void create_sections(unsigned long addr, int size, unsigned int flags)
+static void create_sections(unsigned long addr, int size_m, unsigned int flags)
 {
 	int i;
 
 	addr >>= 20;
-	size >>= 20;
 
-	for (i = size; i > 0; i--, addr++)
+	for (i = size_m; i > 0; i--, addr++)
 		ttb[addr] = (addr << 20) | flags;
 }
 
@@ -72,7 +71,7 @@ static void map_cachable(unsigned long start, unsigned long size)
 	start &= ~(SZ_1M - 1);
 	size = (size + (SZ_1M - 1)) & ~(SZ_1M - 1);
 
-	create_sections(start, size, PMD_SECT_AP_WRITE |
+	create_sections(start, size >> 20, PMD_SECT_AP_WRITE |
 			PMD_SECT_AP_READ | PMD_TYPE_SECT | PMD_SECT_WB);
 }
 
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] pbl updates

[Jean-Christophe PLAGNIOL-VILLARD]

On 15:06 Tue 02 Oct     , Sascha Hauer wrote:
> Here are two updates for the MMU code in the decompressor. The first
> one may come in handy when a JTAG debugger is connected. The second
> one is more important. It actually makes turning on the MMU in the
> decompressor useful by making map_cachable work. It turned out that
> this didn't work leaving the whole mapping uncached.
> Note that the code in current master should work, but slow. Since
> it actually does work I do not want to put this into the upcoming
> release.
As I report the current code does not work on at91sam9g45
I suspect as we boot from the second ram controler on this SoC

So please hold the release that I can try those patch on sam9g45 if they fix
the PBL they will be mandatory for it

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] pbl updates

[Sascha Hauer]

On Tue, Oct 02, 2012 at 04:30:11PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 15:06 Tue 02 Oct     , Sascha Hauer wrote:
> > Here are two updates for the MMU code in the decompressor. The first
> > one may come in handy when a JTAG debugger is connected. The second
> > one is more important. It actually makes turning on the MMU in the
> > decompressor useful by making map_cachable work. It turned out that
> > this didn't work leaving the whole mapping uncached.
> > Note that the code in current master should work, but slow. Since
> > it actually does work I do not want to put this into the upcoming
> > release.
> As I report the current code does not work on at91sam9g45
> I suspect as we boot from the second ram controler on this SoC
> 
> So please hold the release that I can try those patch on sam9g45 if they fix
> the PBL they will be mandatory for it

I think they won't fix it. map_cachable currently is a noop, but this
should be fine as now we have a complete 1:1 uncached mapping. I don't
see why this shouldn't work. I hope you find out.

What we can do for now is to add an additional Kconfig option to make
enabling the MMU in the pbl optional. Then at least it should work on
your boards.

BTW I hunted down a strange problem with the MMU on a KaRO Tx53 board.
It turned out that the image header (which basically is a poke table
to initialize the SDRAM) indeed initialized the SDRAM. The problem was
that this SDRAM setup depends on some other lowlevel setup which is done
later. The SDRAM setup was good enough to load with MMU disabled, but
once the MMU is enabled the SDRAM does burst accesses and the board goes
to nirvana.
Maybe your problem is related somehow.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] pbl updates

[Jean-Christophe PLAGNIOL-VILLARD]

On 18:50 Tue 02 Oct     , Sascha Hauer wrote:
> On Tue, Oct 02, 2012 at 04:30:11PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 15:06 Tue 02 Oct     , Sascha Hauer wrote:
> > > Here are two updates for the MMU code in the decompressor. The first
> > > one may come in handy when a JTAG debugger is connected. The second
> > > one is more important. It actually makes turning on the MMU in the
> > > decompressor useful by making map_cachable work. It turned out that
> > > this didn't work leaving the whole mapping uncached.
> > > Note that the code in current master should work, but slow. Since
> > > it actually does work I do not want to put this into the upcoming
> > > release.
> > As I report the current code does not work on at91sam9g45
> > I suspect as we boot from the second ram controler on this SoC
> > 
> > So please hold the release that I can try those patch on sam9g45 if they fix
> > the PBL they will be mandatory for it
> 
> I think they won't fix it. map_cachable currently is a noop, but this
> should be fine as now we have a complete 1:1 uncached mapping. I don't
> see why this shouldn't work. I hope you find out.
> 
> What we can do for now is to add an additional Kconfig option to make
> enabling the MMU in the pbl optional. Then at least it should work on
> your boards.
Was thinking about this too
> 
> BTW I hunted down a strange problem with the MMU on a KaRO Tx53 board.
> It turned out that the image header (which basically is a poke table
> to initialize the SDRAM) indeed initialized the SDRAM. The problem was
> that this SDRAM setup depends on some other lowlevel setup which is done
> later. The SDRAM setup was good enough to load with MMU disabled, but
> once the MMU is enabled the SDRAM does burst accesses and the board goes
> to nirvana.
> Maybe your problem is related somehow.
yeah It may solve my issue with the MMU and nand boot

I was thinking to add a initcall support to the pbl and enable the MMU at the
right momment. This will allow to simplify the adding of generic SPL framework

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] pbl updates

[Sascha Hauer]

On Tue, Oct 02, 2012 at 08:36:41PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 18:50 Tue 02 Oct     , Sascha Hauer wrote:
> > On Tue, Oct 02, 2012 at 04:30:11PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > On 15:06 Tue 02 Oct     , Sascha Hauer wrote:
> > > > Here are two updates for the MMU code in the decompressor. The first
> > > > one may come in handy when a JTAG debugger is connected. The second
> > > > one is more important. It actually makes turning on the MMU in the
> > > > decompressor useful by making map_cachable work. It turned out that
> > > > this didn't work leaving the whole mapping uncached.
> > > > Note that the code in current master should work, but slow. Since
> > > > it actually does work I do not want to put this into the upcoming
> > > > release.
> > > As I report the current code does not work on at91sam9g45
> > > I suspect as we boot from the second ram controler on this SoC
> > > 
> > > So please hold the release that I can try those patch on sam9g45 if they fix
> > > the PBL they will be mandatory for it
> > 
> > I think they won't fix it. map_cachable currently is a noop, but this
> > should be fine as now we have a complete 1:1 uncached mapping. I don't
> > see why this shouldn't work. I hope you find out.
> > 
> > What we can do for now is to add an additional Kconfig option to make
> > enabling the MMU in the pbl optional. Then at least it should work on
> > your boards.
> Was thinking about this too

Ok, I'll prepare a patch.

> > 
> > BTW I hunted down a strange problem with the MMU on a KaRO Tx53 board.
> > It turned out that the image header (which basically is a poke table
> > to initialize the SDRAM) indeed initialized the SDRAM. The problem was
> > that this SDRAM setup depends on some other lowlevel setup which is done
> > later. The SDRAM setup was good enough to load with MMU disabled, but
> > once the MMU is enabled the SDRAM does burst accesses and the board goes
> > to nirvana.
> > Maybe your problem is related somehow.
> yeah It may solve my issue with the MMU and nand boot
> 
> I was thinking to add a initcall support to the pbl and enable the MMU at the
> right momment. This will allow to simplify the adding of generic SPL framework

I don't think this is a good idea. I don't want to grow a second
bootloader in the pbl. It should stay simple.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] pbl updates

[Jean-Christophe PLAGNIOL-VILLARD]

On 12:06 Wed 03 Oct     , Sascha Hauer wrote:
> On Tue, Oct 02, 2012 at 08:36:41PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 18:50 Tue 02 Oct     , Sascha Hauer wrote:
> > > On Tue, Oct 02, 2012 at 04:30:11PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > On 15:06 Tue 02 Oct     , Sascha Hauer wrote:
> > > > > Here are two updates for the MMU code in the decompressor. The first
> > > > > one may come in handy when a JTAG debugger is connected. The second
> > > > > one is more important. It actually makes turning on the MMU in the
> > > > > decompressor useful by making map_cachable work. It turned out that
> > > > > this didn't work leaving the whole mapping uncached.
> > > > > Note that the code in current master should work, but slow. Since
> > > > > it actually does work I do not want to put this into the upcoming
> > > > > release.
> > > > As I report the current code does not work on at91sam9g45
> > > > I suspect as we boot from the second ram controler on this SoC
> > > > 
> > > > So please hold the release that I can try those patch on sam9g45 if they fix
> > > > the PBL they will be mandatory for it
> > > 
> > > I think they won't fix it. map_cachable currently is a noop, but this
> > > should be fine as now we have a complete 1:1 uncached mapping. I don't
> > > see why this shouldn't work. I hope you find out.
> > > 
> > > What we can do for now is to add an additional Kconfig option to make
> > > enabling the MMU in the pbl optional. Then at least it should work on
> > > your boards.
> > Was thinking about this too
> 
> Ok, I'll prepare a patch.
> 
> > > 
> > > BTW I hunted down a strange problem with the MMU on a KaRO Tx53 board.
> > > It turned out that the image header (which basically is a poke table
> > > to initialize the SDRAM) indeed initialized the SDRAM. The problem was
> > > that this SDRAM setup depends on some other lowlevel setup which is done
> > > later. The SDRAM setup was good enough to load with MMU disabled, but
> > > once the MMU is enabled the SDRAM does burst accesses and the board goes
> > > to nirvana.
> > > Maybe your problem is related somehow.
> > yeah It may solve my issue with the MMU and nand boot
> > 
> > I was thinking to add a initcall support to the pbl and enable the MMU at the
> > right momment. This will allow to simplify the adding of generic SPL framework
> 
> I don't think this is a good idea. I don't want to grow a second
> bootloader in the pbl. It should stay simple.
I want to add spi boot and mmc boot where the non shell barebox is too big to
fit in sram

Begards,
J.
> 
> Sascha
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH] pbl updates

[Sascha Hauer]

Hi All,

The following makes the pbl support on most (all?) ARM boards. If it
doesn't work on your board, please report.

Sascha

The following changes since commit b859e325e928d19d5cfefa9a45c4ff1ebe502430:

  Merge tag 'pbl' of git://git.jcrosoft.org/barebox into for-next/pbl (2012-08-03 15:55:53 +0200)

are available in the git repository at:


  git://git.pengutronix.de/git/barebox.git work/pbl

for you to fetch changes up to 81aa36b58daa6517e01bb538db85126dc8dda8eb:

  ARM pbl: generate zbarebox.map in $(obj) (2012-08-10 21:49:37 +0200)

----------------------------------------------------------------
Sascha Hauer (9):
      ARM eukrea cpuimx25: Move flash_header to seperate file
      ARM s3c boards: Do not hardcode image sizes
      ARM boards: Make boards pbl safe
      ARM Makefile: Do not hardcode targets in MLO/netx/davinci/s5p
      ARM: fix netx/MLO/s5p image build for pbl
      ARM Makefile: generate a barebox-flash-image link
      ARM pbl: Fix zbarebox.S build
      ARM pbl: remove unnecessary FORCE
      ARM pbl: generate zbarebox.map in $(obj)

 arch/arm/Makefile                                 |   52 +++++++++++-------
 arch/arm/boards/a9m2410/Makefile                  |    1 +
 arch/arm/boards/a9m2410/a9m2410.c                 |    7 ---
 arch/arm/boards/a9m2440/Makefile                  |    1 +
 arch/arm/boards/a9m2440/a9m2440.c                 |    7 ---
 arch/arm/boards/ccxmx51/Makefile                  |    1 +
 arch/arm/boards/edb93xx/Makefile                  |    1 +
 arch/arm/boards/eukrea_cpuimx25/Makefile          |    3 +
 arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |   34 ------------
 arch/arm/boards/eukrea_cpuimx25/flash_header.c    |   61 +++++++++++++++++++++
 arch/arm/boards/eukrea_cpuimx27/Makefile          |    1 +
 arch/arm/boards/eukrea_cpuimx35/Makefile          |    2 +
 arch/arm/boards/eukrea_cpuimx51/Makefile          |    1 +
 arch/arm/boards/freescale-mx25-3-stack/Makefile   |    1 +
 arch/arm/boards/freescale-mx35-3-stack/Makefile   |    2 +
 arch/arm/boards/freescale-mx51-pdk/Makefile       |    1 +
 arch/arm/boards/freescale-mx53-loco/Makefile      |    1 +
 arch/arm/boards/freescale-mx53-smd/Makefile       |    1 +
 arch/arm/boards/freescale-mx6-arm2/Makefile       |    1 +
 arch/arm/boards/freescale-mx6-sabrelite/Makefile  |    1 +
 arch/arm/boards/friendlyarm-mini2440/Makefile     |    1 +
 arch/arm/boards/friendlyarm-mini2440/mini2440.c   |    7 ---
 arch/arm/boards/guf-cupid/Makefile                |    1 +
 arch/arm/boards/guf-neso/Makefile                 |    3 +-
 arch/arm/boards/imx21ads/Makefile                 |    1 +
 arch/arm/boards/imx27ads/Makefile                 |    1 +
 arch/arm/boards/karo-tx25/Makefile                |    1 +
 arch/arm/boards/karo-tx51/Makefile                |    3 +-
 arch/arm/boards/netx/Makefile                     |    2 +-
 arch/arm/boards/panda/Makefile                    |    4 +-
 arch/arm/boards/pcm027/Makefile                   |    1 +
 arch/arm/boards/pcm037/Makefile                   |    1 +
 arch/arm/boards/pcm038/Makefile                   |    1 +
 arch/arm/boards/pcm043/Makefile                   |    1 +
 arch/arm/boards/pcm049/Makefile                   |    1 +
 arch/arm/boards/phycard-a-xl2/Makefile            |    1 +
 arch/arm/boards/phycard-i.MX27/Makefile           |    1 +
 arch/arm/boards/scb9328/Makefile                  |    1 +
 arch/arm/boards/tqma53/Makefile                   |    1 +
 arch/arm/mach-ep93xx/Makefile                     |    1 +
 arch/arm/mach-imx/Makefile                        |    1 +
 arch/arm/mach-omap/Makefile                       |    3 +
 arch/arm/mach-samsung/Makefile                    |    2 +
 arch/arm/pbl/Makefile                             |    7 ++-
 drivers/mtd/nand/Makefile                         |    1 +
 drivers/mtd/nand/nand_s3c24xx.c                   |   10 ++++
 46 files changed, 156 insertions(+), 82 deletions(-)
 create mode 100644 arch/arm/boards/eukrea_cpuimx25/flash_header.c

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox