ARM: shmobile: dts: koelsch: Fix flash partition label and size

PATCH Superseded Simon Horman 4 participants 8 messages Nov 26, 2014 – Dec 1, 2014

Subsystems (2)

Device tree bindings SuperH

lore

Share & tools

lore

Simon Horman

author

2014-11-26 00:13 UTC #0 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Update the size and names of flash partitions to match the expectations of the loader which are as follows:

"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]

["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
Device tree (0x0010_0000-0x0014_0000) 256KB
uImage (0x0014_0000-0x0060_0000) 4.75MB

Signed-off-by Simon Horman <[email protected]>

---

This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.

I plan to post a similar patch for Lager if this one goes well.

I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).

Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.

---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

arch/arm/boot/dts/r8a7791-koelsch.dts +6 -6

index 990af16..9a4e714 100644
@@ -451,14 +451,14 @@
 			reg = <0x00000000 0x00080000>;
 			read-only;
 		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00080000 0x00580000>;
 			read-only;
 		};
-		partition at 100000 {
-			label = "data";
-			reg = <0x00100000 0x03f00000>;
+		partition at 440000 {
+			label = "flash";
+			reg = <0x00600000 0x03a00000>;
 		};
 	};
 };

Signature · 1 line

2.1.3

Sergei Shtylyov

2014-11-26 12:50 UTC #1 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Hello.

Quoted 36 lines · Simon Horman

Update the size and names of flash partitions to match the expectations of the loader which are as follows:
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
Device tree (0x0010_0000-0x0014_0000) 256KB
uImage (0x0014_0000-0x0060_0000) 4.75MB
Signed-off-by Simon Horman <[email protected]>
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
  arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644

arch/arm/boot/dts/r8a7791-koelsch.dts line 456

Quoted 9 lines

arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3

@@ -451,14 +451,14 @@
  			reg = <0x00000000 0x00080000>;
  			read-only;
  		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00080000 0x00580000>;

The "reg" prop doesn't match the <unit-address> pat of the name.

arch/arm/boot/dts/r8a7791-koelsch.dts line 461

Quoted 8 lines

arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3

  			read-only;
  		};
