* [PATCH 0/2] ARM: dts: NSP fixes
@ 2017-11-07 22:28 Florian Fainelli
2017-11-07 22:28 ` [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards Florian Fainelli
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Florian Fainelli @ 2017-11-07 22:28 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
This patch series contains a couple of fixes:
- disables AHCI on NSP HR boards since that results in a hard hang
- fixes PPI interrupts specifiers
Florian Fainelli (2):
ARM: dts: NSP: Disable AHCI controller for HR NSP boards
ARM: dts: NSP: Fix PPI interrupt types
arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
arch/arm/boot/dts/bcm958623hr.dts | 4 ----
arch/arm/boot/dts/bcm958625hr.dts | 4 ----
3 files changed, 2 insertions(+), 10 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards
2017-11-07 22:28 [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
@ 2017-11-07 22:28 ` Florian Fainelli
2017-11-07 22:45 ` Jon Mason
2017-11-07 22:28 ` [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types Florian Fainelli
2017-11-08 18:49 ` [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
2 siblings, 1 reply; 7+ messages in thread
From: Florian Fainelli @ 2017-11-07 22:28 UTC (permalink / raw)
To: linux-arm-kernel
The AHCI controller is currently enabled for all of these boards:
bcm958623hr and bcm958625hr would result in a hard hang on boot that we
cannot get rid of. Since this does not appear to have an easy and simple
fix, just disable the AHCI controller for now until this gets resolved.
Fixes: 70725d6e97ac ("ARM: dts: NSP: Enable SATA on bcm958625hr")
Fixes: d454c3762437 ("ARM: dts: NSP: Add new DT file for bcm958623hr")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/arm/boot/dts/bcm958623hr.dts | 4 ----
arch/arm/boot/dts/bcm958625hr.dts | 4 ----
2 files changed, 8 deletions(-)
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
index 3bc50849d013..b8bde13de90a 100644
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -141,10 +141,6 @@
status = "okay";
};
-&sata {
- status = "okay";
-};
-
&qspi {
bspi-sel = <0>;
flash: m25p80 at 0 {
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index d94d14b3c745..6a44b8021702 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -177,10 +177,6 @@
status = "okay";
};
-&sata {
- status = "okay";
-};
-
&srab {
compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";
status = "okay";
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards
2017-11-07 22:28 ` [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards Florian Fainelli
@ 2017-11-07 22:45 ` Jon Mason
0 siblings, 0 replies; 7+ messages in thread
From: Jon Mason @ 2017-11-07 22:45 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 7, 2017 at 5:28 PM, Florian Fainelli <f.fainelli@gmail.com> wrote:
> The AHCI controller is currently enabled for all of these boards:
> bcm958623hr and bcm958625hr would result in a hard hang on boot that we
> cannot get rid of. Since this does not appear to have an easy and simple
> fix, just disable the AHCI controller for now until this gets resolved.
>
> Fixes: 70725d6e97ac ("ARM: dts: NSP: Enable SATA on bcm958625hr")
> Fixes: d454c3762437 ("ARM: dts: NSP: Add new DT file for bcm958623hr")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jon Mason <jon.mason@broadcom.com>
> ---
> arch/arm/boot/dts/bcm958623hr.dts | 4 ----
> arch/arm/boot/dts/bcm958625hr.dts | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
> index 3bc50849d013..b8bde13de90a 100644
> --- a/arch/arm/boot/dts/bcm958623hr.dts
> +++ b/arch/arm/boot/dts/bcm958623hr.dts
> @@ -141,10 +141,6 @@
> status = "okay";
> };
>
> -&sata {
> - status = "okay";
> -};
> -
> &qspi {
> bspi-sel = <0>;
> flash: m25p80 at 0 {
> diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
> index d94d14b3c745..6a44b8021702 100644
> --- a/arch/arm/boot/dts/bcm958625hr.dts
> +++ b/arch/arm/boot/dts/bcm958625hr.dts
> @@ -177,10 +177,6 @@
> status = "okay";
> };
>
> -&sata {
> - status = "okay";
> -};
> -
> &srab {
> compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";
> status = "okay";
> --
> 2.9.3
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types
2017-11-07 22:28 [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
2017-11-07 22:28 ` [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards Florian Fainelli
@ 2017-11-07 22:28 ` Florian Fainelli
2017-11-07 22:30 ` Florian Fainelli
2017-11-08 18:49 ` [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
2 siblings, 1 reply; 7+ messages in thread
From: Florian Fainelli @ 2017-11-07 22:28 UTC (permalink / raw)
To: linux-arm-kernel
Booting a kernel results in the kernel warning us about the following
PPI interrupts configuration:
[ 0.105127] smp: Bringing up secondary CPUs ...
[ 0.110545] GIC: PPI11 is secure or misconfigured
[ 0.110551] GIC: PPI13 is secure or misconfigured
Fix this by using the appropriate edge configuration for PPI11 and
PPI13, this is similar to what was fixed for Northstar (BCM5301X) in
commit 0e34079cd1f6 ("ARM: dts: BCM5301X: Correct GIC_PPI interrupt
flags").
Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index dff66974feed..d5f5e92e7488 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -85,7 +85,7 @@
timer at 20200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0x20200 0x100>;
- interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
clocks = <&periph_clk>;
};
@@ -93,7 +93,7 @@
compatible = "arm,cortex-a9-twd-timer";
reg = <0x20600 0x20>;
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
- IRQ_TYPE_LEVEL_HIGH)>;
+ IRQ_TYPE_EDGE_RISING)>;
clocks = <&periph_clk>;
};
--
2.9.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types
2017-11-07 22:28 ` [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types Florian Fainelli
@ 2017-11-07 22:30 ` Florian Fainelli
2017-11-07 22:45 ` Jon Mason
0 siblings, 1 reply; 7+ messages in thread
From: Florian Fainelli @ 2017-11-07 22:30 UTC (permalink / raw)
To: linux-arm-kernel
On 11/07/2017 02:28 PM, Florian Fainelli wrote:
> Booting a kernel results in the kernel warning us about the following
> PPI interrupts configuration:
> [ 0.105127] smp: Bringing up secondary CPUs ...
> [ 0.110545] GIC: PPI11 is secure or misconfigured
> [ 0.110551] GIC: PPI13 is secure or misconfigured
>
> Fix this by using the appropriate edge configuration for PPI11 and
> PPI13, this is similar to what was fixed for Northstar (BCM5301X) in
> commit 0e34079cd1f6 ("ARM: dts: BCM5301X: Correct GIC_PPI interrupt
> flags").
>
> Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
this should have been Fixes: 7b2e987de207 ("ARM: NSP: add minimal
Northstar Plus device tree"), I can fix that up while applying unless
there are other comments.
> Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
> index dff66974feed..d5f5e92e7488 100644
> --- a/arch/arm/boot/dts/bcm-nsp.dtsi
> +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
> @@ -85,7 +85,7 @@
> timer at 20200 {
> compatible = "arm,cortex-a9-global-timer";
> reg = <0x20200 0x100>;
> - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
> clocks = <&periph_clk>;
> };
>
> @@ -93,7 +93,7 @@
> compatible = "arm,cortex-a9-twd-timer";
> reg = <0x20600 0x20>;
> interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> - IRQ_TYPE_LEVEL_HIGH)>;
> + IRQ_TYPE_EDGE_RISING)>;
> clocks = <&periph_clk>;
> };
>
>
--
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types
2017-11-07 22:30 ` Florian Fainelli
@ 2017-11-07 22:45 ` Jon Mason
0 siblings, 0 replies; 7+ messages in thread
From: Jon Mason @ 2017-11-07 22:45 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 7, 2017 at 5:30 PM, Florian Fainelli <f.fainelli@gmail.com> wrote:
> On 11/07/2017 02:28 PM, Florian Fainelli wrote:
>> Booting a kernel results in the kernel warning us about the following
>> PPI interrupts configuration:
>> [ 0.105127] smp: Bringing up secondary CPUs ...
>> [ 0.110545] GIC: PPI11 is secure or misconfigured
>> [ 0.110551] GIC: PPI13 is secure or misconfigured
>>
>> Fix this by using the appropriate edge configuration for PPI11 and
>> PPI13, this is similar to what was fixed for Northstar (BCM5301X) in
>> commit 0e34079cd1f6 ("ARM: dts: BCM5301X: Correct GIC_PPI interrupt
>> flags").
>>
>> Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
>
> this should have been Fixes: 7b2e987de207 ("ARM: NSP: add minimal
> Northstar Plus device tree"), I can fix that up while applying unless
> there are other comments.
>
>> Fixes: 1a9d53cabaf4 ("ARM: dts: NSP: Add TWD Support to DT")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jon Mason <jon.mason@broadcom.com>
>> ---
>> arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
>> index dff66974feed..d5f5e92e7488 100644
>> --- a/arch/arm/boot/dts/bcm-nsp.dtsi
>> +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
>> @@ -85,7 +85,7 @@
>> timer at 20200 {
>> compatible = "arm,cortex-a9-global-timer";
>> reg = <0x20200 0x100>;
>> - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
>> + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
>> clocks = <&periph_clk>;
>> };
>>
>> @@ -93,7 +93,7 @@
>> compatible = "arm,cortex-a9-twd-timer";
>> reg = <0x20600 0x20>;
>> interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
>> - IRQ_TYPE_LEVEL_HIGH)>;
>> + IRQ_TYPE_EDGE_RISING)>;
>> clocks = <&periph_clk>;
>> };
>>
>>
>
>
> --
> Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 0/2] ARM: dts: NSP fixes
2017-11-07 22:28 [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
2017-11-07 22:28 ` [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards Florian Fainelli
2017-11-07 22:28 ` [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types Florian Fainelli
@ 2017-11-08 18:49 ` Florian Fainelli
2 siblings, 0 replies; 7+ messages in thread
From: Florian Fainelli @ 2017-11-08 18:49 UTC (permalink / raw)
To: linux-arm-kernel
On 11/07/2017 02:28 PM, Florian Fainelli wrote:
> Hi all,
>
> This patch series contains a couple of fixes:
>
> - disables AHCI on NSP HR boards since that results in a hard hang
> - fixes PPI interrupts specifiers
Applied to devicetree/fixes.
--
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-11-08 18:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-07 22:28 [PATCH 0/2] ARM: dts: NSP fixes Florian Fainelli
2017-11-07 22:28 ` [PATCH 1/2] ARM: dts: NSP: Disable AHCI controller for HR NSP boards Florian Fainelli
2017-11-07 22:45 ` Jon Mason
2017-11-07 22:28 ` [PATCH 2/2] ARM: dts: NSP: Fix PPI interrupt types Florian Fainelli
2017-11-07 22:30 ` Florian Fainelli
2017-11-07 22:45 ` Jon Mason
2017-11-08 18:49 ` [PATCH 0/2] ARM: dts: NSP fixes 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).