linux-riscv.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
@ 2022-06-29 20:07 Conor Dooley
  2022-06-30 15:41 ` Sudeep Holla
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Conor Dooley @ 2022-06-29 20:07 UTC (permalink / raw)
  To: Daire McNamara, Ivan Griffin, Palmer Dabbelt, Palmer Dabbelt,
	linux-riscv
  Cc: Conor Dooley, Rob Herring, Krzysztof Kozlowski, Paul Walmsley,
	Albert Ou, Atish Patra, Sudeep Holla, devicetree, linux-kernel

From: Conor Dooley <conor.dooley@microchip.com>

The initial PolarFire SoC devicetree must have been forked off from
the fu540 one prior to the addition of l2cache controller support being
added there. When the controller node was added to mpfs.dtsi, it was
not hooked up to the CPUs & thus sysfs reports an incorrect cache
configuration. Hook it up.

Fixes: 0fa6107eca41 ("RISC-V: Initial DTS for Microchip ICICLE board")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 arch/riscv/boot/dts/microchip/mpfs.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi
index 3095d08453a1..496d3b7642bd 100644
--- a/arch/riscv/boot/dts/microchip/mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi
@@ -50,6 +50,7 @@ cpu1: cpu@1 {
 			riscv,isa = "rv64imafdc";
 			clocks = <&clkcfg CLK_CPU>;
 			tlb-split;
+			next-level-cache = <&cctrllr>;
 			status = "okay";
 
 			cpu1_intc: interrupt-controller {
@@ -77,6 +78,7 @@ cpu2: cpu@2 {
 			riscv,isa = "rv64imafdc";
 			clocks = <&clkcfg CLK_CPU>;
 			tlb-split;
+			next-level-cache = <&cctrllr>;
 			status = "okay";
 
 			cpu2_intc: interrupt-controller {
@@ -104,6 +106,7 @@ cpu3: cpu@3 {
 			riscv,isa = "rv64imafdc";
 			clocks = <&clkcfg CLK_CPU>;
 			tlb-split;
+			next-level-cache = <&cctrllr>;
 			status = "okay";
 
 			cpu3_intc: interrupt-controller {
@@ -131,6 +134,7 @@ cpu4: cpu@4 {
 			riscv,isa = "rv64imafdc";
 			clocks = <&clkcfg CLK_CPU>;
 			tlb-split;
+			next-level-cache = <&cctrllr>;
 			status = "okay";
 			cpu4_intc: interrupt-controller {
 				#interrupt-cells = <1>;
-- 
2.36.1


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
  2022-06-29 20:07 [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
@ 2022-06-30 15:41 ` Sudeep Holla
  2022-07-05 11:42 ` [PATCH] riscv: dts: microchip: hook up the mpfs's l2cache Daire McNamara
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Sudeep Holla @ 2022-06-30 15:41 UTC (permalink / raw)
  To: Conor Dooley
  Cc: Daire McNamara, Ivan Griffin, Palmer Dabbelt, Palmer Dabbelt,
	linux-riscv, Conor Dooley, Rob Herring, Krzysztof Kozlowski,
	Paul Walmsley, Albert Ou, Atish Patra, devicetree, linux-kernel

On Wed, Jun 29, 2022 at 09:07:33PM +0100, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> The initial PolarFire SoC devicetree must have been forked off from
> the fu540 one prior to the addition of l2cache controller support being
> added there. When the controller node was added to mpfs.dtsi, it was
> not hooked up to the CPUs & thus sysfs reports an incorrect cache
> configuration. Hook it up.
>

Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>

-- 
Regards,
Sudeep

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] riscv: dts: microchip: hook up the mpfs's l2cache
  2022-06-29 20:07 [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
  2022-06-30 15:41 ` Sudeep Holla
