* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:31 ` Jon Mason
0 siblings, 0 replies; 25+ messages in thread
From: Jon Mason @ 2017-02-28 20:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Jon Mason <jonmason@broadcom.com>
Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
ARM TWD timer allocated the register space for the WDT, so this patch
necessitated shrinking that. Also, the GIC masks were added for these.
Signed-off-by: Jon Mason <jonmason@broadcom.com>
---
arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 4fbb089..3fbc450 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -70,10 +70,19 @@
clocks = <&periph_clk>;
};
- local-timer at 20600 {
+ timer at 20600 {
compatible = "arm,cortex-a9-twd-timer";
- reg = <0x20600 0x100>;
- interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
+ reg = <0x20600 0x20>;
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ clocks = <&periph_clk>;
+ };
+
+ watchdog at 20620 {
+ compatible = "arm,cortex-a9-twd-wdt";
+ reg = <0x20620 0x20>;
+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
+ IRQ_TYPE_LEVEL_HIGH)>;
clocks = <&periph_clk>;
};
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:31 ` Jon Mason
0 siblings, 0 replies; 25+ messages in thread
From: Jon Mason @ 2017-02-28 20:31 UTC (permalink / raw)
To: Hauke Mehrtens, zajec5
Cc: Mark Rutland, devicetree, Florian Fainelli, Jon Mason,
linux-kernel, Rob Herring, bcm-kernel-feedback-list,
linux-arm-kernel
From: Jon Mason <jonmason@broadcom.com>
Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
ARM TWD timer allocated the register space for the WDT, so this patch
necessitated shrinking that. Also, the GIC masks were added for these.
Signed-off-by: Jon Mason <jonmason@broadcom.com>
---
arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 4fbb089..3fbc450 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -70,10 +70,19 @@
clocks = <&periph_clk>;
};
- local-timer@20600 {
+ timer@20600 {
compatible = "arm,cortex-a9-twd-timer";
- reg = <0x20600 0x100>;
- interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
+ reg = <0x20600 0x20>;
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ clocks = <&periph_clk>;
+ };
+
+ watchdog@20620 {
+ compatible = "arm,cortex-a9-twd-wdt";
+ reg = <0x20620 0x20>;
+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
+ IRQ_TYPE_LEVEL_HIGH)>;
clocks = <&periph_clk>;
};
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
2017-02-28 20:31 ` Jon Mason
(?)
@ 2017-02-28 20:43 ` Rafał Miłecki
-1 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:43 UTC (permalink / raw)
To: Jon Mason
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
devicetree, linux-arm-kernel, Linux Kernel Mailing List,
bcm-kernel-feedback-list, Jon Mason
On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer@20600 {
> + timer@20600 {
Is there a reason for this rename? I don't really have preference for
any name, it's just we shouldn't keep renaming this depending of
personal preferences.
It also doesn't seem like adjusting to any schema:
bcm63138.dtsi uses local-timer@1e600
bcm-nsp.dtsi uses twd-timer@20600
berlin2cd.dtsi uses local-timer@ad0600
berlin2.dtsi uses local-timer@ad0600
berlin2q.dtsi uses local-timer@ad0600
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
The rest looks OK, thanks! :)
--
Rafał
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:43 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:43 UTC (permalink / raw)
To: linux-arm-kernel
On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer at 20600 {
> + timer at 20600 {
Is there a reason for this rename? I don't really have preference for
any name, it's just we shouldn't keep renaming this depending of
personal preferences.
It also doesn't seem like adjusting to any schema:
bcm63138.dtsi uses local-timer at 1e600
bcm-nsp.dtsi uses twd-timer at 20600
berlin2cd.dtsi uses local-timer at ad0600
berlin2.dtsi uses local-timer at ad0600
berlin2q.dtsi uses local-timer at ad0600
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
The rest looks OK, thanks! :)
--
Rafa?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:43 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:43 UTC (permalink / raw)
To: Jon Mason
Cc: Mark Rutland, devicetree, Florian Fainelli, Jon Mason,
Hauke Mehrtens, Linux Kernel Mailing List, Rob Herring,
bcm-kernel-feedback-list, linux-arm-kernel
On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer@20600 {
> + timer@20600 {
Is there a reason for this rename? I don't really have preference for
any name, it's just we shouldn't keep renaming this depending of
personal preferences.
It also doesn't seem like adjusting to any schema:
bcm63138.dtsi uses local-timer@1e600
bcm-nsp.dtsi uses twd-timer@20600
berlin2cd.dtsi uses local-timer@ad0600
berlin2.dtsi uses local-timer@ad0600
berlin2q.dtsi uses local-timer@ad0600
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
The rest looks OK, thanks! :)
--
Rafał
_______________________________________________
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] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
2017-02-28 20:43 ` Rafał Miłecki
(?)
@ 2017-02-28 20:46 ` Jon Mason
-1 siblings, 0 replies; 25+ messages in thread
From: Jon Mason @ 2017-02-28 20:46 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
devicetree, linux-arm-kernel, Linux Kernel Mailing List,
bcm-kernel-feedback-list, Jon Mason
On Tue, Feb 28, 2017 at 3:43 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>> @@ -70,10 +70,19 @@
>> clocks = <&periph_clk>;
>> };
>>
>> - local-timer@20600 {
>> + timer@20600 {
>
> Is there a reason for this rename? I don't really have preference for
> any name, it's just we shouldn't keep renaming this depending of
> personal preferences.
>
> It also doesn't seem like adjusting to any schema:
> bcm63138.dtsi uses local-timer@1e600
> bcm-nsp.dtsi uses twd-timer@20600
> berlin2cd.dtsi uses local-timer@ad0600
> berlin2.dtsi uses local-timer@ad0600
> berlin2q.dtsi uses local-timer@ad0600
This was a suggestion from Sergei Shtylyov
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
>
>> compatible = "arm,cortex-a9-twd-timer";
>> - reg = <0x20600 0x100>;
>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>> + reg = <0x20600 0x20>;
>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
>> + IRQ_TYPE_LEVEL_HIGH)>;
>> + clocks = <&periph_clk>;
>> + };
>
> The rest looks OK, thanks! :)
>
> --
> Rafał
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:46 ` Jon Mason
0 siblings, 0 replies; 25+ messages in thread
From: Jon Mason @ 2017-02-28 20:46 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 28, 2017 at 3:43 PM, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>> @@ -70,10 +70,19 @@
>> clocks = <&periph_clk>;
>> };
>>
>> - local-timer at 20600 {
>> + timer at 20600 {
>
> Is there a reason for this rename? I don't really have preference for
> any name, it's just we shouldn't keep renaming this depending of
> personal preferences.
>
> It also doesn't seem like adjusting to any schema:
> bcm63138.dtsi uses local-timer at 1e600
> bcm-nsp.dtsi uses twd-timer at 20600
> berlin2cd.dtsi uses local-timer at ad0600
> berlin2.dtsi uses local-timer at ad0600
> berlin2q.dtsi uses local-timer at ad0600
This was a suggestion from Sergei Shtylyov
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
>
>> compatible = "arm,cortex-a9-twd-timer";
>> - reg = <0x20600 0x100>;
>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>> + reg = <0x20600 0x20>;
>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
>> + IRQ_TYPE_LEVEL_HIGH)>;
>> + clocks = <&periph_clk>;
>> + };
>
> The rest looks OK, thanks! :)
>
> --
> Rafa?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:46 ` Jon Mason
0 siblings, 0 replies; 25+ messages in thread
From: Jon Mason @ 2017-02-28 20:46 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Mark Rutland, devicetree, Florian Fainelli, Jon Mason,
Hauke Mehrtens, Linux Kernel Mailing List, Rob Herring,
bcm-kernel-feedback-list, linux-arm-kernel
On Tue, Feb 28, 2017 at 3:43 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>> @@ -70,10 +70,19 @@
>> clocks = <&periph_clk>;
>> };
>>
>> - local-timer@20600 {
>> + timer@20600 {
>
> Is there a reason for this rename? I don't really have preference for
> any name, it's just we shouldn't keep renaming this depending of
> personal preferences.
>
> It also doesn't seem like adjusting to any schema:
> bcm63138.dtsi uses local-timer@1e600
> bcm-nsp.dtsi uses twd-timer@20600
> berlin2cd.dtsi uses local-timer@ad0600
> berlin2.dtsi uses local-timer@ad0600
> berlin2q.dtsi uses local-timer@ad0600
This was a suggestion from Sergei Shtylyov
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
>
>> compatible = "arm,cortex-a9-twd-timer";
>> - reg = <0x20600 0x100>;
>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>> + reg = <0x20600 0x20>;
>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
>> + IRQ_TYPE_LEVEL_HIGH)>;
>> + clocks = <&periph_clk>;
>> + };
>
> The rest looks OK, thanks! :)
>
> --
> Rafał
_______________________________________________
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] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
2017-02-28 20:46 ` Jon Mason
(?)
@ 2017-02-28 20:48 ` Rafał Miłecki
-1 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:48 UTC (permalink / raw)
To: Jon Mason
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
devicetree, linux-arm-kernel, Linux Kernel Mailing List,
bcm-kernel-feedback-list, Jon Mason
On 28 February 2017 at 21:46, Jon Mason <jon.mason@broadcom.com> wrote:
> On Tue, Feb 28, 2017 at 3:43 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
>> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer@20600 {
>>> + timer@20600 {
>>
>> Is there a reason for this rename? I don't really have preference for
>> any name, it's just we shouldn't keep renaming this depending of
>> personal preferences.
>>
>> It also doesn't seem like adjusting to any schema:
>> bcm63138.dtsi uses local-timer@1e600
>> bcm-nsp.dtsi uses twd-timer@20600
>> berlin2cd.dtsi uses local-timer@ad0600
>> berlin2.dtsi uses local-timer@ad0600
>> berlin2q.dtsi uses local-timer@ad0600
>
> This was a suggestion from Sergei Shtylyov
> http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
Good to know, thanks!
--
Rafał
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:48 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:48 UTC (permalink / raw)
To: linux-arm-kernel
On 28 February 2017 at 21:46, Jon Mason <jon.mason@broadcom.com> wrote:
> On Tue, Feb 28, 2017 at 3:43 PM, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
>> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer at 20600 {
>>> + timer at 20600 {
>>
>> Is there a reason for this rename? I don't really have preference for
>> any name, it's just we shouldn't keep renaming this depending of
>> personal preferences.
>>
>> It also doesn't seem like adjusting to any schema:
>> bcm63138.dtsi uses local-timer at 1e600
>> bcm-nsp.dtsi uses twd-timer at 20600
>> berlin2cd.dtsi uses local-timer at ad0600
>> berlin2.dtsi uses local-timer at ad0600
>> berlin2q.dtsi uses local-timer at ad0600
>
> This was a suggestion from Sergei Shtylyov
> http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
Good to know, thanks!
--
Rafa?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-02-28 20:48 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-02-28 20:48 UTC (permalink / raw)
To: Jon Mason
Cc: Mark Rutland, devicetree, Florian Fainelli, Jon Mason,
Hauke Mehrtens, Linux Kernel Mailing List, Rob Herring,
bcm-kernel-feedback-list, linux-arm-kernel
On 28 February 2017 at 21:46, Jon Mason <jon.mason@broadcom.com> wrote:
> On Tue, Feb 28, 2017 at 3:43 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
>> On 28 February 2017 at 21:31, Jon Mason <jon.mason@broadcom.com> wrote:
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer@20600 {
>>> + timer@20600 {
>>
>> Is there a reason for this rename? I don't really have preference for
>> any name, it's just we shouldn't keep renaming this depending of
>> personal preferences.
>>
>> It also doesn't seem like adjusting to any schema:
>> bcm63138.dtsi uses local-timer@1e600
>> bcm-nsp.dtsi uses twd-timer@20600
>> berlin2cd.dtsi uses local-timer@ad0600
>> berlin2.dtsi uses local-timer@ad0600
>> berlin2q.dtsi uses local-timer@ad0600
>
> This was a suggestion from Sergei Shtylyov
> http://lists.infradead.org/pipermail/linux-arm-kernel/2015-December/395160.html
Good to know, thanks!
--
Rafał
_______________________________________________
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] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
2017-02-28 20:31 ` Jon Mason
(?)
@ 2017-03-02 18:54 ` Rafał Miłecki
-1 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 18:54 UTC (permalink / raw)
To: Jon Mason, Hauke Mehrtens
Cc: Rob Herring, Mark Rutland, Florian Fainelli, devicetree,
linux-arm-kernel, linux-kernel, bcm-kernel-feedback-list,
Jon Mason
On 02/28/2017 09:31 PM, Jon Mason wrote:
> From: Jon Mason <jonmason@broadcom.com>
>
> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
> ARM TWD timer allocated the register space for the WDT, so this patch
> necessitated shrinking that. Also, the GIC masks were added for these.
>
> Signed-off-by: Jon Mason <jonmason@broadcom.com>
> ---
> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
> index 4fbb089..3fbc450 100644
> --- a/arch/arm/boot/dts/bcm5301x.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer@20600 {
> + timer@20600 {
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
If you follow my recent e-mail thread:
BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
IRQ_TYPE_EDGE_RISING.
I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc stable
for kernels 4.8+.
The same change is needed for "arm,cortex-a9-global-timer".
Would you find time to revise this patch?
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-03-02 18:54 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 18:54 UTC (permalink / raw)
To: linux-arm-kernel
On 02/28/2017 09:31 PM, Jon Mason wrote:
> From: Jon Mason <jonmason@broadcom.com>
>
> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
> ARM TWD timer allocated the register space for the WDT, so this patch
> necessitated shrinking that. Also, the GIC masks were added for these.
>
> Signed-off-by: Jon Mason <jonmason@broadcom.com>
> ---
> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
> index 4fbb089..3fbc450 100644
> --- a/arch/arm/boot/dts/bcm5301x.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer at 20600 {
> + timer at 20600 {
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
If you follow my recent e-mail thread:
BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
IRQ_TYPE_EDGE_RISING.
I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc stable
for kernels 4.8+.
The same change is needed for "arm,cortex-a9-global-timer".
Would you find time to revise this patch?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-03-02 18:54 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 18:54 UTC (permalink / raw)
To: Jon Mason, Hauke Mehrtens
Cc: Mark Rutland, devicetree, Florian Fainelli, Jon Mason,
linux-kernel, Rob Herring, bcm-kernel-feedback-list,
linux-arm-kernel
On 02/28/2017 09:31 PM, Jon Mason wrote:
> From: Jon Mason <jonmason@broadcom.com>
>
> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
> ARM TWD timer allocated the register space for the WDT, so this patch
> necessitated shrinking that. Also, the GIC masks were added for these.
>
> Signed-off-by: Jon Mason <jonmason@broadcom.com>
> ---
> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
> index 4fbb089..3fbc450 100644
> --- a/arch/arm/boot/dts/bcm5301x.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
> @@ -70,10 +70,19 @@
> clocks = <&periph_clk>;
> };
>
> - local-timer@20600 {
> + timer@20600 {
> compatible = "arm,cortex-a9-twd-timer";
> - reg = <0x20600 0x100>;
> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
> + reg = <0x20600 0x20>;
> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
> + IRQ_TYPE_LEVEL_HIGH)>;
> + clocks = <&periph_clk>;
> + };
If you follow my recent e-mail thread:
BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
IRQ_TYPE_EDGE_RISING.
I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc stable
for kernels 4.8+.
The same change is needed for "arm,cortex-a9-global-timer".
Would you find time to revise this patch?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
2017-03-02 18:54 ` Rafał Miłecki
(?)
(?)
@ 2017-03-02 19:00 ` Jon Mason
2017-03-02 19:19 ` Rafał Miłecki
-1 siblings, 1 reply; 25+ messages in thread
From: Jon Mason @ 2017-03-02 19:00 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-arm-kernel, open list, BCM Kernel Feedback, Jon Mason
[-- Attachment #1: Type: text/plain, Size: 1994 bytes --]
On Thu, Mar 2, 2017 at 1:54 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
> On 02/28/2017 09:31 PM, Jon Mason wrote:
>
>> From: Jon Mason <jonmason@broadcom.com>
>>
>> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
>> ARM TWD timer allocated the register space for the WDT, so this patch
>> necessitated shrinking that. Also, the GIC masks were added for these.
>>
>> Signed-off-by: Jon Mason <jonmason@broadcom.com>
>> ---
>> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi
>> b/arch/arm/boot/dts/bcm5301x.dtsi
>> index 4fbb089..3fbc450 100644
>> --- a/arch/arm/boot/dts/bcm5301x.dtsi
>> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
>> @@ -70,10 +70,19 @@
>> clocks = <&periph_clk>;
>> };
>>
>> - local-timer@20600 {
>> + timer@20600 {
>> compatible = "arm,cortex-a9-twd-timer";
>> - reg = <0x20600 0x100>;
>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>> + reg = <0x20600 0x20>;
>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
>> + IRQ_TYPE_LEVEL_HIGH)>;
>> + clocks = <&periph_clk>;
>> + };
>>
>
> If you follow my recent e-mail thread:
> BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
> you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
> IRQ_TYPE_EDGE_RISING.
>
> I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc
> stable
> for kernels 4.8+.
>
> The same change is needed for "arm,cortex-a9-global-timer".
>
> Would you find time to revise this patch?
>
I'll do 2 patches. One to revise this one and one to address the issue
you've discovered. Will that be okay for you?
[-- Attachment #2: Type: text/html, Size: 2916 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-03-02 19:19 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 19:19 UTC (permalink / raw)
To: Jon Mason
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-arm-kernel, open list, BCM Kernel Feedback, Jon Mason
On 2 March 2017 at 20:00, Jon Mason <jon.mason@broadcom.com> wrote:
> On Thu, Mar 2, 2017 at 1:54 PM, Rafał Miłecki <zajec5@gmail.com> wrote:
>>
>> On 02/28/2017 09:31 PM, Jon Mason wrote:
>>>
>>> From: Jon Mason <jonmason@broadcom.com>
>>>
>>> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
>>> ARM TWD timer allocated the register space for the WDT, so this patch
>>> necessitated shrinking that. Also, the GIC masks were added for these.
>>>
>>> Signed-off-by: Jon Mason <jonmason@broadcom.com>
>>> ---
>>> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
>>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi
>>> b/arch/arm/boot/dts/bcm5301x.dtsi
>>> index 4fbb089..3fbc450 100644
>>> --- a/arch/arm/boot/dts/bcm5301x.dtsi
>>> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer@20600 {
>>> + timer@20600 {
>>> compatible = "arm,cortex-a9-twd-timer";
>>> - reg = <0x20600 0x100>;
>>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>>> + reg = <0x20600 0x20>;
>>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2)
>>> |
>>> + IRQ_TYPE_LEVEL_HIGH)>;
>>> + clocks = <&periph_clk>;
>>> + };
>>
>>
>> If you follow my recent e-mail thread:
>> BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
>> you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
>> IRQ_TYPE_EDGE_RISING.
>>
>> I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc
>> stable
>> for kernels 4.8+.
>>
>> The same change is needed for "arm,cortex-a9-global-timer".
>>
>> Would you find time to revise this patch?
>
>
> I'll do 2 patches. One to revise this one and one to address the issue
> you've discovered. Will that be okay for you?
Sure. Please make sure you switch to IRQ_TYPE_EDGE_RISING before doing
other changes, so it can be applied cleanly to the stable kernels.
--
Rafał
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-03-02 19:19 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 19:19 UTC (permalink / raw)
To: linux-arm-kernel
On 2 March 2017 at 20:00, Jon Mason <jon.mason@broadcom.com> wrote:
> On Thu, Mar 2, 2017 at 1:54 PM, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
>>
>> On 02/28/2017 09:31 PM, Jon Mason wrote:
>>>
>>> From: Jon Mason <jonmason@broadcom.com>
>>>
>>> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
>>> ARM TWD timer allocated the register space for the WDT, so this patch
>>> necessitated shrinking that. Also, the GIC masks were added for these.
>>>
>>> Signed-off-by: Jon Mason <jonmason@broadcom.com>
>>> ---
>>> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
>>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi
>>> b/arch/arm/boot/dts/bcm5301x.dtsi
>>> index 4fbb089..3fbc450 100644
>>> --- a/arch/arm/boot/dts/bcm5301x.dtsi
>>> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer at 20600 {
>>> + timer at 20600 {
>>> compatible = "arm,cortex-a9-twd-timer";
>>> - reg = <0x20600 0x100>;
>>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>>> + reg = <0x20600 0x20>;
>>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2)
>>> |
>>> + IRQ_TYPE_LEVEL_HIGH)>;
>>> + clocks = <&periph_clk>;
>>> + };
>>
>>
>> If you follow my recent e-mail thread:
>> BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
>> you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
>> IRQ_TYPE_EDGE_RISING.
>>
>> I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc
>> stable
>> for kernels 4.8+.
>>
>> The same change is needed for "arm,cortex-a9-global-timer".
>>
>> Would you find time to revise this patch?
>
>
> I'll do 2 patches. One to revise this one and one to address the issue
> you've discovered. Will that be okay for you?
Sure. Please make sure you switch to IRQ_TYPE_EDGE_RISING before doing
other changes, so it can be applied cleanly to the stable kernels.
--
Rafa?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 1/2] ARM: dts: bcm5301x: Add TWD WD Support to DT
@ 2017-03-02 19:19 ` Rafał Miłecki
0 siblings, 0 replies; 25+ messages in thread
From: Rafał Miłecki @ 2017-03-02 19:19 UTC (permalink / raw)
To: Jon Mason
Cc: Hauke Mehrtens, Rob Herring, Mark Rutland, Florian Fainelli,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
linux-arm-kernel, open list, BCM Kernel Feedback, Jon Mason
On 2 March 2017 at 20:00, Jon Mason <jon.mason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> wrote:
> On Thu, Mar 2, 2017 at 1:54 PM, Rafał Miłecki <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>
>> On 02/28/2017 09:31 PM, Jon Mason wrote:
>>>
>>> From: Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
>>>
>>> Add support for the ARM TWD Watchdog to the bcm5301x device tree. The
>>> ARM TWD timer allocated the register space for the WDT, so this patch
>>> necessitated shrinking that. Also, the GIC masks were added for these.
>>>
>>> Signed-off-by: Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
>>> ---
>>> arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++---
>>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/bcm5301x.dtsi
>>> b/arch/arm/boot/dts/bcm5301x.dtsi
>>> index 4fbb089..3fbc450 100644
>>> --- a/arch/arm/boot/dts/bcm5301x.dtsi
>>> +++ b/arch/arm/boot/dts/bcm5301x.dtsi
>>> @@ -70,10 +70,19 @@
>>> clocks = <&periph_clk>;
>>> };
>>>
>>> - local-timer@20600 {
>>> + timer@20600 {
>>> compatible = "arm,cortex-a9-twd-timer";
>>> - reg = <0x20600 0x100>;
>>> - interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
>>> + reg = <0x20600 0x20>;
>>> + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2)
>>> |
>>> + IRQ_TYPE_LEVEL_HIGH)>;
>>> + clocks = <&periph_clk>;
>>> + };
>>
>>
>> If you follow my recent e-mail thread:
>> BCM5301X: GIC: PPI11 is secure or misconfigured (same for PPI13)
>> you'll see IRQ_TYPE_LEVEL_HIGH type isn't correct. It should be
>> IRQ_TYPE_EDGE_RISING.
>>
>> I believe patch switching to IRQ_TYPE_EDGE_RISING should be sent with Cc
>> stable
>> for kernels 4.8+.
>>
>> The same change is needed for "arm,cortex-a9-global-timer".
>>
>> Would you find time to revise this patch?
>
>
> I'll do 2 patches. One to revise this one and one to address the issue
> you've discovered. Will that be okay for you?
Sure. Please make sure you switch to IRQ_TYPE_EDGE_RISING before doing
other changes, so it can be applied cleanly to the stable kernels.
--
Rafał
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 25+ messages in thread