[PATCH v4 0/2] Adding support for the new Armada XP development board from Marvell

[PATCH v4 0/2] Adding support for the new Armada XP development board from Marvell

[Gregory CLEMENT]

Hello,

This is the forth version (the third was not the last one finally) of
a patch set to add the dts support for new Armada XP development
board from Marvell called DB-MV784MP-GP.

The branch GP-board is available at
https://github.com/MISL-EBU-System-SW/mainline-public.git

Changelog:
v3->v4:
- change the amount of memory in DTS to indicate the size actually
  present on the board
- add a patch which allow the kernel to receive the amount of memory
  available on the board using ATAG (for legacy bootloader such as the
  one currently used on Marvell boards).

V2->v3
- fixed typos in comments
- fixed the compatible string for the board and use marvell,axp-gp
  instead of marvell,axp-db which was already used by an other board
- fixed the model name by remove the colon

v2->v1:
- added tested-by from Simon Guinot and Florian Fainelli
- added some comments to emphasize that the amount of memory may
  change.
- named the board ``development board''

Gregory CLEMENT (2):
  arm: mvebu: update defconfig with ATAG support when using DT
  arm: mvebu: support for the new Armada XP development
    board(DB-MV784MP-GP)

 arch/arm/boot/dts/Makefile         |    1 +
 arch/arm/boot/dts/armada-xp-gp.dts |  101 ++++++++++++++++++++++++++++++++++++
 arch/arm/configs/mvebu_defconfig   |    1 +
 3 files changed, 103 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts

-- 
1.7.9.5

[PATCH v4 1/2] arm: mvebu: update defconfig with ATAG support when using DT

[Gregory CLEMENT]

Some of the mvebu boards (mainly the development board) come with
plug-in RAM modules. This patch allows to let the bootloaders which
have no support for DTS to give the real amount of memory available on
the board.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/configs/mvebu_defconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index b5bc96c..8ec2217 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -21,6 +21,7 @@ CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
 CONFIG_NET=y
 CONFIG_INET=y
-- 
1.7.9.5

[PATCH v4 2/2] arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)

[Gregory CLEMENT]

This is the new Armada XP evaluation board from Marvell. It comes with
a RS232 port over USB, a SATA link, an internal SSD, 4 Ethernet
Gigabit links.

Support for USB (Host and device), SDIO, PCIe will be added as drivers
when they become available for Armada XP in mainline.

Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Tested-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
 arch/arm/boot/dts/Makefile         |    1 +
 arch/arm/boot/dts/armada-xp-gp.dts |  101 ++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5ebb44f..51aab4b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-xp-db.dtb \
+	armada-xp-gp.dtb \
 	armada-xp-openblocks-ax3-4.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 	imx53-ard.dtb \
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
new file mode 100644
index 0000000..872ed04
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -0,0 +1,101 @@
+/*
+ * Device Tree file for Marvell Armada XP development board
+ * (DB-MV784MP-GP)
+ *
+ * Copyright (C) 2013 Marvell
+ *
+ * Lior Amsalem <alior@marvell.com>
+ * Gregory CLEMENT <gregory.clement@free-electrons.com>
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "armada-xp-mv78460.dtsi"
+
+/ {
+	model = "Marvell Armada XP Development Board DB-MV784MP-GP";
+	compatible = "marvell,axp-gp", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
+
+	chosen {
+		bootargs = "console=ttyS0,115200 earlyprintk";
+	};
+
+	memory {
+		device_type = "memory";
+
+		/*
+		 * 4 GB of plug-in RAM modules by default.The amount
+		 * of memory available can be changed by the
+		 * bootloader according the size of the module
+		 * actually plugged
+		 */
+		reg = <0x00000000 0xD0000000>;
+	};
+
+	soc {
+		serial at d0012000 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+		serial at d0012100 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+		serial at d0012200 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+		serial at d0012300 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+
+		sata at d00a0000 {
+			nr-ports = <2>;
+			status = "okay";
+		};
+
+		mdio {
+			phy0: ethernet-phy at 0 {
+				reg = <16>;
+			};
+
+			phy1: ethernet-phy at 1 {
+				reg = <17>;
+			};
+
+			phy2: ethernet-phy at 2 {
+				reg = <18>;
+			};
+
+			phy3: ethernet-phy at 3 {
+				reg = <19>;
+			};
+		};
+
+		ethernet at d0070000 {
+			status = "okay";
+			phy = <&phy0>;
+			phy-mode = "rgmii-id";
+		};
+		ethernet at d0074000 {
+			status = "okay";
+			phy = <&phy1>;
+			phy-mode = "rgmii-id";
+		};
+		ethernet at d0030000 {
+			status = "okay";
+			phy = <&phy2>;
+			phy-mode = "rgmii-id";
+		};
+		ethernet at d0034000 {
+			status = "okay";
+			phy = <&phy3>;
+			phy-mode = "rgmii-id";
+		};
+	};
+};
-- 
1.7.9.5

