diff mbox series

[1/4] riscv: dts: update memory configuration

Message ID 20221019145322.2274420-2-padmarao.begari@microchip.com
State Superseded
Delegated to: Andes
Headers show
Series Update Microchip PolarFire SoC | expand

Commit Message

Padmarao Begari Oct. 19, 2022, 2:53 p.m. UTC
In the v2022.10 Icicle reference design, the seg registers are going to be
changed, resulting in a required change to the memory map.
A small 4MB reservation is made at the end of 32-bit DDR to provide some
memory for the HSS to use, so that it can cache its payload between
reboots of a specific context.

Signed-off-by: Padmarao Begari <padmarao.begari@microchip.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 arch/riscv/dts/microchip-mpfs-icicle-kit.dts | 70 ++++----------------
 1 file changed, 14 insertions(+), 56 deletions(-)

Comments

Conor Dooley Oct. 19, 2022, 3:57 p.m. UTC | #1
On Wed, Oct 19, 2022 at 08:23:19PM +0530, Padmarao Begari wrote:
> In the v2022.10 Icicle reference design, the seg registers are going to be
> changed, resulting in a required change to the memory map.
> A small 4MB reservation is made at the end of 32-bit DDR to provide some
> memory for the HSS to use, so that it can cache its payload between
> reboots of a specific context.
> 
> Signed-off-by: Padmarao Begari <padmarao.begari@microchip.com>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

Hmm, not sure that my SoB here is correct. If you took my patch
directly, then you should change the patch so that I am the author or
otherwise I think it should be:
Co-developed-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Padmarao Begari <padmarao.begari@microchip.com>

