| Message ID | 20210330130122.3915-3-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 62acef239f77583f3083f8c842ea2d28f4a1623c |
| Headers | show |
| Series | sunxi: last-minute H616 fixes | expand |
On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote: > > Trusted Firmware now adds the /reserved-memory subnode to the DT at > runtime[1], putting in the right values. > > Drop our hard-coded version, as this might clash with the actual values > (which have also changed), and rely on TF-A to add the node. > > [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770 > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > arch/arm/dts/sun50i-h616.dtsi | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi > index 953e8fac20f..dd4d2f31111 100644 > --- a/arch/arm/dts/sun50i-h616.dtsi > +++ b/arch/arm/dts/sun50i-h616.dtsi > @@ -51,18 +51,6 @@ > }; > }; > > - reserved-memory { > - #address-cells = <2>; > - #size-cells = <2>; > - ranges; > - > - /* 512KiB reserved for ARM Trusted Firmware (BL31) */ > - secmon_reserved: secmon@40000000 { > - reg = <0x0 0x40000000 0x0 0x80000>; > - no-map; > - }; > - }; > - As said always. it's better to not touch Linux dts files. If the same fix same available in Linux add SHA1 on the commit message otherwise keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar at least on sunxi. Jagan.
On 3/30/21 8:28 AM, Jagan Teki wrote: > On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote: >> >> Trusted Firmware now adds the /reserved-memory subnode to the DT at >> runtime[1], putting in the right values. >> >> Drop our hard-coded version, as this might clash with the actual values >> (which have also changed), and rely on TF-A to add the node. >> >> [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770 >> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Samuel Holland <samuel@sholland.org> >> --- >> arch/arm/dts/sun50i-h616.dtsi | 12 ------------ >> 1 file changed, 12 deletions(-) >> >> diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi >> index 953e8fac20f..dd4d2f31111 100644 >> --- a/arch/arm/dts/sun50i-h616.dtsi >> +++ b/arch/arm/dts/sun50i-h616.dtsi >> @@ -51,18 +51,6 @@ >> }; >> }; >> >> - reserved-memory { >> - #address-cells = <2>; >> - #size-cells = <2>; >> - ranges; >> - >> - /* 512KiB reserved for ARM Trusted Firmware (BL31) */ >> - secmon_reserved: secmon@40000000 { >> - reg = <0x0 0x40000000 0x0 0x80000>; >> - no-map; >> - }; >> - }; >> - > > As said always. it's better to not touch Linux dts files. If the same > fix same available in Linux add SHA1 on the commit message otherwise > keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar > at least on sunxi. This file has not yet been added to the Linux tree, so that rule does not apply in this case. Cheers, Samuel > Jagan. >
On Tue, Mar 30, 2021 at 7:21 PM Samuel Holland <samuel@sholland.org> wrote: > > On 3/30/21 8:28 AM, Jagan Teki wrote: > > On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote: > >> > >> Trusted Firmware now adds the /reserved-memory subnode to the DT at > >> runtime[1], putting in the right values. > >> > >> Drop our hard-coded version, as this might clash with the actual values > >> (which have also changed), and rely on TF-A to add the node. > >> > >> [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770 > >> > >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > Reviewed-by: Samuel Holland <samuel@sholland.org> > > >> --- > >> arch/arm/dts/sun50i-h616.dtsi | 12 ------------ > >> 1 file changed, 12 deletions(-) > >> > >> diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi > >> index 953e8fac20f..dd4d2f31111 100644 > >> --- a/arch/arm/dts/sun50i-h616.dtsi > >> +++ b/arch/arm/dts/sun50i-h616.dtsi > >> @@ -51,18 +51,6 @@ > >> }; > >> }; > >> > >> - reserved-memory { > >> - #address-cells = <2>; > >> - #size-cells = <2>; > >> - ranges; > >> - > >> - /* 512KiB reserved for ARM Trusted Firmware (BL31) */ > >> - secmon_reserved: secmon@40000000 { > >> - reg = <0x0 0x40000000 0x0 0x80000>; > >> - no-map; > >> - }; > >> - }; > >> - > > > > As said always. it's better to not touch Linux dts files. If the same > > fix same available in Linux add SHA1 on the commit message otherwise > > keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar > > at least on sunxi. > > This file has not yet been added to the Linux tree, so that rule does not apply > in this case. Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
On Tue, 30 Mar 2021 18:58:23 +0530 Jagan Teki <jagan@amarulasolutions.com> wrote: Hi Jagan, > On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > Trusted Firmware now adds the /reserved-memory subnode to the DT at > > runtime[1], putting in the right values. > > > > Drop our hard-coded version, as this might clash with the actual values > > (which have also changed), and rely on TF-A to add the node. > > > > [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770 > > > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > --- > > arch/arm/dts/sun50i-h616.dtsi | 12 ------------ > > 1 file changed, 12 deletions(-) > > > > diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi > > index 953e8fac20f..dd4d2f31111 100644 > > --- a/arch/arm/dts/sun50i-h616.dtsi > > +++ b/arch/arm/dts/sun50i-h616.dtsi > > @@ -51,18 +51,6 @@ > > }; > > }; > > > > - reserved-memory { > > - #address-cells = <2>; > > - #size-cells = <2>; > > - ranges; > > - > > - /* 512KiB reserved for ARM Trusted Firmware (BL31) */ > > - secmon_reserved: secmon@40000000 { > > - reg = <0x0 0x40000000 0x0 0x80000>; > > - no-map; > > - }; > > - }; > > - > > As said always. it's better to not touch Linux dts files. If the same > fix same available in Linux add SHA1 on the commit message otherwise > keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar > at least on sunxi. this DT is not in Linux yet. As this is a new SoC, we have to start at some point, and getting TF-A, Linux and U-Boot patches merged at the same time is virtually impossible. Ideally we have some bootloader support first, so that people can test the kernel patches, for instance. So this DT is a tentative one, just here to make U-Boot happy. It is expected to change, and will be synced once it's merged into Linux. As mentioned, the TF-A patches were changed after the U-Boot patches were merged, so this node was needed back then, but is obsolete now. Cheers, Andre
diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi index 953e8fac20f..dd4d2f31111 100644 --- a/arch/arm/dts/sun50i-h616.dtsi +++ b/arch/arm/dts/sun50i-h616.dtsi @@ -51,18 +51,6 @@ }; }; - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - /* 512KiB reserved for ARM Trusted Firmware (BL31) */ - secmon_reserved: secmon@40000000 { - reg = <0x0 0x40000000 0x0 0x80000>; - no-map; - }; - }; - osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock";
Trusted Firmware now adds the /reserved-memory subnode to the DT at runtime[1], putting in the right values. Drop our hard-coded version, as this might clash with the actual values (which have also changed), and rely on TF-A to add the node. [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770 Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- arch/arm/dts/sun50i-h616.dtsi | 12 ------------ 1 file changed, 12 deletions(-)