[PATCH v4 2/2] arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)

[Jason Cooper]

On Mon, Feb 04, 2013 at 06:21:08PM +0100, Gregory CLEMENT wrote:
> This is the new Armada XP evaluation board from Marvell. It comes with
> a RS232 port over USB, a SATA link, an internal SSD, 4 Ethernet
> Gigabit links.
> 
> Support for USB (Host and device), SDIO, PCIe will be added as drivers
> when they become available for Armada XP in mainline.
> 
> Tested-by: Simon Guinot <simon.guinot@sequanux.org>
> Tested-by: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  arch/arm/boot/dts/Makefile         |    1 +
>  arch/arm/boot/dts/armada-xp-gp.dts |  101 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 102 insertions(+)
>  create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts

dammit.  I missed v4 and applied v3 of this patch.  The only difference
is the size of RAM (I applied 3GB, v4 has 4GB).  I'll go ahead and
apply v4 ATAG defconfig (patch #1 of v4) to mvebu/boards.  Then, we'll
do a follow-up patch to -rc1 to correct the RAM size.

This is too small a change be worth going through and redoing /boards
and /dt at this point.

Sorry about that.

thx,

Jason.

[PATCH v4 1/2] arm: mvebu: update defconfig with ATAG support when using DT

[Jason Cooper]

On Mon, Feb 04, 2013 at 06:21:07PM +0100, Gregory CLEMENT wrote:
> Some of the mvebu boards (mainly the development board) come with
> plug-in RAM modules. This patch allows to let the bootloaders which
> have no support for DTS to give the real amount of memory available on
> the board.
> 
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
>  arch/arm/configs/mvebu_defconfig |    1 +
>  1 file changed, 1 insertion(+)

Applied to mvebu/boards

thx,

Jason.

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

The board is supplied with a 4GB RAM module.  This value can be
overridden by the bootloader based on probed memory size.  We set it to
a reasonable value here.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
As promised, catching this fix in the -rc cycle.

For those not familiar, earlier versions of the patch adding this board listed
3GB because that is all that was visible.  I mistaken applied v3 of the patch
instead of v4 which properly listed 4GB.  This patch cleans up my error.

 arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 1c8afe2..4a2776a 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -28,12 +28,11 @@
 		device_type = "memory";
 
 		/*
-		 * 4 GB of plug-in RAM modules by default but only 3GB
-		 * are visible, the amount of memory available can be
-		 * changed by the bootloader according the size of the
-		 * module actually plugged
+		 * 4 GB of plug-in RAM modules by default. The amount of memory
+		 * available can be changed by the bootloader according the
+		 * size of the module actually plugged
 		 */
-		reg = <0x00000000 0xC0000000>;
+		reg = <0x00000000 0xD0000000>;
 	};
 
 	soc {
-- 
1.8.1.5

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Sergei Shtylyov]

Hello.

On 12-03-2013 19:12, Jason Cooper wrote:

> The board is supplied with a 4GB RAM module.  This value can be
> overridden by the bootloader based on probed memory size.  We set it to
> a reasonable value here.

> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
> As promised, catching this fix in the -rc cycle.

> For those not familiar, earlier versions of the patch adding this board listed
> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> instead of v4 which properly listed 4GB.  This patch cleans up my error.

>   arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)

> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> index 1c8afe2..4a2776a 100644
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@ -28,12 +28,11 @@
>   		device_type = "memory";
>
>   		/*
> -		 * 4 GB of plug-in RAM modules by default but only 3GB
> -		 * are visible, the amount of memory available can be
> -		 * changed by the bootloader according the size of the
> -		 * module actually plugged
> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
> +		 * available can be changed by the bootloader according the

    "According to the size".

> +		 * size of the module actually plugged
>   		 */
> -		reg = <0x00000000 0xC0000000>;
> +		reg = <0x00000000 0xD0000000>;

    But this is not 4G?

>   	};

WBR, Sergei

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Gregory CLEMENT]

On 03/13/2013 03:30 PM, Sergei Shtylyov wrote:
> Hello.
> 
> On 12-03-2013 19:12, Jason Cooper wrote:
> 
>> The board is supplied with a 4GB RAM module.  This value can be
>> overridden by the bootloader based on probed memory size.  We set it to
>> a reasonable value here.
> 
>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>> ---
>> As promised, catching this fix in the -rc cycle.
> 
>> For those not familiar, earlier versions of the patch adding this board listed
>> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
>> instead of v4 which properly listed 4GB.  This patch cleans up my error.
> 
>>   arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
>>   1 file changed, 4 insertions(+), 5 deletions(-)
> 
>> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
>> index 1c8afe2..4a2776a 100644
>> --- a/arch/arm/boot/dts/armada-xp-gp.dts
>> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
>> @@ -28,12 +28,11 @@
>>   		device_type = "memory";
>>
>>   		/*
>> -		 * 4 GB of plug-in RAM modules by default but only 3GB
>> -		 * are visible, the amount of memory available can be
>> -		 * changed by the bootloader according the size of the
>> -		 * module actually plugged
>> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
>> +		 * available can be changed by the bootloader according the
> 
>     "According to the size".
> 
>> +		 * size of the module actually plugged
>>   		 */
>> -		reg = <0x00000000 0xC0000000>;
>> +		reg = <0x00000000 0xD0000000>;
> 
>     But this is not 4G?

You're totally right!
It should be reg = <0x00000000 0xF0000000>;

> 
>>   	};
> 
> WBR, Sergei
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Wed, Mar 13, 2013 at 06:30:30PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 12-03-2013 19:12, Jason Cooper wrote:
> 
> >The board is supplied with a 4GB RAM module.  This value can be
> >overridden by the bootloader based on probed memory size.  We set it to
> >a reasonable value here.
> 
> >Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >---
> >As promised, catching this fix in the -rc cycle.
> 
> >For those not familiar, earlier versions of the patch adding this board listed
> >3GB because that is all that was visible.  I mistaken applied v3 of the patch
> >instead of v4 which properly listed 4GB.  This patch cleans up my error.
> 
> >  arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
> >  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> >diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> >index 1c8afe2..4a2776a 100644
> >--- a/arch/arm/boot/dts/armada-xp-gp.dts
> >+++ b/arch/arm/boot/dts/armada-xp-gp.dts
> >@@ -28,12 +28,11 @@
> >  		device_type = "memory";
> >
> >  		/*
> >-		 * 4 GB of plug-in RAM modules by default but only 3GB
> >-		 * are visible, the amount of memory available can be
> >-		 * changed by the bootloader according the size of the
> >-		 * module actually plugged
> >+		 * 4 GB of plug-in RAM modules by default. The amount of memory
> >+		 * available can be changed by the bootloader according the
> 
>    "According to the size".

ok.

> >+		 * size of the module actually plugged
> >  		 */
> >-		reg = <0x00000000 0xC0000000>;
> >+		reg = <0x00000000 0xD0000000>;
> 
>    But this is not 4G?

Interesting, this was the value given in v4 of the original patch adding
this board.  I should have double-checked it. v2 on the way.

thx,

Jason.

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Gregory CLEMENT]