@ 2022-07-05 11:42 ` Daire McNamara
  2022-07-05 16:36 ` [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
  2022-07-15 17:32 ` Palmer Dabbelt
  3 siblings, 0 replies; 6+ messages in thread
From: Daire McNamara @ 2022-07-05 11:42 UTC (permalink / raw)
  To: conor, conor.dooley
  Cc: aou, atishp, daire.mcnamara, devicetree, ivan.griffin,
	krzysztof.kozlowski+dt, linux-kernel, linux-riscv, palmer,
	palmer, paul.walmsley, robh+dt, sudeep.holla

Reviewed-by: Daire McNamara <daire.mcnamara@microchip.com>

> From: Conor Dooley <conor.dooley@microchip.com>
> Date: Monday, 4 July 2022 at 10:04
> To: FPGA ESS Linux patches <FPGA-ESS-Linux-Patches@microchip.com>
> Cc: Conor Dooley - M52691 <Conor.Dooley@microchip.com>
> Subject: [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
> 
> The initial PolarFire SoC devicetree must have been forked off from
> the fu540 one prior to the addition of l2cache controller support being
> added there. When the controller node was added to mpfs.dtsi, it was
> not hooked up to the CPUs & thus sysfs reports an incorrect cache
> configuration. Hook it up.
> 
> Fixes: 0fa6107eca41 ("RISC-V: Initial DTS for Microchip ICICLE board")
> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
>  arch/riscv/boot/dts/microchip/mpfs.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi
> index ed8739350587..2df555a57003 100644
> --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi
> +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi
> @@ -50,6 +50,7 @@ cpu1: cpu@1 {
>                          riscv,isa = "rv64imafdc";
>                          clocks = <&clkcfg CLK_CPU>;
>                          tlb-split;
> +                       next-level-cache = <&cctrllr>;
>                          status = "okay";
>  
>                          cpu1_intc: interrupt-controller {
> @@ -77,6 +78,7 @@ cpu2: cpu@2 {
>                          riscv,isa = "rv64imafdc";
>                          clocks = <&clkcfg CLK_CPU>;
>                          tlb-split;
> +                       next-level-cache = <&cctrllr>;
>                          status = "okay";
>  
>                          cpu2_intc: interrupt-controller {
> @@ -104,6 +106,7 @@ cpu3: cpu@3 {
>                          riscv,isa = "rv64imafdc";
>                          clocks = <&clkcfg CLK_CPU>;
>                          tlb-split;
> +                       next-level-cache = <&cctrllr>;
>                          status = "okay";
>  
>                          cpu3_intc: interrupt-controller {
> @@ -131,6 +134,7 @@ cpu4: cpu@4 {
>                          riscv,isa = "rv64imafdc";
>                          clocks = <&clkcfg CLK_CPU>;
>                          tlb-split;
> +                       next-level-cache = <&cctrllr>;
>                          status = "okay";
>                          cpu4_intc: interrupt-controller {
>                                  #interrupt-cells = <1>;
> -- 
> 2.36.1

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
  2022-06-29 20:07 [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
  2022-06-30 15:41 ` Sudeep Holla
  2022-07-05 11:42 ` [PATCH] riscv: dts: microchip: hook up the mpfs's l2cache Daire McNamara
@ 2022-07-05 16:36 ` Conor Dooley
  2022-07-15 17:32 ` Palmer Dabbelt
  3 siblings, 0 replies; 6+ messages in thread
From: Conor Dooley @ 2022-07-05 16:36 UTC (permalink / raw)
  To: palmer, linux-riscv, daire.mcnamara, palmer, ivan.griffin, conor
  Cc: Conor Dooley, devicetree, paul.walmsley, krzysztof.kozlowski+dt,
	atishp, aou, sudeep.holla, robh+dt, linux-kernel

From: Conor Dooley <conor.dooley@microchip.com>

On Wed, 29 Jun 2022 21:07:33 +0100, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> The initial PolarFire SoC devicetree must have been forked off from
> the fu540 one prior to the addition of l2cache controller support being
> added there. When the controller node was added to mpfs.dtsi, it was
> not hooked up to the CPUs & thus sysfs reports an incorrect cache
> configuration. Hook it up.
> 
> [...]

Applied to dt-fixes, thanks!

[1/1] riscv: dts: microchip: hook up the mpfs' l2cache
      https://git.kernel.org/conor/c/efa310ba0071

Thanks,
Conor.

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
  2022-06-29 20:07 [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
                   ` (2 preceding siblings ...)
  2022-07-05 16:36 ` [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
@ 2022-07-15 17:32 ` Palmer Dabbelt
  2022-07-15 17:38   ` Conor.Dooley
  3 siblings, 1 reply; 6+ messages in thread
From: Palmer Dabbelt @ 2022-07-15 17:32 UTC (permalink / raw)
  To: conor
  Cc: daire.mcnamara, ivan.griffin, linux-riscv, conor.dooley, robh+dt,
	krzysztof.kozlowski+dt, Paul Walmsley, aou, atishp, sudeep.holla,
	devicetree, linux-kernel

On Wed, 29 Jun 2022 13:07:33 PDT (-0700), conor@kernel.org wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> The initial PolarFire SoC devicetree must have been forked off from
> the fu540 one prior to the addition of l2cache controller support being
> added there. When the controller node was added to mpfs.dtsi, it was
> not hooked up to the CPUs & thus sysfs reports an incorrect cache
> configuration. Hook it up.
>
> Fixes: 0fa6107eca41 ("RISC-V: Initial DTS for Microchip ICICLE board")

I just noticed this as I was looking over the PR I just sent, but since 
you're sending PRs I'm no longer re-writing your commits and thus I 
won't be adding stable CCs.  If you want stuff CC'd to stable you'll 
have to either add it to the tags in the commit, or do so after the 
fact.

> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
>  arch/riscv/boot/dts/microchip/mpfs.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi
> index 3095d08453a1..496d3b7642bd 100644
> --- a/arch/riscv/boot/dts/microchip/mpfs.dtsi
> +++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi
> @@ -50,6 +50,7 @@ cpu1: cpu@1 {
>  			riscv,isa = "rv64imafdc";
>  			clocks = <&clkcfg CLK_CPU>;
>  			tlb-split;
> +			next-level-cache = <&cctrllr>;
>  			status = "okay";
>
>  			cpu1_intc: interrupt-controller {
> @@ -77,6 +78,7 @@ cpu2: cpu@2 {
>  			riscv,isa = "rv64imafdc";
>  			clocks = <&clkcfg CLK_CPU>;
>  			tlb-split;
> +			next-level-cache = <&cctrllr>;
>  			status = "okay";
>
>  			cpu2_intc: interrupt-controller {
> @@ -104,6 +106,7 @@ cpu3: cpu@3 {
>  			riscv,isa = "rv64imafdc";
>  			clocks = <&clkcfg CLK_CPU>;
>  			tlb-split;
> +			next-level-cache = <&cctrllr>;
>  			status = "okay";
>
>  			cpu3_intc: interrupt-controller {
> @@ -131,6 +134,7 @@ cpu4: cpu@4 {
>  			riscv,isa = "rv64imafdc";
>  			clocks = <&clkcfg CLK_CPU>;
>  			tlb-split;
> +			next-level-cache = <&cctrllr>;
>  			status = "okay";
>  			cpu4_intc: interrupt-controller {
>  				#interrupt-cells = <1>;

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache
  2022-07-15 17:32 ` Palmer Dabbelt
@ 2022-07-15 17:38   ` Conor.Dooley
  0 siblings, 0 replies; 6+ messages in thread
From: Conor.Dooley @ 2022-07-15 17:38 UTC (permalink / raw)
  To: palmer, conor
  Cc: Daire.McNamara, Ivan.Griffin, linux-riscv, Conor.Dooley, robh+dt,
	krzysztof.kozlowski+dt, paul.walmsley, aou, atishp, sudeep.holla,
	devicetree, linux-kernel

On 15/07/2022 18:32, Palmer Dabbelt wrote:
> On Wed, 29 Jun 2022 13:07:33 PDT (-0700), conor@kernel.org wrote:
>> From: Conor Dooley <conor.dooley@microchip.com>
>>
>> The initial PolarFire SoC devicetree must have been forked off from
>> the fu540 one prior to the addition of l2cache controller support being
>> added there. When the controller node was added to mpfs.dtsi, it was
>> not hooked up to the CPUs & thus sysfs reports an incorrect cache
>> configuration. Hook it up.
>>
>> Fixes: 0fa6107eca41 ("RISC-V: Initial DTS for Microchip ICICLE board")
> 
> I just noticed this as I was looking over the PR I just sent, but since you're sending PRs I'm no longer re-writing your commits and thus I won't be adding stable CCs.  If you want stuff CC'd to stable you'll have to either add it to the tags in the commit, or do so after the fact.

Or option 3, Sasha AUTOSELs it :)

Good point though, I'll make sure to tack on the CC:stable where
needed. I *think* that I have not done this isn't the worst thing
in the world since it is only two patches & only one kernel to
backport it to, but I'll make sure to do it going forward.

Thanks Palmer.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-07-15 17:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-29 20:07 [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
2022-06-30 15:41 ` Sudeep Holla
2022-07-05 11:42 ` [PATCH] riscv: dts: microchip: hook up the mpfs's l2cache Daire McNamara
2022-07-05 16:36 ` [PATCH] riscv: dts: microchip: hook up the mpfs' l2cache Conor Dooley
2022-07-15 17:32 ` Palmer Dabbelt
2022-07-15 17:38   ` Conor.Dooley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).