arm64: dts: exynos: Propagate address/size cell change to /memory node

Message ID 20190904084829.23944-1-m.szyprowski@samsung.com
State New
Headers show
Series
  • arm64: dts: exynos: Propagate address/size cell change to /memory node
Related show

Commit Message

Marek Szyprowski Sept. 4, 2019, 8:48 a.m.
Commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space
mapping for soc node") changed the address and size cells in root node from
2 to 1, but /memory nodes for the affected boards were not updated. This
went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot,
which updates /memory node to the correct values. On the other hand, the
mentioned commit broke boot on Exynos7-based Espresso board, which
bootloader doesn't touch /memory node at all.

Reported-by: Alim Akhtar <alim.akhtar@samsung.com>
Fixes: ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

---
 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +-
 arch/arm64/boot/dts/exynos/exynos7-espresso.dts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.17.1

Comments

Alim Akhtar Sept. 4, 2019, 2:06 p.m. | #1
Thanks Marek,
This fixes the booting issue on exyno7-espresso board.
Probably this should be CCed to -stable.

On 9/4/19 2:18 PM, Marek Szyprowski wrote:
> Commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space

> mapping for soc node") changed the address and size cells in root node from

> 2 to 1, but /memory nodes for the affected boards were not updated. This

> went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot,

> which updates /memory node to the correct values. On the other hand, the

Yes, we don't use u-boot on this board.
> mentioned commit broke boot on Exynos7-based Espresso board, which

> bootloader doesn't touch /memory node at all.

> 

> Reported-by: Alim Akhtar <alim.akhtar@samsung.com>

> Fixes: ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node")

> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Feel free to add,
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>


This make exynos7 board boot again so,
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>


> ---

>   arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +-

>   arch/arm64/boot/dts/exynos/exynos7-espresso.dts       | 2 +-

>   2 files changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

> index db22eb56e968..e6321c8567de 100644

> --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

> +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

> @@ -50,7 +50,7 @@

>   

>   	memory@20000000 {

>   		device_type = "memory";

> -		reg = <0x0 0x20000000 0x0 0xc0000000>;

> +		reg = <0x20000000 0xc0000000>;

>   	};

>   