On 03/13/2013 03:39 PM, Jason Cooper wrote:
> On Wed, Mar 13, 2013 at 06:30:30PM +0400, Sergei Shtylyov wrote:
>> Hello.
>>
>> On 12-03-2013 19:12, Jason Cooper wrote:
>>
>>> The board is supplied with a 4GB RAM module.  This value can be
>>> overridden by the bootloader based on probed memory size.  We set it to
>>> a reasonable value here.
>>
>>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>>> ---
>>> As promised, catching this fix in the -rc cycle.
>>
>>> For those not familiar, earlier versions of the patch adding this board listed
>>> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
>>> instead of v4 which properly listed 4GB.  This patch cleans up my error.
>>
>>>  arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
>>>  1 file changed, 4 insertions(+), 5 deletions(-)
>>
>>> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
>>> index 1c8afe2..4a2776a 100644
>>> --- a/arch/arm/boot/dts/armada-xp-gp.dts
>>> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
>>> @@ -28,12 +28,11 @@
>>>  		device_type = "memory";
>>>
>>>  		/*
>>> -		 * 4 GB of plug-in RAM modules by default but only 3GB
>>> -		 * are visible, the amount of memory available can be
>>> -		 * changed by the bootloader according the size of the
>>> -		 * module actually plugged
>>> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
>>> +		 * available can be changed by the bootloader according the
>>
>>    "According to the size".
> 
> ok.
> 
>>> +		 * size of the module actually plugged
>>>  		 */
>>> -		reg = <0x00000000 0xC0000000>;
>>> +		reg = <0x00000000 0xD0000000>;
>>
>>    But this is not 4G?
> 
> Interesting, this was the value given in v4 of the original patch adding
> this board.  I should have double-checked it. v2 on the way.
> 

I was wrong in my initial version, all we can do in 32 bits is not 4GB but 4GB-1B:
reg = <0x00000000 0xFFFFFFFF>

> thx,
> 
> Jason.
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Wed, Mar 13, 2013 at 03:37:00PM +0100, Gregory CLEMENT wrote:
> On 03/13/2013 03:30 PM, Sergei Shtylyov wrote:
> > Hello.
> > 
> > On 12-03-2013 19:12, Jason Cooper wrote:
> > 
> >> The board is supplied with a 4GB RAM module.  This value can be
> >> overridden by the bootloader based on probed memory size.  We set it to
> >> a reasonable value here.
> > 
> >> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >> ---
> >> As promised, catching this fix in the -rc cycle.
> > 
> >> For those not familiar, earlier versions of the patch adding this board listed
> >> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> >> instead of v4 which properly listed 4GB.  This patch cleans up my error.
> > 
> >>   arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
> >>   1 file changed, 4 insertions(+), 5 deletions(-)
> > 
> >> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> >> index 1c8afe2..4a2776a 100644
> >> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> >> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> >> @@ -28,12 +28,11 @@
> >>   		device_type = "memory";
> >>
> >>   		/*
> >> -		 * 4 GB of plug-in RAM modules by default but only 3GB
> >> -		 * are visible, the amount of memory available can be
> >> -		 * changed by the bootloader according the size of the
> >> -		 * module actually plugged
> >> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
> >> +		 * available can be changed by the bootloader according the
> > 
> >     "According to the size".
> > 
> >> +		 * size of the module actually plugged
> >>   		 */
> >> -		reg = <0x00000000 0xC0000000>;
> >> +		reg = <0x00000000 0xD0000000>;
> > 
> >     But this is not 4G?
> 
> You're totally right!
> It should be reg = <0x00000000 0xF0000000>;

$ printf "0x%08x\n" `echo "4 * (1024 ^ 3)" | bc`
0x100000000

?

thx,

Jason.

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Wed, Mar 13, 2013 at 03:42:43PM +0100, Gregory CLEMENT wrote:
> On 03/13/2013 03:39 PM, Jason Cooper wrote:
> > On Wed, Mar 13, 2013 at 06:30:30PM +0400, Sergei Shtylyov wrote:
> >> Hello.
> >>
> >> On 12-03-2013 19:12, Jason Cooper wrote:
> >>
> >>> The board is supplied with a 4GB RAM module.  This value can be
> >>> overridden by the bootloader based on probed memory size.  We set it to
> >>> a reasonable value here.
> >>
> >>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >>> ---
> >>> As promised, catching this fix in the -rc cycle.
> >>
> >>> For those not familiar, earlier versions of the patch adding this board listed
> >>> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> >>> instead of v4 which properly listed 4GB.  This patch cleans up my error.
> >>
> >>>  arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
> >>>  1 file changed, 4 insertions(+), 5 deletions(-)
> >>
> >>> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> >>> index 1c8afe2..4a2776a 100644
> >>> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> >>> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> >>> @@ -28,12 +28,11 @@
> >>>  		device_type = "memory";
> >>>
> >>>  		/*
> >>> -		 * 4 GB of plug-in RAM modules by default but only 3GB
> >>> -		 * are visible, the amount of memory available can be
> >>> -		 * changed by the bootloader according the size of the
> >>> -		 * module actually plugged
> >>> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
> >>> +		 * available can be changed by the bootloader according the
> >>
> >>    "According to the size".
> > 
> > ok.
> > 
> >>> +		 * size of the module actually plugged
> >>>  		 */
> >>> -		reg = <0x00000000 0xC0000000>;
> >>> +		reg = <0x00000000 0xD0000000>;
> >>
> >>    But this is not 4G?
> > 
> > Interesting, this was the value given in v4 of the original patch adding
> > this board.  I should have double-checked it. v2 on the way.
> > 
> 
> I was wrong in my initial version, all we can do in 32 bits is not 4GB but 4GB-1B:
> reg = <0x00000000 0xFFFFFFFF>

