* [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value
@ 2022-07-29 1:50 William Zhang
2022-07-29 1:50 ` [PATCH 2/4] ARM: dts: bcmbca: fix interrupt controller properties William Zhang
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: William Zhang @ 2022-07-29 1:50 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, kursad.oney, dan.beygelman, f.fainelli,
anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
Rob Herring, devicetree, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 3199 bytes --]
The cpu mask flag value should match the number of cpu cores in the
chip. Correct the value accordingly for BCM63178, BCM6846 and BCM6878.
Fixes: fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")
Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Fixes: 6bcad714e173 ("ARM: dts: Add DTS files for bcmbca SoC BCM6878")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/boot/dts/bcm63178.dtsi | 8 ++++----
arch/arm/boot/dts/bcm6846.dtsi | 8 ++++----
arch/arm/boot/dts/bcm6878.dtsi | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/bcm63178.dtsi b/arch/arm/boot/dts/bcm63178.dtsi
index 5463443f0762..14d2c5bd2c52 100644
--- a/arch/arm/boot/dts/bcm63178.dtsi
+++ b/arch/arm/boot/dts/bcm63178.dtsi
@@ -46,10 +46,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(3) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>;
arm,cpu-registers-not-fw-configured;
};
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;
};
diff --git a/arch/arm/boot/dts/bcm6878.dtsi b/arch/arm/boot/dts/bcm6878.dtsi
index a7dff596fe1e..6dd3d2df4e16 100644
--- a/arch/arm/boot/dts/bcm6878.dtsi
+++ b/arch/arm/boot/dts/bcm6878.dtsi
@@ -39,10 +39,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] 5+ messages in thread* [PATCH 2/4] ARM: dts: bcmbca: fix interrupt controller properties
2022-07-29 1:50 [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value William Zhang
@ 2022-07-29 1:50 ` William Zhang
2022-07-29 1:50 ` [PATCH 3/4] ARM: dts: bcmbca: clean up psci node William Zhang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: William Zhang @ 2022-07-29 1:50 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, kursad.oney, dan.beygelman, f.fainelli,
anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
Rob Herring, devicetree, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1929 bytes --]
Add the missing gic registers and interrupts property to the gic node
for BCM63178 and BCM6846.
Fixes: fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")
Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/boot/dts/bcm63178.dtsi | 8 +++++---
arch/arm/boot/dts/bcm6846.dtsi | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/bcm63178.dtsi b/arch/arm/boot/dts/bcm63178.dtsi
index 14d2c5bd2c52..202baa3a5e74 100644
--- a/arch/arm/boot/dts/bcm63178.dtsi
+++ b/arch/arm/boot/dts/bcm63178.dtsi
@@ -88,15 +88,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(3) | IRQ_TYPE_LEVEL_HIGH)>;
reg = <0x1000 0x1000>,
- <0x2000 0x2000>;
+ <0x2000 0x2000>,
+ <0x4000 0x2000>,
+ <0x6000 0x2000>;
};
};
diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index b74491a3f111..93b44283b9ba 100644
--- a/arch/arm/boot/dts/bcm6846.dtsi
+++ b/arch/arm/boot/dts/bcm6846.dtsi
@@ -73,15 +73,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] 5+ messages in thread* [PATCH 3/4] ARM: dts: bcmbca: clean up psci node
2022-07-29 1:50 [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value William Zhang
2022-07-29 1:50 ` [PATCH 2/4] ARM: dts: bcmbca: fix interrupt controller properties William Zhang
@ 2022-07-29 1:50 ` William Zhang
2022-07-29 1:50 ` [PATCH 4/4] ARM: dts: bcmbca: cosmetic change William Zhang
2022-08-01 15:31 ` [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value Florian Fainelli
3 siblings, 0 replies; 5+ messages in thread
From: William Zhang @ 2022-07-29 1:50 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, kursad.oney, dan.beygelman, f.fainelli,
anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
Rob Herring, devicetree, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1181 bytes --]
Remove unnecessary cpu_on and cpu_off properties from psci node for
BCM63178 and BCM6846 as they are only needed for psci version prior to
0.2.
Fixes: fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")
Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/boot/dts/bcm63178.dtsi | 2 --
arch/arm/boot/dts/bcm6846.dtsi | 2 --
2 files changed, 4 deletions(-)
diff --git a/arch/arm/boot/dts/bcm63178.dtsi b/arch/arm/boot/dts/bcm63178.dtsi
index 202baa3a5e74..dba71fa53466 100644
--- a/arch/arm/boot/dts/bcm63178.dtsi
+++ b/arch/arm/boot/dts/bcm63178.dtsi
@@ -80,8 +80,6 @@ uart_clk: uart-clk {
psci {
compatible = "arm,psci-0.2";
method = "smc";
- cpu_off = <1>;
- cpu_on = <2>;
};
axi@81000000 {
diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index 93b44283b9ba..8aa47a2583b2 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] 5+ messages in thread* [PATCH 4/4] ARM: dts: bcmbca: cosmetic change
2022-07-29 1:50 [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value William Zhang
2022-07-29 1:50 ` [PATCH 2/4] ARM: dts: bcmbca: fix interrupt controller properties William Zhang
2022-07-29 1:50 ` [PATCH 3/4] ARM: dts: bcmbca: clean up psci node William Zhang
@ 2022-07-29 1:50 ` William Zhang
2022-08-01 15:31 ` [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value Florian Fainelli
3 siblings, 0 replies; 5+ messages in thread
From: William Zhang @ 2022-07-29 1:50 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, kursad.oney, dan.beygelman, f.fainelli,
anand.gore, joel.peshkin, William Zhang, Krzysztof Kozlowski,
Rob Herring, devicetree, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1516 bytes --]
Add new line between dts nodes for BCM63178 and BCM6878.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/boot/dts/bcm63178.dtsi | 3 +++
arch/arm/boot/dts/bcm6878.dtsi | 2 ++
2 files changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/bcm63178.dtsi b/arch/arm/boot/dts/bcm63178.dtsi
index dba71fa53466..29e621517e06 100644
--- a/arch/arm/boot/dts/bcm63178.dtsi
+++ b/arch/arm/boot/dts/bcm63178.dtsi
@@ -32,6 +32,7 @@ CA7_1: cpu@1 {
next-level-cache = <&L2_0>;
enable-method = "psci";
};
+
CA7_2: cpu@2 {
device_type = "cpu";
compatible = "arm,cortex-a7";
@@ -39,6 +40,7 @@ CA7_2: cpu@2 {
next-level-cache = <&L2_0>;
enable-method = "psci";
};
+
L2_0: l2-cache0 {
compatible = "cache";
};
@@ -68,6 +70,7 @@ periph_clk: periph-clk {
#clock-cells = <0>;
clock-frequency = <200000000>;
};
+
uart_clk: uart-clk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm6878.dtsi b/arch/arm/boot/dts/bcm6878.dtsi
index 6dd3d2df4e16..e89a19b31dc9 100644
--- a/arch/arm/boot/dts/bcm6878.dtsi
+++ b/arch/arm/boot/dts/bcm6878.dtsi
@@ -32,6 +32,7 @@ CA7_1: cpu@1 {
next-level-cache = <&L2_0>;
enable-method = "psci";
};
+
L2_0: l2-cache0 {
compatible = "cache";
};
@@ -59,6 +60,7 @@ periph_clk: periph-clk {
#clock-cells = <0>;
clock-frequency = <200000000>;
};
+
uart_clk: uart-clk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
--
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] 5+ messages in thread* Re: [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value
2022-07-29 1:50 [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value William Zhang
` (2 preceding siblings ...)
2022-07-29 1:50 ` [PATCH 4/4] ARM: dts: bcmbca: cosmetic change William Zhang
@ 2022-08-01 15:31 ` Florian Fainelli
3 siblings, 0 replies; 5+ messages in thread
From: Florian Fainelli @ 2022-08-01 15:31 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: Broadcom Kernel List, kursad.oney, dan.beygelman, f.fainelli,
anand.gore, joel.peshkin, Krzysztof Kozlowski, Rob Herring,
devicetree, linux-kernel
Hi William,
On 7/28/2022 6:50 PM, William Zhang wrote:
> The cpu mask flag value should match the number of cpu cores in the
> chip. Correct the value accordingly for BCM63178, BCM6846 and BCM6878.
>
> Fixes: fc85b7e64acb ("ARM: dts: add dts files for bcmbca soc 63178")
> Fixes: de1a99ac0b64 ("ARM: dts: Add DTS files for bcmbca SoC BCM6846")
> Fixes: 6bcad714e173 ("ARM: dts: Add DTS files for bcmbca SoC BCM6878")
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
This looks fine, if you could split one patch per file you modify that
would look a bit better, this is particularly relevant for bug fixes so
if you can split patch 1 into 3, patch 2 into 2 and patch 3 into 2 that
would be great. Patch 4 can be taken as is since it is sort of a
bca-wide cleanup.
Right now all of those changes went into the same release cycle, but in
the future that might not be the case.
Thank you!
--
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] 5+ messages in thread
end of thread, other threads:[~2022-08-01 15:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-29 1:50 [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value William Zhang
2022-07-29 1:50 ` [PATCH 2/4] ARM: dts: bcmbca: fix interrupt controller properties William Zhang
2022-07-29 1:50 ` [PATCH 3/4] ARM: dts: bcmbca: clean up psci node William Zhang
2022-07-29 1:50 ` [PATCH 4/4] ARM: dts: bcmbca: cosmetic change William Zhang
2022-08-01 15:31 ` [PATCH 1/4] ARM: dts: bcmbca: fix arch timer node cpu mask flag value 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).