>   	gpio-keys {

> diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

> index 080e0f56e108..28b02830225f 100644

> --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

> +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

> @@ -28,7 +28,7 @@

>   

>   	memory@40000000 {

>   		device_type = "memory";

> -		reg = <0x0 0x40000000 0x0 0xC0000000>;

> +		reg = <0x40000000 0xC0000000>;

>   	};

>   

>   	usb30_vbus_reg: regulator-usb30 {

>
Marek Szyprowski Sept. 4, 2019, 2:44 p.m. | #2
Hi Alim,

On 2019-09-04 16:06, Alim Akhtar wrote:
> Thanks Marek,

> This fixes the booting issue on exyno7-espresso board.

> Probably this should be CCed to -stable.


The patch has 'Fixes' tag, so it will be automatically selected for all 
stable kernels, which includes the mentioned commit.

> On 9/4/19 2:18 PM, Marek Szyprowski wrote:

>> Commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space

>> mapping for soc node") changed the address and size cells in root node from

>> 2 to 1, but /memory nodes for the affected boards were not updated. This

>> went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot,

>> which updates /memory node to the correct values. On the other hand, the

> Yes, we don't use u-boot on this board.

>> mentioned commit broke boot on Exynos7-based Espresso board, which

>> bootloader doesn't touch /memory node at all.

>>

>> Reported-by: Alim Akhtar <alim.akhtar@samsung.com>

>> Fixes: ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node")

>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

> Feel free to add,

> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>

>

> This make exynos7 board boot again so,

> Tested-by: Alim Akhtar <alim.akhtar@samsung.com>

>

>> ---

>>    arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +-

>>    arch/arm64/boot/dts/exynos/exynos7-espresso.dts       | 2 +-

>>    2 files changed, 2 insertions(+), 2 deletions(-)

>>

>> diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

>> index db22eb56e968..e6321c8567de 100644

>> --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

>> +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

>> @@ -50,7 +50,7 @@

>>    

>>    	memory@20000000 {

>>    		device_type = "memory";

>> -		reg = <0x0 0x20000000 0x0 0xc0000000>;

>> +		reg = <0x20000000 0xc0000000>;

>>    	};

>>    

>>    	gpio-keys {

>> diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

>> index 080e0f56e108..28b02830225f 100644

>> --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

>> +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts

>> @@ -28,7 +28,7 @@

>>    

>>    	memory@40000000 {

>>    		device_type = "memory";

>> -		reg = <0x0 0x40000000 0x0 0xC0000000>;

>> +		reg = <0x40000000 0xC0000000>;

>>    	};

>>    

>>    	usb30_vbus_reg: regulator-usb30 {

>>

>

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Krzysztof Kozlowski Sept. 4, 2019, 3:06 p.m. | #3
On Wed, 4 Sep 2019 at 16:44, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>

> Hi Alim,

>

> On 2019-09-04 16:06, Alim Akhtar wrote:

> > Thanks Marek,

> > This fixes the booting issue on exyno7-espresso board.

> > Probably this should be CCed to -stable.

>

> The patch has 'Fixes' tag, so it will be automatically selected for all

> stable kernels, which includes the mentioned commit.


The autosel will pick it up but AFAIK the general process did not
change - still patch should be Cc-stable tagged. At least this is
still written in Documentation/process/stable-kernel-rules.rst.
I can add the tag while applying so no need to resend.

Best regards,
Krzysztof
Alim Akhtar Sept. 5, 2019, 3:42 a.m. | #4
On 9/4/19 8:36 PM, Krzysztof Kozlowski wrote:
> On Wed, 4 Sep 2019 at 16:44, Marek Szyprowski <m.szyprowski@samsung.com> wrote:

>>

>> Hi Alim,

>>

>> On 2019-09-04 16:06, Alim Akhtar wrote:

>>> Thanks Marek,

>>> This fixes the booting issue on exyno7-espresso board.

>>> Probably this should be CCed to -stable.

>>

>> The patch has 'Fixes' tag, so it will be automatically selected for all

>> stable kernels, which includes the mentioned commit.

> 

> The autosel will pick it up but AFAIK the general process did not

> change - still patch should be Cc-stable tagged. At least this is

> still written in Documentation/process/stable-kernel-rules.rst.

> I can add the tag while applying so no need to resend.

> 

Thanks Marek and Krzystof for the information.

> Best regards,

> Krzysztof

> 

>
Krzysztof Kozlowski Sept. 5, 2019, 7:30 p.m. | #5
On Wed, Sep 04, 2019 at 10:48:29AM +0200, Marek Szyprowski wrote:
> Commit ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space

> mapping for soc node") changed the address and size cells in root node from

> 2 to 1, but /memory nodes for the affected boards were not updated. This

> went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot,

> which updates /memory node to the correct values. On the other hand, the

> mentioned commit broke boot on Exynos7-based Espresso board, which

> bootloader doesn't touch /memory node at all.

> 

> Reported-by: Alim Akhtar <alim.akhtar@samsung.com>

> Fixes: ef72171b3621 ("arm64: dts: exynos: Remove unneeded address space mapping for soc node")

> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

> ---

>  arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +-

>  arch/arm64/boot/dts/exynos/exynos7-espresso.dts       | 2 +-


Thanks, applied.

Best regards,
Krzysztof

Patch

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index db22eb56e968..e6321c8567de 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -50,7 +50,7 @@ 
 
 	memory@20000000 {
 		device_type = "memory";
-		reg = <0x0 0x20000000 0x0 0xc0000000>;
+		reg = <0x20000000 0xc0000000>;
 	};
 
 	gpio-keys {
diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
index 080e0f56e108..28b02830225f 100644
--- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
@@ -28,7 +28,7 @@ 
 
 	memory@40000000 {
 		device_type = "memory";
-		reg = <0x0 0x40000000 0x0 0xC0000000>;
+		reg = <0x40000000 0xC0000000>;
 	};
 
 	usb30_vbus_reg: regulator-usb30 {