hmmm, with the impending conquering of the server market by ARM, you'd
think we'd at least be able to parse a 64 bit integer...

thx,

Jason.

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Gunthorpe]

On Wed, Mar 13, 2013 at 10:54:19AM -0400, Jason Cooper wrote:

> > I was wrong in my initial version, all we can do in 32 bits is not
> > 4GB but 4GB-1B: reg = <0x00000000 0xFFFFFFFF>
> 
> hmmm, with the impending conquering of the server market by ARM, you'd
> think we'd at least be able to parse a 64 bit integer...

AFAIK, it would be like this:

/ {
        #address-cells = <2>;
        #size-cells = <2>;
        memory {
                device_type = "memory";
                reg = <0 0  1 0>;
        };

And the other children nodes must be revised to support the 2 dw
address and size..

Regards,
Jason

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Gunthorpe]

On Wed, Mar 13, 2013 at 03:37:00PM +0100, Gregory CLEMENT wrote:

> >> +		 * size of the module actually plugged
> >>   		 */
> >> -		reg = <0x00000000 0xC0000000>;
> >> +		reg = <0x00000000 0xD0000000>;
> > 
> >     But this is not 4G?
> 
> You're totally right!
> It should be reg = <0x00000000 0xF0000000>;

Isn't it 'right' as it is? The various included DT's put devices at
address 0xd0008000 for instance, memory shouldn't overlap that..

Ie you loose the address space 0xD0000000 -> 0x100000000 due to
internal registers.

If the HW supports > 32 bit physical addressing then you'd want to
program the DDR mapping to put some of the DDR above the 4G limit.

Cheers,
Jason

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Andrew Lunn]

On Wed, Mar 13, 2013 at 11:35:59AM -0600, Jason Gunthorpe wrote:
> On Wed, Mar 13, 2013 at 03:37:00PM +0100, Gregory CLEMENT wrote:
> 
> > >> +		 * size of the module actually plugged
> > >>   		 */
> > >> -		reg = <0x00000000 0xC0000000>;
> > >> +		reg = <0x00000000 0xD0000000>;
> > > 
> > >     But this is not 4G?
> > 
> > You're totally right!
> > It should be reg = <0x00000000 0xF0000000>;
> 
> Isn't it 'right' as it is? The various included DT's put devices at
> address 0xd0008000 for instance, memory shouldn't overlap that..

Shouldn't DT describe the hardware? The hardware has 4GB. How much of
it Linux decides to use so as to avoid overlaps with registers etc, is
not a hardware issue, but software.

    Andrew

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Gunthorpe]

On Wed, Mar 13, 2013 at 06:43:24PM +0100, Andrew Lunn wrote:
> On Wed, Mar 13, 2013 at 11:35:59AM -0600, Jason Gunthorpe wrote:
> > On Wed, Mar 13, 2013 at 03:37:00PM +0100, Gregory CLEMENT wrote:
> > 
> > > >> +		 * size of the module actually plugged
> > > >>   		 */
> > > >> -		reg = <0x00000000 0xC0000000>;
> > > >> +		reg = <0x00000000 0xD0000000>;
> > > > 
> > > >     But this is not 4G?
> > > 
> > > You're totally right!
> > > It should be reg = <0x00000000 0xF0000000>;
> > 
> > Isn't it 'right' as it is? The various included DT's put devices at
> > address 0xd0008000 for instance, memory shouldn't overlap that..
> 
> Shouldn't DT describe the hardware? The hardware has 4GB. How much of
> it Linux decides to use so as to avoid overlaps with registers etc, is
> not a hardware issue, but software.

