linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag
@ 2022-08-01 19:46 William Zhang
  2022-08-01 19:46 ` [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node William Zhang
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: William Zhang @ 2022-08-01 19:46 UTC (permalink / raw)
  To: Linux ARM List
  Cc: f.fainelli, Broadcom Kernel List, kursad.oney, dan.beygelman,
	anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
	Rob Herring, devicetree, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 1232 bytes --]

The cpu mask flag value should match the number of cpu cores in the
chip. Correct the value to two cpus for BCM6846 dual core SoC.

Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

 arch/arm/boot/dts/bcm6846.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index e610c102498f..b74491a3f111 100644
--- a/arch/arm/boot/dts/bcm6846.dtsi
+++ b/arch/arm/boot/dts/bcm6846.dtsi
@@ -40,10 +40,10 @@ L2_0: l2-cache0 {
 
 	timer {
 		compatible = "arm,armv7-timer";
-		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
 		arm,cpu-registers-not-fw-configured;
 	};
 
-- 
2.34.1


[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node
  2022-08-01 19:46 [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag William Zhang
@ 2022-08-01 19:46 ` William Zhang
  2022-08-04 18:06   ` Florian Fainelli
  2022-08-01 19:46 ` [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node William Zhang
  2022-08-04 18:06 ` [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag Florian Fainelli
  2 siblings, 1 reply; 6+ messages in thread
From: William Zhang @ 2022-08-01 19:46 UTC (permalink / raw)
  To: Linux ARM List
  Cc: f.fainelli, Broadcom Kernel List, kursad.oney, dan.beygelman,
	anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
	Rob Herring, devicetree, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 691 bytes --]

Remove unnecessary cpu_on and cpu_off properties from psci
node as they are only needed for psci version prior to 0.2.

Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

 arch/arm/boot/dts/bcm6846.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index b74491a3f111..9876ceb1d47c 100644
--- a/arch/arm/boot/dts/bcm6846.dtsi
+++ b/arch/arm/boot/dts/bcm6846.dtsi
@@ -65,8 +65,6 @@ periph_clk: periph-clk {
 	psci {
 		compatible = "arm,psci-0.2";
 		method = "smc";
-		cpu_off = <1>;
-		cpu_on = <2>;
 	};
 
 	axi@81000000 {
-- 
2.34.1


[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node
  2022-08-01 19:46 [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag William Zhang
  2022-08-01 19:46 ` [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node William Zhang
@ 2022-08-01 19:46 ` William Zhang
  2022-08-04 18:07   ` Florian Fainelli
  2022-08-04 18:06 ` [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag Florian Fainelli
  2 siblings, 1 reply; 6+ messages in thread
From: William Zhang @ 2022-08-01 19:46 UTC (permalink / raw)
  To: Linux ARM List
  Cc: f.fainelli, Broadcom Kernel List, kursad.oney, dan.beygelman,
	anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
	Rob Herring, devicetree, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 1048 bytes --]

Add the missing gic registers and interrupts property to the gic node.

Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Signed-off-by: William Zhang <william.zhang@broadcom.com>

---

 arch/arm/boot/dts/bcm6846.dtsi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index 9876ceb1d47c..8aa47a2583b2 100644
--- a/arch/arm/boot/dts/bcm6846.dtsi
+++ b/arch/arm/boot/dts/bcm6846.dtsi
@@ -71,15 +71,17 @@ axi@81000000 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		ranges = <0 0x81000000 0x4000>;
+		ranges = <0 0x81000000 0x8000>;
 
 		gic: interrupt-controller@1000 {
 			compatible = "arm,cortex-a7-gic";
 			#interrupt-cells = <3>;
-			#address-cells = <0>;
 			interrupt-controller;
+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
 			reg = <0x1000 0x1000>,
-				<0x2000 0x2000>;
+				<0x2000 0x2000>,
+				<0x4000 0x2000>,
+				<0x6000 0x2000>;
 		};
 	};
 
-- 
2.34.1


[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag
  2022-08-01 19:46 [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag William Zhang
  2022-08-01 19:46 ` [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node William Zhang
  2022-08-01 19:46 ` [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node William Zhang
@ 2022-08-04 18:06 ` Florian Fainelli
  2 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2022-08-04 18:06 UTC (permalink / raw)
  To: bcm-kernel-feedback-list, William Zhang, Linux ARM List
  Cc: kursad.oney, dan.beygelman, anand.gore, joel.peshkin,
	Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel

On Mon,  1 Aug 2022 12:46:45 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> The cpu mask flag value should match the number of cpu cores in the
> chip. Correct the value to two cpus for BCM6846 dual core SoC.
> 
> Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node
  2022-08-01 19:46 ` [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node William Zhang
@ 2022-08-04 18:06   ` Florian Fainelli
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2022-08-04 18:06 UTC (permalink / raw)
  To: bcm-kernel-feedback-list, William Zhang, Linux ARM List
  Cc: kursad.oney, dan.beygelman, anand.gore, joel.peshkin,
	Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel

On Mon,  1 Aug 2022 12:46:46 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> Remove unnecessary cpu_on and cpu_off properties from psci
> node as they are only needed for psci version prior to 0.2.
> 
> Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node
  2022-08-01 19:46 ` [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node William Zhang
@ 2022-08-04 18:07   ` Florian Fainelli
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2022-08-04 18:07 UTC (permalink / raw)
  To: bcm-kernel-feedback-list, William Zhang, Linux ARM List
  Cc: kursad.oney, dan.beygelman, anand.gore, joel.peshkin,
	Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel

On Mon,  1 Aug 2022 12:46:47 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> Add the missing gic registers and interrupts property to the gic node.
> 
> Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> 
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-08-04 18:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-01 19:46 [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag William Zhang
2022-08-01 19:46 ` [PATCH 2/3] ARM: dts: bcmbca: bcm6846: clean up psci node William Zhang
2022-08-04 18:06   ` Florian Fainelli
2022-08-01 19:46 ` [PATCH 3/3] ARM: dts: bcmbca: bcm6846: fix interrupt controller node William Zhang
2022-08-04 18:07   ` Florian Fainelli
2022-08-04 18:06 ` [PATCH 1/3] ARM: dts: bcmbca: bcm6846: fix timer node cpu mask flag Florian Fainelli

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).