I assume that it is the same for the QSPI driver?
Otherwise, LGTM:
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.
> ---
>  arch/riscv/dts/microchip-mpfs-icicle-kit.dts | 70 ++++----------------
>  1 file changed, 14 insertions(+), 56 deletions(-)
> 
> diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> index 287ef3d23b..876c475069 100644
> --- a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> @@ -1,6 +1,6 @@
>  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>  /*
> - * Copyright (C) 2021 Microchip Technology Inc.
> + * Copyright (C) 2021-2022 Microchip Technology Inc.
>   * Padmarao Begari <padmarao.begari@microchip.com>
>   */
>  
> @@ -28,70 +28,28 @@
>  		timebase-frequency = <RTCCLK_FREQ>;
>  	};
>  
> -	reserved-memory {
> -		ranges;
> -		#size-cells = <2>;
> -		#address-cells = <2>;
> -
> -		fabricbuf0: fabricbuf@0 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x0 0xae000000 0x0 0x2000000>;
> -			label = "fabricbuf0-ddr-c";
> -		};
> -
> -		fabricbuf1: fabricbuf@1 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x0 0xc0000000 0x0 0x8000000>;
> -			label = "fabricbuf1-ddr-nc";
> -		};
> -
> -		fabricbuf2: fabricbuf@2 {
> -			compatible = "shared-dma-pool";
> -			reg = <0x0 0xd8000000 0x0 0x8000000>;
> -			label = "fabricbuf2-ddr-nc-wcb";
> -		};
> -	};
> -
> -	udmabuf0 {
> -		compatible = "ikwzm,u-dma-buf";
> -		device-name = "udmabuf-ddr-c0";
> -		minor-number = <0>;
> -		size = <0x0 0x2000000>;
> -		memory-region = <&fabricbuf0>;
> -		sync-mode = <3>;
> -	};
> -
> -	udmabuf1 {
> -		compatible = "ikwzm,u-dma-buf";
> -		device-name = "udmabuf-ddr-nc0";
> -		minor-number = <1>;
> -		size = <0x0 0x8000000>;
> -		memory-region = <&fabricbuf1>;
> -		sync-mode = <3>;
> -	};
> -
> -	udmabuf2 {
> -		compatible = "ikwzm,u-dma-buf";
> -		device-name = "udmabuf-ddr-nc-wcb0";
> -		minor-number = <2>;
> -		size = <0x0 0x8000000>;
> -		memory-region = <&fabricbuf2>;
> -		sync-mode = <3>;
> -	};
> -
>  	ddrc_cache_lo: memory@80000000 {
>  		device_type = "memory";
> -		reg = <0x0 0x80000000 0x0 0x2e000000>;
> -		clocks = <&clkcfg CLK_DDRC>;
> +		reg = <0x0 0x80000000 0x0 0x40000000>;
>  		status = "okay";
>  	};
>  
>  	ddrc_cache_hi: memory@1000000000 {
>  		device_type = "memory";
> -		reg = <0x10 0x0 0x0 0x40000000>;
> -		clocks = <&clkcfg CLK_DDRC>;
> +		reg = <0x10 0x40000000 0x0 0x40000000>;
>  		status = "okay";
>  	};
> +
> +	reserved-memory {
> +		#address-cells = <2>;
> +		#size-cells = <2>;
> +		ranges;
> +
> +		hss_payload: region@BFC00000 {
> +			reg = <0x0 0xBFC00000 0x0 0x400000>;
> +			no-map;
> +		};
> +	};
>  };
>  
>  &uart1 {
> -- 
> 2.25.1
>
Padmarao Begari Oct. 20, 2022, 5:20 a.m. UTC | #2
Hi Conor,

> On Wed, 2022-10-19 at 16:57 +0100, Conor Dooley wrote:
> 
> On Wed, Oct 19, 2022 at 08:23:19PM +0530, Padmarao Begari wrote:
> > In the v2022.10 Icicle reference design, the seg registers are
> > going to be
> > changed, resulting in a required change to the memory map.
> > A small 4MB reservation is made at the end of 32-bit DDR to provide
> > some
> > memory for the HSS to use, so that it can cache its payload between
> > reboots of a specific context.
> > 
> > Signed-off-by: Padmarao Begari <padmarao.begari@microchip.com>
> > Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> 
> Hmm, not sure that my SoB here is correct. If you took my patch
> directly, then you should change the patch so that I am the author or
> otherwise I think it should be:
> Co-developed-by: Conor Dooley <conor.dooley@microchip.com>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> Signed-off-by: Padmarao Begari <padmarao.begari@microchip.com>
> 

Ok. will add you with "Co-developed-by"

Regards
Padmarao
> I assume that it is the same for the QSPI driver?
> Otherwise, LGTM:
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
> 
> Thanks,
> Conor.
> > ---
> >  arch/riscv/dts/microchip-mpfs-icicle-kit.dts | 70 ++++----------
> > ------
> >  1 file changed, 14 insertions(+), 56 deletions(-)
> > 
> > diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> > b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> > index 287ef3d23b..876c475069 100644
> > --- a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> > +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> > @@ -1,6 +1,6 @@
> >  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> >  /*
> > - * Copyright (C) 2021 Microchip Technology Inc.
> > + * Copyright (C) 2021-2022 Microchip Technology Inc.
> >   * Padmarao Begari <padmarao.begari@microchip.com>
> >   */
> > 
> > @@ -28,70 +28,28 @@
> >               timebase-frequency = <RTCCLK_FREQ>;
> >       };
> > 
> > -     reserved-memory {
> > -             ranges;
> > -             #size-cells = <2>;
> > -             #address-cells = <2>;
> > -
> > -             fabricbuf0: fabricbuf@0 {
> > -                     compatible = "shared-dma-pool";
> > -                     reg = <0x0 0xae000000 0x0 0x2000000>;
> > -                     label = "fabricbuf0-ddr-c";
> > -             };
> > -
> > -             fabricbuf1: fabricbuf@1 {
> > -                     compatible = "shared-dma-pool";
> > -                     reg = <0x0 0xc0000000 0x0 0x8000000>;
> > -                     label = "fabricbuf1-ddr-nc";
> > -             };
> > -
> > -             fabricbuf2: fabricbuf@2 {
> > -                     compatible = "shared-dma-pool";
> > -                     reg = <0x0 0xd8000000 0x0 0x8000000>;
> > -                     label = "fabricbuf2-ddr-nc-wcb";
> > -             };
> > -     };
> > -
> > -     udmabuf0 {
> > -             compatible = "ikwzm,u-dma-buf";
> > -             device-name = "udmabuf-ddr-c0";
> > -             minor-number = <0>;
> > -             size = <0x0 0x2000000>;
> > -             memory-region = <&fabricbuf0>;
> > -             sync-mode = <3>;
> > -     };
> > -
> > -     udmabuf1 {
> > -             compatible = "ikwzm,u-dma-buf";
> > -             device-name = "udmabuf-ddr-nc0";
> > -             minor-number = <1>;
> > -             size = <0x0 0x8000000>;
> > -             memory-region = <&fabricbuf1>;
> > -             sync-mode = <3>;
> > -     };
> > -
> > -     udmabuf2 {
> > -             compatible = "ikwzm,u-dma-buf";
> > -             device-name = "udmabuf-ddr-nc-wcb0";
> > -             minor-number = <2>;
> > -             size = <0x0 0x8000000>;
> > -             memory-region = <&fabricbuf2>;
> > -             sync-mode = <3>;
> > -     };
> > -
> >       ddrc_cache_lo: memory@80000000 {
> >               device_type = "memory";
> > -             reg = <0x0 0x80000000 0x0 0x2e000000>;
> > -             clocks = <&clkcfg CLK_DDRC>;
> > +             reg = <0x0 0x80000000 0x0 0x40000000>;
> >               status = "okay";
> >       };
> > 
> >       ddrc_cache_hi: memory@1000000000 {
> >               device_type = "memory";
> > -             reg = <0x10 0x0 0x0 0x40000000>;
> > -             clocks = <&clkcfg CLK_DDRC>;
> > +             reg = <0x10 0x40000000 0x0 0x40000000>;
> >               status = "okay";
> >       };
> > +
> > +     reserved-memory {
> > +             #address-cells = <2>;
> > +             #size-cells = <2>;
> > +             ranges;
> > +
> > +             hss_payload: region@BFC00000 {
> > +                     reg = <0x0 0xBFC00000 0x0 0x400000>;
> > +                     no-map;
> > +             };
> > +     };
> >  };
> > 
> >  &uart1 {
> > --
> > 2.25.1
> >
diff mbox series

Patch

diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
index 287ef3d23b..876c475069 100644
--- a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
+++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
@@ -1,6 +1,6 @@ 
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2021 Microchip Technology Inc.
+ * Copyright (C) 2021-2022 Microchip Technology Inc.
  * Padmarao Begari <padmarao.begari@microchip.com>
  */
 
@@ -28,70 +28,28 @@ 
 		timebase-frequency = <RTCCLK_FREQ>;
 	};
 