Sure, but which HW? The 'reg' in 'memory' is not describing a DDR
bus. It is describing the DDR address mapping registers in the SOC -
and they are probably set for 0 -> 0xD0000000 by the firmware.

To describe the 4G of DDR you need DT nodes that show:
- The N DDR chip selects going to each DDR rank
- How much memory is in each DDR rank
- How each chip select is currently mapped into CPU address space

This is the minimal amount of information needed for Linux to
reprogram the entire address map, if it so chooses.

To me, the *address map* in the DTB passed from the firwmare should
reflect the state of the machine when the OS is started. That way an
OS without drivers for the address map hardware will function
properly.

Regards,
Jason

[PATCH] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Wed, Mar 13, 2013 at 11:13:07AM -0600, Jason Gunthorpe wrote:
> On Wed, Mar 13, 2013 at 10:54:19AM -0400, Jason Cooper wrote:
> 
> > > I was wrong in my initial version, all we can do in 32 bits is not
> > > 4GB but 4GB-1B: reg = <0x00000000 0xFFFFFFFF>
> > 
> > hmmm, with the impending conquering of the server market by ARM, you'd
> > think we'd at least be able to parse a 64 bit integer...
> 
> AFAIK, it would be like this:
> 
> / {
>         #address-cells = <2>;
>         #size-cells = <2>;
>         memory {
>                 device_type = "memory";
>                 reg = <0 0  1 0>;
>         };
> 
> And the other children nodes must be revised to support the 2 dw
> address and size..

Agreed, but that's a pretty invasive change for a fix.  I'll go with
0xFFFFFFFF for now, and look forward to LPAE support including proper
64bit values.

thx,

Jason.

[PATCH V2] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

The board is supplied with a 4GB RAM module.  This value can be
overridden by the bootloader based on probed memory size.  We set it to
a reasonable value here.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
Changes from v1:
 - grammatical fix suggested by Sergei Shtylyov
 - correct size suggested by several folks (within 32bit, 1 dword)

As promised, catching this fix in the -rc cycle.

For those not familiar, earlier versions of the patch adding this board listed
3GB because that is all that was visible.  I mistaken applied v3 of the patch
instead of v4 which properly listed 4GB.  This patch cleans up my error.

 arch/arm/boot/dts/armada-xp-gp.dts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 1c8afe2..7a7b6ee 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -28,12 +28,11 @@
 		device_type = "memory";
 
 		/*
-		 * 4 GB of plug-in RAM modules by default but only 3GB
-		 * are visible, the amount of memory available can be
-		 * changed by the bootloader according the size of the
-		 * module actually plugged
+		 * 4 GB of plug-in RAM modules by default. The amount of memory
+		 * available can be changed by the bootloader according to the
+		 * size of the module actually plugged
 		 */
-		reg = <0x00000000 0xC0000000>;
+		reg = <0x00000000 0xFFFFFFFF>;
 	};
 
 	soc {
-- 
1.8.1.5

[PATCH V2] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Gunthorpe]

On Thu, Mar 14, 2013 at 03:57:54PM +0000, Jason Cooper wrote:
> The board is supplied with a 4GB RAM module.  This value can be
> overridden by the bootloader based on probed memory size.  We set it to
> a reasonable value here.
> 
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> Changes from v1:
>  - grammatical fix suggested by Sergei Shtylyov
>  - correct size suggested by several folks (within 32bit, 1 dword)
> 
> As promised, catching this fix in the -rc cycle.
> 
> For those not familiar, earlier versions of the patch adding this board listed
> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> instead of v4 which properly listed 4GB.  This patch cleans up my error.

What happens when the kernel tries to treat 0xD0000000 and above as
memory? Lots of internal register blocks overlap 0 -> 4GB - won't this
cause resource conflicts on boot? I'm actually very surprised it boots
at all - what does /proc/iomem say?

Jason

