[PATCH v5 0/3] AM64: Update the locations of various elements in SRAM

[PATCH v5 0/3] AM64: Update the locations of various elements in SRAM

[Aswath Govindraju]

The following series of patches,
- Increase the maximum size of TF-A
- Update the location of TF-A due to a limitation for DFU boot
- Indicate reserved locations for DMSC code and secure proxy


Link to corresponding U-Boot series that makes these changes:
- https://patchwork.ozlabs.org/project/uboot/list/?series=249235

changes since v4:
- increased the size of TF-A to 128KB to account for future expansions
- Reworded the commit message of patch 3 to include the U-Boot version in
  which the TF-A has been moved to corresponding location
- picked up Suman anna's reviewed-by for patch 2 

changes since v3:
- fixed the title of patches 1 and 2

changes since v2:
- split the patches into three
- added regions for indicating memory regions reserved for
  dmsc and secure proxy
- moved the TFA location to 0x701c4000


Aswath Govindraju (3):
  arm64: dts: ti: k3-am64-main: Update TF-A's maximum size and node name
  arm64: dts: ti: k3-am64-main: Reserve OCMRAM for DMSC-lite and secure
    proxy communication
  arm64: dts: ti: k3-am64-main: Update the location of TF-A in
    compliance with U-Boot v2021.10

 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

-- 
2.17.1

[PATCH v5 1/3] arm64: dts: ti: k3-am64-main: Update TF-A's maximum size and node name

[Aswath Govindraju]

The maximum size of TF-A 2.5 has been increased to 0x1c000 [1]. In order to
account for future expansions too, increase the allocated size for TF-A to
0x20000, in the device tree node.

Also, update the node name to "tfa-sram".

[1] - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=2fb5312f61a7de8b7a70e1639199c4f14a10b6f9

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index dec54243f454..e918afc2298e 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -24,8 +24,8 @@
 		#size-cells = <1>;
 		ranges = <0x0 0x00 0x70000000 0x200000>;
 
-		atf-sram@0 {
-			reg = <0x0 0x1a000>;
+		tfa-sram@0 {
+			reg = <0x0 0x20000>;
 		};
 	};
 
-- 
2.17.1

Re: [PATCH v5 1/3] arm64: dts: ti: k3-am64-main: Update TF-A's maximum size and node name

[Suman Anna]

On 6/16/21 12:12 PM, Aswath Govindraju wrote:
> The maximum size of TF-A 2.5 has been increased to 0x1c000 [1]. In order to
> account for future expansions too, increase the allocated size for TF-A to
> 0x20000, in the device tree node.
> 
> Also, update the node name to "tfa-sram".
> 
> [1] - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=2fb5312f61a7de8b7a70e1639199c4f14a10b6f9
> 
> Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>

Reviewed-by: Suman Anna <s-anna@ti.com>

> ---
>  arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index dec54243f454..e918afc2298e 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -24,8 +24,8 @@
>  		#size-cells = <1>;
>  		ranges = <0x0 0x00 0x70000000 0x200000>;
>  
> -		atf-sram@0 {
> -			reg = <0x0 0x1a000>;
> +		tfa-sram@0 {
> +			reg = <0x0 0x20000>;
>  		};
>  	};
>  
> 

[PATCH v5 2/3] arm64: dts: ti: k3-am64-main: Reserve OCMRAM for DMSC-lite and secure proxy communication

[Aswath Govindraju]

The final 128KB in SRAM is reserved by default for DMSC-lite code and
secure proxy communication buffer. The memory region used for DMSC-lite
code can be optionally freed up by secure firmware API[1]. However, the
buffer for secure proxy communication is not configurable. This default
hardware configuration is unique for AM64.

Therefore, indicate the area reserved for DMSC-lite code and secure proxy
communication buffer in the oc_sram device tree node.

