From: Duc Dang <dhdang@apm.com>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: "Daniel Lezcano" <daniel.lezcano@linaro.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Rob Herring" <robh+dt@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Dinh Nguyen" <dinguyen@opensource.altera.com>,
"Carlo Caione" <carlo@caione.org>,
"Kevin Hilman" <khilman@baylibre.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Ray Jui" <rjui@broadcom.com>,
"Scott Branden" <sbranden@broadcom.com>,
"Kukjin Kim" <kgene@kernel.org>,
"Krzysztof Kozlowski" <k.kozlowski@samsung.com>,
"Jason Cooper" <jason@lakedaemon.net>,
"Andrew Lunn" <andrew@lunn.ch>,
"Gregory Clement" <gregory.clement@free-electrons.com>,
"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Michal Simek" <michal.simek@xilinx.com>,
"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
"Tirumalesh Chalamarla" <tchalamarla@cavium.com>,
"Jan Glauber" <jglauber@cavium.com>,
"Hou Zhiqiang" <B48286@freescale.com>,
"Wenbin Song" <Wenbin.Song@freescale.com>,
"Yuan Yao" <yao.yuan@nxp.com>, "Liu Gang" <Gang.Liu@nxp.com>,
"Mingkai Hu" <Mingkai.Hu@freescale.com>,
"Rajesh Bhagat" <rajesh.bhagat@freescale.com>,
linux-arm <linux-arm-kernel@lists.infradead.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
linux-amlogic@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH v3 2/2] arm64: dts: Fix broken architected timer interrupt trigger
Date: Fri, 10 Jun 2016 14:48:05 -0700 [thread overview]
Message-ID: <CADaLNDn_k2eDoBhmDu9Ub5D0XF7PTN-sW9kNDTuFSUybgT59jQ@mail.gmail.com> (raw)
In-Reply-To: <1465235791-7064-3-git-send-email-marc.zyngier@arm.com>
On Mon, Jun 6, 2016 at 10:56 AM, Marc Zyngier <marc.zyngier@arm.com> wrote:
> The ARM architected timer specification mandates that the interrupt
> associated with each timer is level triggered (which corresponds to
> the "counter >= comparator" condition).
>
> A number of DTs are being remarkably creative, declaring the interrupt
> to be edge triggered. A quick look at the TRM for the corresponding ARM
> CPUs clearly shows that this is wrong, and I've corrected those.
> For non-ARM designs (and in the absence of a publicly available TRM),
> I've made them active low as well, which can't be completely wrong
> as the GIC cannot disinguish between level low and level high.
>
> The respective maintainers are of course welcome to prove me wrong.
>
> While I was at it, I took the liberty to fix a couple of related issue,
> such as some spurious affinity bits on ThunderX, and their complete
> absence on ls1043a (both of which seem to be related to copy-pasting
> from other DTs).
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 ++++----
> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 ++++----
> arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 ++++----
> arch/arm64/boot/dts/broadcom/ns2.dtsi | 8 ++++----
> arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 8 ++++----
> arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 ++++----
> arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 8 ++++----
> arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 8 ++++----
> arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi | 8 ++++----
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 8 ++++----
> 10 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index 445aa67..c2b9bcb 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -255,10 +255,10 @@
> /* Local timer */
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xf01>,
> - <1 14 0xf01>,
> - <1 11 0xf01>,
> - <1 10 0xf01>;
> + interrupts = <1 13 0xf08>,
> + <1 14 0xf08>,
> + <1 11 0xf08>,
> + <1 10 0xf08>;
> };
>
> timer0: timer0@ffc03000 {
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> index 832815d..4d9d144 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
> @@ -100,13 +100,13 @@
> timer {
> compatible = "arm,armv8-timer";
> interrupts = <GIC_PPI 13
> - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>,
> + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 14
> - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>,
> + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 11
> - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>,
> + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 10
> - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>;
> + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>;
> };
>
> xtal: xtal-clk {
> diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
> index 5147d76..1c4193f 100644
> --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
> +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
> @@ -110,10 +110,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 0 0xff01>, /* Secure Phys IRQ */
> - <1 13 0xff01>, /* Non-secure Phys IRQ */
> - <1 14 0xff01>, /* Virt IRQ */
> - <1 15 0xff01>; /* Hyp IRQ */
> + interrupts = <1 0 0xff08>, /* Secure Phys IRQ */
> + <1 13 0xff08>, /* Non-secure Phys IRQ */
> + <1 14 0xff08>, /* Virt IRQ */
> + <1 15 0xff08>; /* Hyp IRQ */
> clock-frequency = <50000000>;
> };
For above changes on apm-storm.dtsi for APM X-Gene 1:
Acked-by: Duc Dang <dhdang@apm.com>
Thanks,
Duc Dang.
>
> diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi
> index ec68ec1..9c2d8a7 100644
> --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi
> +++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi
> @@ -88,13 +88,13 @@
> timer {
> compatible = "arm,armv8-timer";
> interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xff) |
> - IRQ_TYPE_EDGE_RISING)>,
> + IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 14 (GIC_CPU_MASK_RAW(0xff) |
> - IRQ_TYPE_EDGE_RISING)>,
> + IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 11 (GIC_CPU_MASK_RAW(0xff) |
> - IRQ_TYPE_EDGE_RISING)>,
> + IRQ_TYPE_LEVEL_LOW)>,
> <GIC_PPI 10 (GIC_CPU_MASK_RAW(0xff) |
> - IRQ_TYPE_EDGE_RISING)>;
> + IRQ_TYPE_LEVEL_LOW)>;
> };
>
> pmu {
> diff --git a/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi b/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
> index 2eb9b22..382d86f 100644
> --- a/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
> +++ b/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
> @@ -354,10 +354,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xff01>,
> - <1 14 0xff01>,
> - <1 11 0xff01>,
> - <1 10 0xff01>;
> + interrupts = <1 13 8>,
> + <1 14 8>,
> + <1 11 8>,
> + <1 10 8>;
> };
>
> pmu {
> diff --git a/arch/arm64/boot/dts/exynos/exynos7.dtsi b/arch/arm64/boot/dts/exynos/exynos7.dtsi
> index ca663df..1628315 100644
> --- a/arch/arm64/boot/dts/exynos/exynos7.dtsi
> +++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi
> @@ -473,10 +473,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xff01>,
> - <1 14 0xff01>,
> - <1 11 0xff01>,
> - <1 10 0xff01>;
> + interrupts = <1 13 0xff08>,
> + <1 14 0xff08>,
> + <1 11 0xff08>,
> + <1 10 0xff08>;
> };
>
> pmu_system_controller: system-controller@105c0000 {
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> index c277ba6..b92543d 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> @@ -111,10 +111,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 13 0x1>, /* Physical Secure PPI */
> - <1 14 0x1>, /* Physical Non-Secure PPI */
> - <1 11 0x1>, /* Virtual PPI */
> - <1 10 0x1>; /* Hypervisor PPI */
> + interrupts = <1 13 0xf08>, /* Physical Secure PPI */
> + <1 14 0xf08>, /* Physical Non-Secure PPI */
> + <1 11 0xf08>, /* Virtual PPI */
> + <1 10 0xf08>; /* Hypervisor PPI */
> fsl,erratum-a008585;
> };
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> index 20d256b..b1d6bb8 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> @@ -122,10 +122,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
> - <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
> - <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>,
> - <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
> + 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)>;
> };
>
> odmi: odmi@300000 {
> diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
> index 9532880..5a8e0f4 100644
> --- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
> +++ b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
> @@ -127,10 +127,10 @@
>
> timer {
> compatible = "arm,armv8-timer";
> - interrupts = <1 13 0xf01>,
> - <1 14 0xf01>,
> - <1 11 0xf01>,
> - <1 10 0xf01>;
> + interrupts = <1 13 0xf08>,
> + <1 14 0xf08>,
> + <1 11 0xf08>,
> + <1 10 0xf08>;
> };
>
> soc {
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index e595f22..3e2e51f 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -65,10 +65,10 @@
> timer {
> compatible = "arm,armv8-timer";
> interrupt-parent = <&gic>;
> - interrupts = <1 13 0xf01>,
> - <1 14 0xf01>,
> - <1 11 0xf01>,
> - <1 10 0xf01>;
> + interrupts = <1 13 0xf08>,
> + <1 14 0xf08>,
> + <1 11 0xf08>,
> + <1 10 0xf08>;
> };
>
> amba_apu {
> --
> 2.1.4
>
prev parent reply other threads:[~2016-06-10 21:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 17:56 [PATCH v3 0/2] arm/arm64: Fix architected timer interrupt trigger Marc Zyngier
2016-06-06 17:56 ` [PATCH v3 1/2] clocksource/arm_arch_timer: Force per-CPU interrupt to be level-triggered Marc Zyngier
2016-06-09 21:10 ` David Daney
2016-06-10 7:29 ` Marc Zyngier
2016-06-10 17:39 ` David Daney
2016-06-11 9:41 ` Marc Zyngier
[not found] ` <CANe6Qb_sx8_rRHZG1PR=A+cgxqYTzreZ0rD01X-gtEDb=h1cVQ@mail.gmail.com>
2016-06-12 10:12 ` Marc Zyngier
2016-06-10 21:51 ` Duc Dang
2016-06-06 17:56 ` [PATCH v3 2/2] arm64: dts: Fix broken architected timer interrupt trigger Marc Zyngier
2016-06-07 7:08 ` Krzysztof Kozlowski
2016-06-07 7:19 ` Michal Simek
2016-06-09 15:05 ` Dinh Nguyen
2016-06-09 15:23 ` Carlo Caione
2016-06-09 18:11 ` David Daney
2016-06-09 21:06 ` David Daney
2016-06-10 7:23 ` Marc Zyngier
2016-06-10 16:50 ` David Daney
2016-06-10 16:56 ` Marc Zyngier
2016-06-10 17:32 ` David Daney
2016-06-11 10:04 ` Marc Zyngier
2016-06-10 21:48 ` Duc Dang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADaLNDn_k2eDoBhmDu9Ub5D0XF7PTN-sW9kNDTuFSUybgT59jQ@mail.gmail.com \
--to=dhdang@apm.com \
--cc=B48286@freescale.com \
--cc=Gang.Liu@nxp.com \
--cc=Mingkai.Hu@freescale.com \
--cc=Wenbin.Song@freescale.com \
--cc=andrew@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=carlo@caione.org \
--cc=daniel.lezcano@linaro.org \
--cc=dinguyen@opensource.altera.com \
--cc=f.fainelli@gmail.com \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=jglauber@cavium.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=rajesh.bhagat@freescale.com \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=sbranden@broadcom.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=soren.brinkmann@xilinx.com \
--cc=tchalamarla@cavium.com \
--cc=tglx@linutronix.de \
--cc=yamada.masahiro@socionext.com \
--cc=yao.yuan@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).