[PATCH V2] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Thu, Mar 14, 2013 at 10:22:36AM -0600, Jason Gunthorpe wrote:
> On Thu, Mar 14, 2013 at 03:57:54PM +0000, Jason Cooper wrote:
> > The board is supplied with a 4GB RAM module.  This value can be
> > overridden by the bootloader based on probed memory size.  We set it to
> > a reasonable value here.
> > 
> > Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> > Changes from v1:
> >  - grammatical fix suggested by Sergei Shtylyov
> >  - correct size suggested by several folks (within 32bit, 1 dword)
> > 
> > As promised, catching this fix in the -rc cycle.
> > 
> > For those not familiar, earlier versions of the patch adding this board listed
> > 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> > instead of v4 which properly listed 4GB.  This patch cleans up my error.
> 
> What happens when the kernel tries to treat 0xD0000000 and above as
> memory? Lots of internal register blocks overlap 0 -> 4GB - won't this
> cause resource conflicts on boot? I'm actually very surprised it boots
> at all - what does /proc/iomem say?

We'll have to wait to hear from Gregory or Florian on that.  They are
the only two I know of who have this board.  I can only compile-test.

thx,

Jason.

[PATCH V2] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Gregory CLEMENT]

On 03/14/2013 05:56 PM, Jason Cooper wrote:
> On Thu, Mar 14, 2013 at 10:22:36AM -0600, Jason Gunthorpe wrote:
>> On Thu, Mar 14, 2013 at 03:57:54PM +0000, Jason Cooper wrote:
>>> The board is supplied with a 4GB RAM module.  This value can be
>>> overridden by the bootloader based on probed memory size.  We set it to
>>> a reasonable value here.
>>>
>>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>>> Changes from v1:
>>>  - grammatical fix suggested by Sergei Shtylyov
>>>  - correct size suggested by several folks (within 32bit, 1 dword)
>>>
>>> As promised, catching this fix in the -rc cycle.
>>>
>>> For those not familiar, earlier versions of the patch adding this board listed
>>> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
>>> instead of v4 which properly listed 4GB.  This patch cleans up my error.
>>
>> What happens when the kernel tries to treat 0xD0000000 and above as
>> memory? Lots of internal register blocks overlap 0 -> 4GB - won't this
>> cause resource conflicts on boot? I'm actually very surprised it boots
>> at all - what does /proc/iomem say?
> 
> We'll have to wait to hear from Gregory or Florian on that.  They are
> the only two I know of who have this board.  I can only compile-test.
> 

Indeed there are conflicts with the internals registers. I was too focused
on the size of the RAM itslelf and I forgotten that if we use the 4GB we have
no more address space for the internal registers themselves.
Even with LPAE we will need to leave a "hole" from 0xD0000000 to 0x100000000
for these registers.

So to conclude, currently, if we try to boot the Armada XP GP board with
reg = <0x00000000 0xFFFFFFFF>, the kernel crash, even if there is 4GB of
RAM.

> thx,
> 
> Jason.
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH V2] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Thu, Mar 14, 2013 at 06:22:16PM +0100, Gregory CLEMENT wrote:
> On 03/14/2013 05:56 PM, Jason Cooper wrote:
> > On Thu, Mar 14, 2013 at 10:22:36AM -0600, Jason Gunthorpe wrote:
> >> On Thu, Mar 14, 2013 at 03:57:54PM +0000, Jason Cooper wrote:
> >>> The board is supplied with a 4GB RAM module.  This value can be
> >>> overridden by the bootloader based on probed memory size.  We set it to
> >>> a reasonable value here.
> >>>
> >>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >>> Changes from v1:
> >>>  - grammatical fix suggested by Sergei Shtylyov
> >>>  - correct size suggested by several folks (within 32bit, 1 dword)
> >>>
> >>> As promised, catching this fix in the -rc cycle.
> >>>
> >>> For those not familiar, earlier versions of the patch adding this board listed
> >>> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> >>> instead of v4 which properly listed 4GB.  This patch cleans up my error.
> >>
> >> What happens when the kernel tries to treat 0xD0000000 and above as
> >> memory? Lots of internal register blocks overlap 0 -> 4GB - won't this
> >> cause resource conflicts on boot? I'm actually very surprised it boots
> >> at all - what does /proc/iomem say?
> > 
> > We'll have to wait to hear from Gregory or Florian on that.  They are
> > the only two I know of who have this board.  I can only compile-test.
> > 
> 
> Indeed there are conflicts with the internals registers. I was too focused
> on the size of the RAM itslelf and I forgotten that if we use the 4GB we have
> no more address space for the internal registers themselves.
> Even with LPAE we will need to leave a "hole" from 0xD0000000 to 0x100000000
> for these registers.
> 
> So to conclude, currently, if we try to boot the Armada XP GP board with
> reg = <0x00000000 0xFFFFFFFF>, the kernel crash, even if there is 4GB of
> RAM.