-	reserved-memory {
-		ranges;
-		#size-cells = <2>;
-		#address-cells = <2>;
-
-		fabricbuf0: fabricbuf@0 {
-			compatible = "shared-dma-pool";
-			reg = <0x0 0xae000000 0x0 0x2000000>;
-			label = "fabricbuf0-ddr-c";
-		};
-
-		fabricbuf1: fabricbuf@1 {
-			compatible = "shared-dma-pool";
-			reg = <0x0 0xc0000000 0x0 0x8000000>;
-			label = "fabricbuf1-ddr-nc";
-		};
-
-		fabricbuf2: fabricbuf@2 {
-			compatible = "shared-dma-pool";
-			reg = <0x0 0xd8000000 0x0 0x8000000>;
-			label = "fabricbuf2-ddr-nc-wcb";
-		};
-	};
-
-	udmabuf0 {
-		compatible = "ikwzm,u-dma-buf";
-		device-name = "udmabuf-ddr-c0";
-		minor-number = <0>;
-		size = <0x0 0x2000000>;
-		memory-region = <&fabricbuf0>;
-		sync-mode = <3>;
-	};
-
-	udmabuf1 {
-		compatible = "ikwzm,u-dma-buf";
-		device-name = "udmabuf-ddr-nc0";
-		minor-number = <1>;
-		size = <0x0 0x8000000>;
-		memory-region = <&fabricbuf1>;
-		sync-mode = <3>;
-	};
-
-	udmabuf2 {
-		compatible = "ikwzm,u-dma-buf";
-		device-name = "udmabuf-ddr-nc-wcb0";
-		minor-number = <2>;
-		size = <0x0 0x8000000>;
-		memory-region = <&fabricbuf2>;
-		sync-mode = <3>;
-	};
-
 	ddrc_cache_lo: memory@80000000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000 0x0 0x2e000000>;
-		clocks = <&clkcfg CLK_DDRC>;
+		reg = <0x0 0x80000000 0x0 0x40000000>;
 		status = "okay";
 	};
 
 	ddrc_cache_hi: memory@1000000000 {
 		device_type = "memory";
-		reg = <0x10 0x0 0x0 0x40000000>;
-		clocks = <&clkcfg CLK_DDRC>;
+		reg = <0x10 0x40000000 0x0 0x40000000>;
 		status = "okay";
 	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		hss_payload: region@BFC00000 {
+			reg = <0x0 0xBFC00000 0x0 0x400000>;
+			no-map;
+		};
+	};
 };
 
 &uart1 {