[1] - http://downloads.ti.com/tisci/esd/latest/6_topic_user_guides/security_handover.html#triggering-security-handover

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index e918afc2298e..27888ee6f039 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -27,6 +27,14 @@
 		tfa-sram@0 {
 			reg = <0x0 0x20000>;
 		};
+
+		dmsc-sram@1e0000 {
+			reg = <0x1e0000 0x1c000>;
+		};
+
+		sproxy-sram@1fc000 {
+			reg = <0x1fc000 0x4000>;
+		};
 	};
 
 	main_conf: syscon@43000000 {
-- 
2.17.1

[PATCH v5 3/3] arm64: dts: ti: k3-am64-main: Update the location of TF-A in compliance with U-Boot v2021.10

[Aswath Govindraju]

Due to a limitation for USB DFU boot mode, SPL load address has to be less
than  or equal to 0x70001000. So, load address of SPL and TF-A have been
moved to 0x70000000 and 0x701c0000 respectively, in U-Boot version 2021.10.

Therefore, update TF-A's location in the device tree node.

Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index 27888ee6f039..62d2b8fff67d 100644
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -24,8 +24,8 @@
 		#size-cells = <1>;
 		ranges = <0x0 0x00 0x70000000 0x200000>;
 
-		tfa-sram@0 {
-			reg = <0x0 0x20000>;
+		tfa-sram@1c0000 {
+			reg = <0x1c0000 0x20000>;
 		};
 
 		dmsc-sram@1e0000 {
-- 
2.17.1

Re: [PATCH v5 3/3] arm64: dts: ti: k3-am64-main: Update the location of TF-A in compliance with U-Boot v2021.10

[Suman Anna]

On 6/16/21 12:12 PM, Aswath Govindraju wrote:
> Due to a limitation for USB DFU boot mode, SPL load address has to be less
> than  or equal to 0x70001000. So, load address of SPL and TF-A have been
> moved to 0x70000000 and 0x701c0000 respectively, in U-Boot version 2021.10.
> 
> Therefore, update TF-A's location in the device tree node.
> 
> Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>

Reviewed-by: Suman Anna <s-anna@ti.com>

> ---
>  arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index 27888ee6f039..62d2b8fff67d 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -24,8 +24,8 @@
>  		#size-cells = <1>;
>  		ranges = <0x0 0x00 0x70000000 0x200000>;
>  
> -		tfa-sram@0 {
> -			reg = <0x0 0x20000>;
> +		tfa-sram@1c0000 {
> +			reg = <0x1c0000 0x20000>;
>  		};
>  
>  		dmsc-sram@1e0000 {
> 

Re: [PATCH v5 0/3] AM64: Update the locations of various elements in SRAM

[Nishanth Menon]

On Wed, 16 Jun 2021 22:42:21 +0530, Aswath Govindraju wrote:
> The following series of patches,
> - Increase the maximum size of TF-A
> - Update the location of TF-A due to a limitation for DFU boot
> - Indicate reserved locations for DMSC code and secure proxy
> 
> 
> Link to corresponding U-Boot series that makes these changes:
> - https://patchwork.ozlabs.org/project/uboot/list/?series=249235
> 
> [...]

Hi Aswath Govindraju,

I have applied the following to branch ti-k3-dts-next on [1].
Thank you!


NOTE: I updated the $subject of patch #3 to be:
arm64: dts: ti: k3-am64-main: Update TF-A load address to workaround USB DFU
limitation

[1/3] arm64: dts: ti: k3-am64-main: Update TF-A's maximum size and node name
      commit: 263820efa3fb08cc606736b68290d9be9c46e2e5
[2/3] arm64: dts: ti: k3-am64-main: Reserve OCMRAM for DMSC-lite and secure proxy communication
      commit: 454a9d4aaacb89daea350d21628992bb83de649f
[3/3] arm64: dts: ti: k3-am64-main: Update TF-A load address to workaround USB DFU limitation
      commit: 3de27ef12ccb50205e602d92f29d082429aa2964


All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D