-		partition at 100000 {
-			label = "data";
-			reg = <0x00100000 0x03f00000>;
+		partition at 440000 {
+			label = "flash";
+			reg = <0x00600000 0x03a00000>;

Likewise.

[...]

WBR, Sergei

Simon Horman

2014-11-28 00:27 UTC #2 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Quoted 35 lines · Sergei Shtylyov

Hello.
Quoted 30 lines · Simon Horman
Update the size and names of flash partitions to match the expectations of the loader which are as follows:
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
Device tree (0x0010_0000-0x0014_0000) 256KB
uImage (0x0014_0000-0x0060_0000) 4.75MB
Signed-off-by Simon Horman <[email protected]>
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Quoted 16 lines

Quoted 5 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644
arch/arm/boot/dts/r8a7791-koelsch.dts line 456
Quoted 9 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
@@ -451,14 +451,14 @@
 			reg = <0x00000000 0x00080000>;
 			read-only;
 		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00080000 0x00580000>;
The "reg" prop doesn't match the <unit-address> pat of the name.

Are you suggesting this?

			reg = <0x00080000 0x00600000>;

Quoted 8 lines

arch/arm/boot/dts/r8a7791-koelsch.dts line 461
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
 			read-only;
 		};
-		partition at 100000 {
-			label = "data";
-			reg = <0x00100000 0x03f00000>;
+		partition at 440000 {
+			label = "flash";
+			reg = <0x00600000 0x03a00000>;

And this?

			reg = <0x00600000 0x04000000>;

Quoted 11 lines

Likewise.
[...]
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Geert Uytterhoeven

2014-11-28 08:34 UTC #3 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Hi Simon,

Quoted 5 lines · Simon Horman

Quoted 4 lines · Sergei Shtylyov
Quoted 2 lines · Simon Horman
Update the size and names of flash partitions to match the expectations of the loader which are as follows:

Finally I had a closer look at this. Sorry that it took that long.

Quoted 6 lines

Quoted 6 lines
Quoted 6 lines
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB

KiB

You may want to split this explicitly in 256 KiB for U-boot, and 256 KiB for the U-boot bootargs, to help people needing low-level recovery.

Quoted 1 line

Quoted 1 line
Quoted 1 line
Device tree (0x0010_0000-0x0014_0000) 256KB

KiB

Quoted 1 line

Quoted 1 line
Quoted 1 line
uImage (0x0014_0000-0x0060_0000) 4.75MB

Not zImage?

MiB

Quoted 8 lines

Quoted 8 lines
Quoted 8 lines
Signed-off-by Simon Horman <[email protected]>
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.

Thanks, the new split makes sense to me.

Quoted 10 lines

Quoted 10 lines
Quoted 9 lines
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Quoted 16 lines

Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644
@@ -451,14 +451,14 @@
                    reg = <0x00000000 0x00080000>;
                    read-only;
            };
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts line 456
Quoted 6 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
-            partition at 80000 {
-                    label = "bootenv";
-                    reg = <0x00080000 0x00080000>;
+            partition at 40000 {
+                    label = "user";
+                    reg = <0x00080000 0x00580000>;
The "reg" prop doesn't match the <unit-address> pat of the name.

It's not the "reg" property that must match the "<unit-addres>", but the other way around ;-)

Quoted 3 lines

Are you suggesting this?

                        reg = <0x00080000 0x00600000>;

No, that would change the size.

"reg = <0x00080000 ...>" means you must use "... at 80000".

Quoted 9 lines

Quoted 8 lines

arch/arm/boot/dts/r8a7791-koelsch.dts line 461

Quoted 8 lines

arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3

                    read-only;
            };
-            partition at 100000 {
-                    label = "data";
-                    reg = <0x00100000 0x03f00000>;
+            partition at 440000 {
+                    label = "flash";
+                    reg = <0x00600000 0x03a00000>;

Quoted 3 lines

And this?

                        reg = <0x00600000 0x04000000>;

"reg = <0x00600000 ...>" means you must use "... at 600000".

Quoted 1 line

Quoted 1 line
Likewise.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Simon Horman

2014-12-01 00:30 UTC #4 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Quoted 15 lines · Geert Uytterhoeven

Hi Simon,
Quoted 5 lines · Simon Horman
Quoted 4 lines · Sergei Shtylyov
Quoted 2 lines · Simon Horman
Update the size and names of flash partitions to match the expectations of the loader which are as follows:
Finally I had a closer look at this. Sorry that it took that long.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]

Quoted 7 lines

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
KiB
You may want to split this explicitly in 256 KiB for U-boot, and 256 KiB for the U-boot bootargs, to help people needing low-level recovery.

Are you suggesting 4 partitions or just an adjustment of the assumption documented in the changelog?

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Device tree (0x0010_0000-0x0014_0000) 256KB
KiB
Quoted 1 line
Quoted 1 line
Quoted 1 line
uImage (0x0014_0000-0x0060_0000) 4.75MB
Not zImage?

I think we can change this documentation without any runtime effect :^)

Quoted 5 lines

MiB
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Simon Horman <[email protected]>

Quoted 8 lines

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.
Thanks, the new split makes sense to me.

Great!

Quoted 30 lines

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644
@@ -451,14 +451,14 @@
                    reg = <0x00000000 0x00080000>;
                    read-only;
            };
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts line 456
Quoted 6 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
-            partition at 80000 {
-                    label = "bootenv";
-                    reg = <0x00080000 0x00080000>;
+            partition at 40000 {
+                    label = "user";
+                    reg = <0x00080000 0x00580000>;
The "reg" prop doesn't match the <unit-address> pat of the name.
It's not the "reg" property that must match the "<unit-addres>", but the other way around ;-)

Quoted 7 lines

Quoted 3 lines
Are you suggesting this?
                        reg = <0x00080000 0x00600000>;
No, that would change the size.
"reg = <0x00080000 ...>" means you must use "... at 80000".

Thanks, got it.

Quoted 28 lines

Quoted 9 lines
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts line 461
Quoted 8 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
                    read-only;
            };
-            partition at 100000 {
-                    label = "data";
-                    reg = <0x00100000 0x03f00000>;
+            partition at 440000 {
+                    label = "flash";
+                    reg = <0x00600000 0x03a00000>;
Quoted 3 lines
And this?
                        reg = <0x00600000 0x04000000>;
"reg = <0x00600000 ...>" means you must use "... at 600000".
Quoted 1 line
Quoted 1 line
Likewise.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Geert Uytterhoeven

2014-12-01 08:05 UTC #5 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Hi Simon,

Quoted 11 lines · Simon Horman

Quoted 10 lines · Geert Uytterhoeven
Quoted 8 lines · Simon Horman
Quoted 7 lines · Sergei Shtylyov
Quoted 6 lines · Simon Horman
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB

Quoted 7 lines

Quoted 4 lines
KiB
You may want to split this explicitly in 256 KiB for U-boot, and 256 KiB for the U-boot bootargs, to help people needing low-level recovery.
Are you suggesting 4 partitions or just an adjustment of the assumption documented in the changelog?

Just the documentation.

I thought about having more partitions, though. But the two 256 KiB blocks are just
two erase blocks.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Sergei Shtylyov

2014-11-28 11:09 UTC #6 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

In reply to Simon Horman

Hello.

Quoted 48 lines · Simon Horman

Quoted 31 lines
Quoted 30 lines
Update the size and names of flash partitions to match the expectations of the loader which are as follows:
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
Device tree (0x0010_0000-0x0014_0000) 256KB
uImage (0x0014_0000-0x0060_0000) 4.75MB
Signed-off-by Simon Horman <[email protected]>
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
  arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
Quoted 16 lines
Quoted 5 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644
arch/arm/boot/dts/r8a7791-koelsch.dts line 456
Quoted 9 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
@@ -451,14 +451,14 @@
  			reg = <0x00000000 0x00080000>;
  			read-only;
  		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00080000 0x00580000>;
The "reg" prop doesn't match the <unit-address> pat of the name.

Quoted 3 lines

Are you suggesting this?
			reg = <0x00080000 0x00600000>;

No, I'm suggesting to change the <unit-address> part of the node name to
match the offset in the "reg" property (given it's correct).

[...]

WBR, Sergei

Simon Horman

2014-12-01 00:31 UTC #7 lore raw

PATCH 1/1 ARM: shmobile: dts: koelsch: Fix flash partition label and size

Quoted 52 lines · Sergei Shtylyov

Hello.
Quoted 47 lines · Simon Horman
Quoted 47 lines
Quoted 36 lines
Update the size and names of flash partitions to match the expectations of the loader which are as follows:
"loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)]
["user"'s assumed breakdown]
U-boot+ bootargs(0x0008_0000-0x0010_0000) 512KB
Device tree (0x0010_0000-0x0014_0000) 256KB
uImage (0x0014_0000-0x0060_0000) 4.75MB
Signed-off-by Simon Horman <[email protected]>
---
This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild.
I plan to post a similar patch for Lager if this one goes well.
I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline).
Based on the renesas-devel-20141125-v3.18-rc6 tag of my renesas tree.
---
 arch/arm/boot/dts/r8a7791-koelsch.dts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/r8a7791-koelsch.dts +0 -0
index 990af16..9a4e714 100644
arch/arm/boot/dts/r8a7791-koelsch.dts line 456
Quoted 9 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
@@ -451,14 +451,14 @@
 			reg = <0x00000000 0x00080000>;
 			read-only;
 		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00080000 0x00580000>;
The "reg" prop doesn't match the <unit-address> pat of the name.

Quoted 6 lines

Quoted 3 lines
Are you suggesting this?
			reg = <0x00080000 0x00600000>;
No, I'm suggesting to change the <unit-address> part of the node name to
match the offset in the "reg" property (given it's correct).

Thanks, got it.