Ok, so for now, we'll go with <0x00000000 0xD0000000>.

thx,

Jason.

[PATCH V3] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

The board is supplied with a 4GB RAM module.  This value can be
overridden by the bootloader based on probed memory size.  We set it to
a reasonable value here.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
Changes from v2:
 - trimmed size to not conflict with internal register addresses, added comment.
   Thanks to Jason Gunthorpe for raising this and Gregory Clement for confirming.

Changes from v1:
 - grammatical fix suggested by Sergei Shtylyov
 - correct size suggested by several folks (within 32bit, 1 dword)

As promised, catching this fix in the -rc cycle.

For those not familiar, earlier versions of the patch adding this board listed
3GB because that is all that was visible.  I mistaken applied v3 of the patch
instead of v4 which properly listed 4GB.  This patch cleans up my error.


 arch/arm/boot/dts/armada-xp-gp.dts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 1c8afe2..b2d7804 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -28,12 +28,14 @@
 		device_type = "memory";
 
 		/*
-		 * 4 GB of plug-in RAM modules by default but only 3GB
-		 * are visible, the amount of memory available can be
-		 * changed by the bootloader according the size of the
-		 * module actually plugged
+		 * 4 GB of plug-in RAM modules by default. The amount of memory
+		 * available can be changed by the bootloader according to the
+		 * size of the module actually plugged
+		 *
+		 * Clipped at 0xD0000000 since this is the start of the internal
+		 * registers.
 		 */
-		reg = <0x00000000 0xC0000000>;
+		reg = <0x00000000 0xD0000000>;
 	};
 
 	soc {
-- 
1.8.1.5

[PATCH V3] ARM: mvebu: fix RAM size for Armada XP board DB-MV784MP-GP

[Jason Cooper]

On Thu, Mar 14, 2013 at 05:46:02PM +0000, Jason Cooper wrote:
> The board is supplied with a 4GB RAM module.  This value can be
> overridden by the bootloader based on probed memory size.  We set it to
> a reasonable value here.
> 
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
> Changes from v2:
>  - trimmed size to not conflict with internal register addresses, added comment.
>    Thanks to Jason Gunthorpe for raising this and Gregory Clement for confirming.
> 
> Changes from v1:
>  - grammatical fix suggested by Sergei Shtylyov
>  - correct size suggested by several folks (within 32bit, 1 dword)
> 
> As promised, catching this fix in the -rc cycle.
> 
> For those not familiar, earlier versions of the patch adding this board listed
> 3GB because that is all that was visible.  I mistaken applied v3 of the patch
> instead of v4 which properly listed 4GB.  This patch cleans up my error.
> 
> 
>  arch/arm/boot/dts/armada-xp-gp.dts | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)

I'm going to hang on to this since there is a pretty good chance the
LPAE code posted today will make it in this window and supercedes this.

thx,

Jason.

> 
> diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
> index 1c8afe2..b2d7804 100644
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@ -28,12 +28,14 @@
>  		device_type = "memory";
>  
>  		/*
> -		 * 4 GB of plug-in RAM modules by default but only 3GB
> -		 * are visible, the amount of memory available can be
> -		 * changed by the bootloader according the size of the
> -		 * module actually plugged
> +		 * 4 GB of plug-in RAM modules by default. The amount of memory
> +		 * available can be changed by the bootloader according to the
> +		 * size of the module actually plugged
> +		 *
> +		 * Clipped at 0xD0000000 since this is the start of the internal
> +		 * registers.
>  		 */
> -		reg = <0x00000000 0xC0000000>;
> +		reg = <0x00000000 0xD0000000>;
>  	};
>  
>  	soc {
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel