Skip to contentSkip to conversation

mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

PATCH Superseded Simon Horman 3 participants 13 messages Dec 6, 2010

Subsystems (6)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

This short series allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

The first two patches make minor preparatory changes to the MMCIF code. The last patch contains the code to load from the MMCIF hardware block.

maintainer
#2 lore raw

PATCH 1/3 mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h

Quoted 4 lines · Simon Horman

Allow MMCIF_PROGRESS_* to be shared.

I'm a bit hesitant to this change. This because the progress really hasn't anything to do with the MMCIF hardware block. The enum does use the MMCIF prefix though, so I guess i should be silent. =)

In the future I can imagine that there will be more boards making use of this feature, and other MMC/SD-capable hardware blocks that want to support early loading. Perhaps moving the enum into the header like you suggest is the easiest way forward. Unless there is any easy way to share the same progress code between MMCIF and say SDHI.

Thanks,

/ magnus

#3 lore raw

PATCH 1/3 mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h

Quoted 10 lines · Magnus Damm
Quoted 4 lines · Simon Horman

Allow MMCIF_PROGRESS_* to be shared.

I'm a bit hesitant to this change. This because the progress really hasn't anything to do with the MMCIF hardware block. The enum does use the MMCIF prefix though, so I guess i should be silent. =)

Quoted 5 lines

In the future I can imagine that there will be more boards making use of this feature, and other MMC/SD-capable hardware blocks that want to support early loading. Perhaps moving the enum into the header like you suggest is the easiest way forward. Unless there is any easy way to share the same progress code between MMCIF and say SDHI.

The way that I see things is that with the last patch in this series there are two files using these enums, one under arch/sh and one under arch/arm. They both relate to using MMCIF. And they both assume that there are states we are interested in that can be usefully displayed. If SHDI can make use of this it may make sense to move it somewhere else at that time.

OTOH, its just 4 integers and this is really just debugging code. I wouldn't be opposed to removing it altogether.

maintainer
#4 lore raw

PATCH 1/3 mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h

Quoted 17 lines · Simon Horman
Quoted 10 lines · Magnus Damm
Quoted 4 lines · Simon Horman

Allow MMCIF_PROGRESS_* to be shared.

I'm a bit hesitant to this change. This because the progress really hasn't anything to do with the MMCIF hardware block. The enum does use the MMCIF prefix though, so I guess i should be silent. =)

Quoted 5 lines

In the future I can imagine that there will be more boards making use of this feature, and other MMC/SD-capable hardware blocks that want to support early loading. Perhaps moving the enum into the header like you suggest is the easiest way forward. Unless there is any easy way to share the same progress code between MMCIF and say SDHI.

Quoted 4 lines

The way that I see things is that with the last patch in this series there are two files using these enums, one under arch/sh and one under arch/arm. They both relate to using MMCIF. And they both assume that there are states we are interested in that can be usefully displayed.

Sure.

Quoted 2 lines

If SHDI can make use of this it may make sense to move it somewhere else at that time.

Yeah, dealing with it at that point is probably the easiest.

Quoted 2 lines

OTOH, its just 4 integers and this is really just debugging code. I wouldn't be opposed to removing it altogether.

I'd rather keep it. The MMC loader code is a rather new development so having some early debug output option makes sense.

Thanks,

/ magnus

#7 lore raw

PATCH 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

Quoted 11 lines · Simon Horman

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

Quoted 8 lines

---

This patch depends on "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.

This patch also depends on the previous two patches in this series.

maintainer
#8 lore raw

PATCH 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

In reply to Simon Horman

Hi Simon,

Thanks for your work on this!

Quoted 70 lines · Simon Horman

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

---

This patch depends on "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.

Index: linux-2.6-ap4/arch/arm/boot/compressed/mmcif-sh7372.c
===================================================================

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +45 -0
@@ -0,0 +1,99 @@
+/*
+ * sh7372 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ * Copyright (C) 2010 Simon Horman
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/mmcif.h>
+
+#define MMCIF_BASE ? ? ?(void __iomem *)0xe6bd0000
+
+#define PORT84CR ? ? ? 0xe6050054
+#define PORT85CR ? ? ? 0xe6050055
+#define PORT86CR ? ? ? 0xe6050056
+#define PORT87CR ? ? ? 0xe6050057
+#define PORT88CR ? ? ? 0xe6050058
+#define PORT89CR ? ? ? 0xe6050059
+#define PORT90CR ? ? ? 0xe605005a
+#define PORT91CR ? ? ? 0xe605005b
+#define PORT92CR ? ? ? 0xe605005c
+#define PORT99CR ? ? ? 0xe6050063
+#define PORT185CR ? ? ?0xe60520b9
+#define PORT186CR ? ? ?0xe60520ba
+#define PORT187CR ? ? ?0xe60520bb
+#define PORT188CR ? ? ?0xe60520bc
+
+#define SMSTPCR3 ? ? ? 0xe615013c
+
+/* SH7372 specific MMCIF loader
+ *
+ * loads the zImage from an MMC card starting from block 1.
+ *
+ * The image must be start with a vrl4 header and
+ * the zImage must start at offset 512 of the image. That is,
+ * at block 2 (=byte 1024) on the media
+ *
+ * Use the following line to write the vrl4 formated zImage
+ * to an MMC card
+ * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
+ */

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 line 55

Quoted 10 lines
arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +10 -0
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
+{
+ ? ? ? /* Initialise LEDS1-4
+ ? ? ? ?* registers: PORT185CR-PORT188CR (LED1-LED4 Control)
+ ? ? ? ?* value: ? ? 0x10 - enable output
+ ? ? ? ?*/
+ ? ? ? __raw_writeb(0x10, PORT185CR);
+ ? ? ? __raw_writeb(0x10, PORT186CR);
+ ? ? ? __raw_writeb(0x10, PORT187CR);
+ ? ? ? __raw_writeb(0x10, PORT188CR);

Aren't these LEDs a board-specific property?

I believe the rest of the code is common across multiple boards, so making it fully sharable would be nice.

Please break out the board-specific somehow, perhaps into mmcif_update_progress().

Quoted 9 lines

Index: linux-2.6-ap4/arch/arm/boot/compressed/head-shmobile.S
===================================================================

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +0 -0
@@ -40,14 +59,19 @@ __atags:@ tag #1

? ? ? ?@ tag #3
? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.size = 0 ? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.tag = ATAG_NONE; -1:

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900

Quoted 8 lines
arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +8 -0
+__mach_type:
+ ? ? ? .long ? MACH_TYPE
+__image_start:
+ ? ? ? .long ? _start
+__image_end:
+ ? ? ? .long ? _got_end
+__load_base:
+ ? ? ? .long ? CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

Just curious, where does these 32Mb come from?

Say that a board with be equipped with less than 32Mb, how is that handled?

Quoted 5 lines

Index: linux-2.6-ap4/Documentation/arm/SH-Mobile/vrl4.c
===================================================================

Documentation/arm/SH-Mobile/vrl4.c ? ?2010-12-06 09:11:42.000000000 +0900 line 9

Quoted 9 lines
Documentation/arm/SH-Mobile/vrl4.c ? ?2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +9 -0
@@ -0,0 +1,167 @@
+/*
+ * vrl4 format generator
+ *
+ * Copyright (C) 2010 Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */

That's sweet, but I don't think I've got anything to do with this portion of the code. =)

Apart from those minor points it all looks very good IMO!

/ magnus

#9 lore raw

PATCH 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

Quoted 88 lines · Magnus Damm

Hi Simon,

Thanks for your work on this!

Quoted 70 lines · Simon Horman

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

---

This patch depends on "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.

Index: linux-2.6-ap4/arch/arm/boot/compressed/mmcif-sh7372.c
===================================================================

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +45 -0
@@ -0,0 +1,99 @@
+/*
+ * sh7372 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ * Copyright (C) 2010 Simon Horman
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/mmcif.h>
+
+#define MMCIF_BASE ? ? ?(void __iomem *)0xe6bd0000
+
+#define PORT84CR ? ? ? 0xe6050054
+#define PORT85CR ? ? ? 0xe6050055
+#define PORT86CR ? ? ? 0xe6050056
+#define PORT87CR ? ? ? 0xe6050057
+#define PORT88CR ? ? ? 0xe6050058
+#define PORT89CR ? ? ? 0xe6050059
+#define PORT90CR ? ? ? 0xe605005a
+#define PORT91CR ? ? ? 0xe605005b
+#define PORT92CR ? ? ? 0xe605005c
+#define PORT99CR ? ? ? 0xe6050063
+#define PORT185CR ? ? ?0xe60520b9
+#define PORT186CR ? ? ?0xe60520ba
+#define PORT187CR ? ? ?0xe60520bb
+#define PORT188CR ? ? ?0xe60520bc
+
+#define SMSTPCR3 ? ? ? 0xe615013c
+
+/* SH7372 specific MMCIF loader
+ *
+ * loads the zImage from an MMC card starting from block 1.
+ *
+ * The image must be start with a vrl4 header and
+ * the zImage must start at offset 512 of the image. That is,
+ * at block 2 (=byte 1024) on the media
+ *
+ * Use the following line to write the vrl4 formated zImage
+ * to an MMC card
+ * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
+ */

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 line 55

Quoted 10 lines
arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +10 -0
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
+{
+ ? ? ? /* Initialise LEDS1-4
+ ? ? ? ?* registers: PORT185CR-PORT188CR (LED1-LED4 Control)
+ ? ? ? ?* value: ? ? 0x10 - enable output
+ ? ? ? ?*/
+ ? ? ? __raw_writeb(0x10, PORT185CR);
+ ? ? ? __raw_writeb(0x10, PORT186CR);
+ ? ? ? __raw_writeb(0x10, PORT187CR);
+ ? ? ? __raw_writeb(0x10, PORT188CR);

Aren't these LEDs a board-specific property?

Quoted 5 lines

I believe the rest of the code is common across multiple boards, so making it fully sharable would be nice.

Please break out the board-specific somehow, perhaps into mmcif_update_progress().

Sure, perhaps we could just move this initialisation into head-ap4evb.txt? Or remove mmcif_update_progress() all together?

Quoted 11 lines
Quoted 11 lines

Index: linux-2.6-ap4/arch/arm/boot/compressed/head-shmobile.S
===================================================================

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +0 -0
@@ -40,14 +59,19 @@ __atags:@ tag #1

? ? ? ?@ tag #3
? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.size = 0 ? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.tag = ATAG_NONE; -1:
+__mach_type:
+ ? ? ? .long ? MACH_TYPE

Quoted 8 lines

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900

Quoted 6 lines
arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +6 -0
+__image_start:
+ ? ? ? .long ? _start
+__image_end:
+ ? ? ? .long ? _got_end
+__load_base:
+ ? ? ? .long ? CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

Just curious, where does these 32Mb come from?

IMHO Its fairly arbitrary where the zImage is copied to. I chose 32Mb as it is the same place that uboot puts images.

Quoted 1 line

Say that a board with be equipped with less than 32Mb, how is that handled?

It isn't.

An alternate approach might be to just place it at the end of the destination, which can be approximated using 4 * the compressed image size. The same assumption is made in arch/arm/boot/compressed/vmlinux.lds.in.

I'm open to other ideas about where to copy the zImage to.

Quoted 9 lines
Quoted 9 lines

Index: linux-2.6-ap4/Documentation/arm/SH-Mobile/vrl4.c
===================================================================

Documentation/arm/SH-Mobile/vrl4.c ? ?2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +4 -0
@@ -0,0 +1,167 @@
+/*
+ * vrl4 format generator
+ *
+ * Copyright (C) 2010 Magnus Damm
Quoted 8 lines

Documentation/arm/SH-Mobile/vrl4.c ? ?2010-12-06 09:11:42.000000000 +0900 line 9

Quoted 5 lines
Documentation/arm/SH-Mobile/vrl4.c ? ?2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +5 -0
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */

That's sweet, but I don't think I've got anything to do with this portion of the code. =)

Sorry, I had both of our names there from text copied from elsewhere and deleted the wrong one.

Quoted 1 line

Apart from those minor points it all looks very good IMO!

Thanks!

maintainer
#10 lore raw

PATCH 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

Quoted 85 lines · Simon Horman
Quoted 84 lines · Magnus Damm
Quoted 70 lines · Simon Horman

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

---

This patch depends on "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.

Index: linux-2.6-ap4/arch/arm/boot/compressed/mmcif-sh7372.c
===================================================================

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +45 -0
@@ -0,0 +1,99 @@
+/*
+ * sh7372 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ * Copyright (C) 2010 Simon Horman
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/mmcif.h>
+
+#define MMCIF_BASE ? ? ?(void __iomem *)0xe6bd0000
+
+#define PORT84CR ? ? ? 0xe6050054
+#define PORT85CR ? ? ? 0xe6050055
+#define PORT86CR ? ? ? 0xe6050056
+#define PORT87CR ? ? ? 0xe6050057
+#define PORT88CR ? ? ? 0xe6050058
+#define PORT89CR ? ? ? 0xe6050059
+#define PORT90CR ? ? ? 0xe605005a
+#define PORT91CR ? ? ? 0xe605005b
+#define PORT92CR ? ? ? 0xe605005c
+#define PORT99CR ? ? ? 0xe6050063
+#define PORT185CR ? ? ?0xe60520b9
+#define PORT186CR ? ? ?0xe60520ba
+#define PORT187CR ? ? ?0xe60520bb
+#define PORT188CR ? ? ?0xe60520bc
+
+#define SMSTPCR3 ? ? ? 0xe615013c
+
+/* SH7372 specific MMCIF loader
+ *
+ * loads the zImage from an MMC card starting from block 1.
+ *
+ * The image must be start with a vrl4 header and
+ * the zImage must start at offset 512 of the image. That is,
+ * at block 2 (=byte 1024) on the media
+ *
+ * Use the following line to write the vrl4 formated zImage
+ * to an MMC card
+ * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
+ */

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 line 55

Quoted 10 lines
arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +10 -0
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
+{
+ ? ? ? /* Initialise LEDS1-4
+ ? ? ? ?* registers: PORT185CR-PORT188CR (LED1-LED4 Control)
+ ? ? ? ?* value: ? ? 0x10 - enable output
+ ? ? ? ?*/
+ ? ? ? __raw_writeb(0x10, PORT185CR);
+ ? ? ? __raw_writeb(0x10, PORT186CR);
+ ? ? ? __raw_writeb(0x10, PORT187CR);
+ ? ? ? __raw_writeb(0x10, PORT188CR);

Aren't these LEDs a board-specific property?

Quoted 7 lines
Quoted 5 lines

I believe the rest of the code is common across multiple boards, so making it fully sharable would be nice.

Please break out the board-specific somehow, perhaps into mmcif_update_progress().

Sure, perhaps we could just move this initialisation into head-ap4evb.txt?

Sounds good!

Quoted 1 line

Or remove mmcif_update_progress() all together?

Nah, I prefer to keep some kind of abstraction for the progress meter.

Quoted 20 lines
Quoted 11 lines
Quoted 11 lines

Index: linux-2.6-ap4/arch/arm/boot/compressed/head-shmobile.S
===================================================================

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +0 -0
@@ -40,14 +59,19 @@ __atags:@ tag #1

? ? ? ?@ tag #3
? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.size = 0 ? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.tag = ATAG_NONE; -1:
+__mach_type:
+ ? ? ? .long ? MACH_TYPE

Quoted 8 lines

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900

Quoted 6 lines
arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +6 -0
+__image_start:
+ ? ? ? .long ? _start
+__image_end:
+ ? ? ? .long ? _got_end
+__load_base:
+ ? ? ? .long ? CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

Just curious, where does these 32Mb come from?

Quoted 2 lines

IMHO Its fairly arbitrary where the zImage is copied to. I chose 32Mb as it is the same place that uboot puts images.

That makes sense.

Quoted 9 lines
Quoted 1 line

Say that a board with be equipped with less than 32Mb, how is that handled?

It isn't.

An alternate approach might be to just place it at the end of the destination, which can be approximated using 4 * the compressed image size. The same assumption is made in arch/arm/boot/compressed/vmlinux.lds.in.

I'm open to other ideas about where to copy the zImage to.

What's stopping us from loading the kernel image from MMC straight to CONFIG_MEMORY_START?

At least that's simple - but I suppose it isn't working right out of the box.

Judging by the code in arch/arm/boot/compressed/head.S it looks like the zImage should be able to relocate itself.

Perhaps the code wrapped in #ifndef CONFIG_ZBOOT_ROM in arch/arm/boot/compressed/head.S isn't enabled properly for the MMC boot case. It looks like the CONFIG_ZBOOT_ROM=y case assumes that the kernel is executing from flash or rom, which is true for our NOR flash boot case, but is false when we're booting from MMC.

/ magnus

#11 lore raw

PATCH 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

Quoted 129 lines · Magnus Damm
Quoted 85 lines · Simon Horman
Quoted 84 lines · Magnus Damm
Quoted 70 lines · Simon Horman

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

---

This patch depends on "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.

Index: linux-2.6-ap4/arch/arm/boot/compressed/mmcif-sh7372.c
===================================================================

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +45 -0
@@ -0,0 +1,99 @@
+/*
+ * sh7372 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ * Copyright (C) 2010 Simon Horman
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. ?See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/mmcif.h>
+
+#define MMCIF_BASE ? ? ?(void __iomem *)0xe6bd0000
+
+#define PORT84CR ? ? ? 0xe6050054
+#define PORT85CR ? ? ? 0xe6050055
+#define PORT86CR ? ? ? 0xe6050056
+#define PORT87CR ? ? ? 0xe6050057
+#define PORT88CR ? ? ? 0xe6050058
+#define PORT89CR ? ? ? 0xe6050059
+#define PORT90CR ? ? ? 0xe605005a
+#define PORT91CR ? ? ? 0xe605005b
+#define PORT92CR ? ? ? 0xe605005c
+#define PORT99CR ? ? ? 0xe6050063
+#define PORT185CR ? ? ?0xe60520b9
+#define PORT186CR ? ? ?0xe60520ba
+#define PORT187CR ? ? ?0xe60520bb
+#define PORT188CR ? ? ?0xe60520bc
+
+#define SMSTPCR3 ? ? ? 0xe615013c
+
+/* SH7372 specific MMCIF loader
+ *
+ * loads the zImage from an MMC card starting from block 1.
+ *
+ * The image must be start with a vrl4 header and
+ * the zImage must start at offset 512 of the image. That is,
+ * at block 2 (=byte 1024) on the media
+ *
+ * Use the following line to write the vrl4 formated zImage
+ * to an MMC card
+ * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
+ */

arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 line 55

Quoted 10 lines
arch/arm/boot/compressed/mmcif-sh7372.c ? ? ? 2010-12-06 09:11:42.000000000 +0900 renamed from dev/null ? 1970-01-01 00:00:00.000000000 +0000 +10 -0
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
+{
+ ? ? ? /* Initialise LEDS1-4
+ ? ? ? ?* registers: PORT185CR-PORT188CR (LED1-LED4 Control)
+ ? ? ? ?* value: ? ? 0x10 - enable output
+ ? ? ? ?*/
+ ? ? ? __raw_writeb(0x10, PORT185CR);
+ ? ? ? __raw_writeb(0x10, PORT186CR);
+ ? ? ? __raw_writeb(0x10, PORT187CR);
+ ? ? ? __raw_writeb(0x10, PORT188CR);

Aren't these LEDs a board-specific property?

Quoted 7 lines
Quoted 5 lines

I believe the rest of the code is common across multiple boards, so making it fully sharable would be nice.

Please break out the board-specific somehow, perhaps into mmcif_update_progress().

Sure, perhaps we could just move this initialisation into head-ap4evb.txt?

Sounds good!

Quoted 1 line

Or remove mmcif_update_progress() all together?

Nah, I prefer to keep some kind of abstraction for the progress meter.

Quoted 20 lines
Quoted 11 lines
Quoted 11 lines

Index: linux-2.6-ap4/arch/arm/boot/compressed/head-shmobile.S
===================================================================

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +0 -0
@@ -40,14 +59,19 @@ __atags:@ tag #1

? ? ? ?@ tag #3
? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.size = 0 ? ? ? ?.long ? 0 ? ? ? ? ? ? ? ? ? ? ? @ tag->hdr.tag = ATAG_NONE; -1:
+__mach_type:
+ ? ? ? .long ? MACH_TYPE

Quoted 8 lines

arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900

Quoted 6 lines
arch/arm/boot/compressed/head-shmobile.S ? ? ?2010-12-06 09:11:42.000000000 +0900 renamed from arch/arm/boot/compressed/head-shmobile.S 2010-12-06 09:11:35.000000000 +0900 +6 -0
+__image_start:
+ ? ? ? .long ? _start
+__image_end:
+ ? ? ? .long ? _got_end
+__load_base:
+ ? ? ? .long ? CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM

Just curious, where does these 32Mb come from?

Quoted 2 lines

IMHO Its fairly arbitrary where the zImage is copied to. I chose 32Mb as it is the same place that uboot puts images.

That makes sense.

Quoted 4 lines
Quoted 1 line

Say that a board with be equipped with less than 32Mb, how is that handled?

It isn't.

Quoted 8 lines
Quoted 5 lines

An alternate approach might be to just place it at the end of the destination, which can be approximated using 4 * the compressed image size. The same assumption is made in arch/arm/boot/compressed/vmlinux.lds.in.

I'm open to other ideas about where to copy the zImage to.

What's stopping us from loading the kernel image from MMC straight to CONFIG_MEMORY_START?

Because what is expected in the end is an uncompressed kernel at CONFIG_MEMORY_START + TEXT_OFFSET and the compressed image won't fit between in TEXT_OFFSET bytes.

Quoted 10 lines

At least that's simple - but I suppose it isn't working right out of the box.

Judging by the code in arch/arm/boot/compressed/head.S it looks like the zImage should be able to relocate itself.

Perhaps the code wrapped in #ifndef CONFIG_ZBOOT_ROM in arch/arm/boot/compressed/head.S isn't enabled properly for the MMC boot case. It looks like the CONFIG_ZBOOT_ROM=y case assumes that the kernel is executing from flash or rom, which is true for our NOR flash boot case, but is false when we're booting from MMC.

Could you be more specific about which bits of head.S you are looking at?

#12 lore raw

PATCH v2 3/3 mmc, ARM: Add zboot from MMC support for SuperH Mobile ARM

In reply to Magnus Damm

This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block.

This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it.

---

 Documentation/arm/SH-Mobile/Makefile                |    8
 Documentation/arm/SH-Mobile/vrl4.c                  |  167 +++++++++++++
 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt     |   29 ++
 arch/arm/Kconfig                                    |   12
 arch/arm/boot/compressed/Makefile                   |    6
 arch/arm/boot/compressed/head-shmobile.S            |   31 ++
 arch/arm/boot/compressed/mmcif-sh7372.c             |   86 ++++++
 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt |    6
 arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h   |   12
 arch/arm/mach-shmobile/include/mach/mmcif.h         |   16 +
 10 files changed, 373 insertions(+)

This patch depends on:
* "ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM" which has been merged into the devel branch of Russell King's linux-2.6-arm tree.
* "mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h"
* "mmc, sh: Remove sh_mmcif_boot_slurp()"

v2 Addressed comments by Magnus Damm:
* Fix copyright in vrl4.c
* Fix use of #define CONFIG_ZBOOT_ROM_MMCIF in mmcif-sh7372.c
* Initialise LED GPIO lines in head-ap4evb.txt instead of mmcif-sh7372.c as this is considered board-specific.

arch/arm/boot/compressed/mmcif-sh7372.c new file +86 -0
Index: linux-2.6-ap4/arch/arm/boot/compressed/mmcif-sh7372.c
===================================================================
@@ -0,0 +1,86 @@
+/*
+ * sh7372 MMCIF loader
+ *
+ * Copyright (C) 2010 Magnus Damm
+ * Copyright (C) 2010 Simon Horman
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/mmc/sh_mmcif.h>
+#include <mach/mmcif.h>
+
+#define MMCIF_BASE      (void __iomem *)0xe6bd0000
+
+#define PORT84CR	0xe6050054
+#define PORT85CR	0xe6050055
+#define PORT86CR	0xe6050056
+#define PORT87CR	0xe6050057
+#define PORT88CR	0xe6050058
+#define PORT89CR	0xe6050059
+#define PORT90CR	0xe605005a
+#define PORT91CR	0xe605005b
+#define PORT92CR	0xe605005c
+#define PORT99CR	0xe6050063
+
+#define SMSTPCR3	0xe615013c
+
+/* SH7372 specific MMCIF loader
+ *
+ * loads the zImage from an MMC card starting from block 1.
+ *
+ * The image must be start with a vrl4 header and
+ * the zImage must start at offset 512 of the image. That is,
+ * at block 2 (=byte 1024) on the media
+ *
+ * Use the following line to write the vrl4 formated zImage
+ * to an MMC card
+ * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
+ */
+asmlinkage void mmcif_loader(unsigned char *buf, unsigned long len)
+{
+	mmcif_update_progress(MMCIF_PROGRESS_ENTER);
+
+	/* Initialise MMC
+	 * registers: PORT84CR-PORT92CR
+	 *            (MMCD0_0-MMCD0_7,MMCCMD0 Control)
+	 * value: 0x04 - select function 4
+	 */
+	 __raw_writeb(0x04, PORT84CR);
+	 __raw_writeb(0x04, PORT85CR);
+	 __raw_writeb(0x04, PORT86CR);
+	 __raw_writeb(0x04, PORT87CR);
+	 __raw_writeb(0x04, PORT88CR);
+	 __raw_writeb(0x04, PORT89CR);
+	 __raw_writeb(0x04, PORT90CR);
+	 __raw_writeb(0x04, PORT91CR);
+	 __raw_writeb(0x04, PORT92CR);
+
+	/* Initialise MMC
+	 * registers: PORT99CR (MMCCLK0 Control)
+	 * value: 0x10 | 0x04 - enable output | select function 4
+	 */
+	__raw_writeb(0x14, PORT99CR);
+
+	/* Enable clock to MMC hardware block */
+	__raw_writel(__raw_readl(SMSTPCR3) & ~(1 << 12), SMSTPCR3);
+
+	mmcif_update_progress(MMCIF_PROGRESS_INIT);
+
+	/* setup MMCIF hardware */
+	sh_mmcif_boot_init(MMCIF_BASE);
+
+	mmcif_update_progress(MMCIF_PROGRESS_LOAD);
+
+	/* load kernel via MMCIF interface */
+	sh_mmcif_boot_do_read(MMCIF_BASE, 2, /* Kernel is@block 2 */
+			      (len + SH_MMCIF_BBS - 1) / SH_MMCIF_BBS, buf);
+
+
+	/* Disable clock to MMC hardware block */
+	__raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3);
+
+	mmcif_update_progress(MMCIF_PROGRESS_DONE);
+}
arch/arm/boot/compressed/Makefile +6 -0
Index: linux-2.6-ap4/arch/arm/boot/compressed/Makefile
===================================================================
@@ -49,6 +49,12 @@ ifeq ($(CONFIG_ARCH_SHMOBILE),y)
 OBJS		+= head-shmobile.o
 endif
 
+ifeq ($(CONFIG_ZBOOT_ROM_MMCIF),y)
+ifeq ($(CONFIG_ARCH_SH7372),y)
+OBJS		+= mmcif-sh7372.o
+endif
+endif
+
 #
 # We now have a PIC decompressor implementation.  Decompressors running
 # from RAM should not define ZTEXTADDR.  Decompressors running directly
arch/arm/boot/compressed/head-shmobile.S +31 -0
Index: linux-2.6-ap4/arch/arm/boot/compressed/head-shmobile.S
===================================================================
@@ -25,6 +25,37 @@
 	/* load board-specific initialization code */
 #include <mach/zboot.h>
 
+#ifdef CONFIG_ZBOOT_ROM_MMCIF
+	/* Load image from MMC */
+	adr	sp, __tmp_stack
+	add	sp, sp, #128
+	ldr	r0, __image_start
+	ldr	r1, __image_end
+	subs	r1, r1, r0
+	ldr	r0, __load_base
+	mov	lr, pc
+	b	mmcif_loader
+
+	/* Jump to loaded code */
+	ldr	r0, __loaded
+	ldr	r1, __image_start
+	sub	r0, r0, r1
+	ldr	r1, __load_base
+	add	pc, r0, r1
+
+__image_start:
+	.long	_start
+__image_end:
+	.long	_got_end
+__load_base:
+	.long	CONFIG_MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM
+__loaded:
+	.long	__loaded
+	.align
+__tmp_stack:
+	.space	128
+#endif /* CONFIG_ZBOOT_ROM_MMCIF */
+
 	b	1f
 __atags:@ tag #1
 	.long	12			@ tag->hdr.size = tag_size(tag_core);
arch/arm/Kconfig +12 -0
Index: linux-2.6-ap4/arch/arm/Kconfig
===================================================================
@@ -1587,6 +1587,18 @@ config ZBOOT_ROM
 	  Say Y here if you intend to execute your compressed kernel image
 	  (zImage) directly from ROM or flash.  If unsure, say N.
 
+config ZBOOT_ROM_MMCIF
+	bool "Include MMCIF loader in zImage (EXPERIMENTAL)"
+	depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
+	help
+	  Say Y here to include experimental MMCIF loading code in the
+	  ROM-able zImage. With this enabled it is possible to write the
+	  the ROM-able zImage kernel image to an MMC card and boot the
+	  kernel straight from the reset vector. At reset the processor
+	  Mask ROM will load the first part of the the ROM-able zImage
+	  which in turn loads the rest the kernel image to RAM using the
+	  MMCIF hardware block.
+
 config CMDLINE
 	string "Default kernel command string"
 	default ""
arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h new file +12 -0
Index: linux-2.6-ap4/arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h
===================================================================
@@ -0,0 +1,12 @@
+#ifndef MMCIF_AP4EB_H
+#define MMCIF_AP4EB_H
+
+#define PORTR191_160DR 0xe6056014
+
+static void mmcif_update_progress(int n)
+{
+	__raw_writel((__raw_readl(PORTR191_160DR) & ~(0xf << 25)) |
+		     (1 << (25 + n)), PORTR191_160DR);
+}
+
+#endif /* MMCIF_AP4EB_H */
arch/arm/mach-shmobile/include/mach/mmcif.h new file +16 -0
Index: linux-2.6-ap4/arch/arm/mach-shmobile/include/mach/mmcif.h
===================================================================
@@ -0,0 +1,16 @@
+#ifndef MMCIF_H
+#define MMCIF_H
+
+/**************************************************
+ *
+ *		board specific settings
+ *
+ **************************************************/
+
+#ifdef CONFIG_MACH_AP4EVB
+#include "mach/mmcif-ap4eb.h"
+#else
+#error "unsupported board."
+#endif
+
+#endif /* MMCIF_H */
Documentation/arm/SH-Mobile/Makefile new file +8 -0
Index: linux-2.6-ap4/Documentation/arm/SH-Mobile/Makefile
===================================================================
@@ -0,0 +1,8 @@
+BIN := vrl4
+
+.PHONY: all
+all: $(BIN)
+
+.PHONY: clean
+clean:
+	rm -f *.o $(BIN)
Documentation/arm/SH-Mobile/vrl4.c new file +167 -0

167 lines not on this page · raw message

Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt new file +29 -0
Index: linux-2.6-ap4/Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt
===================================================================
@@ -0,0 +1,29 @@
+ROM-able zImage boot from MMC
+-----------------------------
+
+An ROM-able zImage compiled with ZBOOT_ROM_MMCIF may be written to MMC and
+SuperH Mobile ARM will to boot directly from the MMCIF hardware block.
+
+This is achieved by the mask ROM loading the first portion of the image into
+MERAM and then jumping to it. This portion contains loader code which
+copies the entire image to SDRAM and jumps to it. From there the zImage
+boot code proceeds as normal, uncompressing the image into its final
+location and then jumping to it.
+
+This code has been tested on an AP4EB board using the developer 1A eMMC
+boot mode which is configured using the following jumper settings.
+The board used for testing required a patched mask ROM in order for
+this mode to function.
+
+   8 7 6 5 4 3 2 1
+   x|x|x|x|x| |x|
+S4 -+-+-+-+-+-+-+-
+    | | | | |x| |x on
+
+The zImage must be written to the MMC card@sector 1 (512 bytes) in
+vrl4 format. A utility vrl4 is supplied to accomplish this.
+
+e.g.
+	vrl4 < zImage | dd of=/dev/sdX bs=512 seek=1
+
+A dual-voltage MMC 4.0 card was used for testing.
arch/arm/mach-shmobile/include/mach/head-ap4evb.txt +6 -0
Index: linux-2.6-ap4/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
===================================================================
@@ -85,3 +85,9 @@ ED 0xE6150004, 0x80331050
 WAIT 1, 0xFE40009C
 
 ED 0xE6150354, 0x00000002
+
+LIST "LED1-4"
+EB 0xE60520B9, 0x10
+EB 0xE60520BA, 0x10
+EB 0xE60520BB, 0x10
+EB 0xE60520BC, 0x10