From: Julien Thierry <julien.thierry@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, daniel.thompson@linaro.org, joel@joelfernandes.org, marc.zyngier@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, james.morse@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Julien Thierry <julien.thierry@arm.com>, Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net> Subject: [PATCH v4 18/26] irqchip/gic-v3: Do not overwrite PMR value Date: Fri, 25 May 2018 10:49:24 +0100 [thread overview] Message-ID: <1527241772-48007-19-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1527241772-48007-1-git-send-email-julien.thierry@arm.com> If the architecture is using ICC_PMR_EL1 to mask IRQs, do not overwrite that value. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> --- drivers/irqchip/irq-gic-v3.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 13d283d..fc477e2 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -226,6 +226,11 @@ static void gic_unmask_irq(struct irq_data *d) gic_poke_irq(d, GICD_ISENABLER); } +static inline bool arch_uses_gic_prios(void) +{ + return IS_ENABLED(CONFIG_USE_ICC_SYSREGS_FOR_IRQFLAGS); +} + static int gic_irq_set_irqchip_state(struct irq_data *d, enum irqchip_irq_state which, bool val) { @@ -404,6 +409,9 @@ static u32 gic_get_pribits(void) static bool gic_has_group0(void) { u32 val; + u32 old_pmr; + + old_pmr = gic_read_pmr(); /* * Let's find out if Group0 is under control of EL3 or not by @@ -419,6 +427,8 @@ static bool gic_has_group0(void) gic_write_pmr(BIT(8 - gic_get_pribits())); val = gic_read_pmr(); + gic_write_pmr(old_pmr); + return val != 0; } @@ -580,7 +590,8 @@ static void gic_cpu_sys_reg_init(void) group0 = gic_has_group0(); /* Set priority mask register */ - write_gicreg(DEFAULT_PMR_VALUE, ICC_PMR_EL1); + if (!arch_uses_gic_prios()) + write_gicreg(DEFAULT_PMR_VALUE, ICC_PMR_EL1); /* * Some firmwares hand over to the kernel with the BPR changed from -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: julien.thierry@arm.com (Julien Thierry) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 18/26] irqchip/gic-v3: Do not overwrite PMR value Date: Fri, 25 May 2018 10:49:24 +0100 [thread overview] Message-ID: <1527241772-48007-19-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1527241772-48007-1-git-send-email-julien.thierry@arm.com> If the architecture is using ICC_PMR_EL1 to mask IRQs, do not overwrite that value. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> --- drivers/irqchip/irq-gic-v3.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 13d283d..fc477e2 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -226,6 +226,11 @@ static void gic_unmask_irq(struct irq_data *d) gic_poke_irq(d, GICD_ISENABLER); } +static inline bool arch_uses_gic_prios(void) +{ + return IS_ENABLED(CONFIG_USE_ICC_SYSREGS_FOR_IRQFLAGS); +} + static int gic_irq_set_irqchip_state(struct irq_data *d, enum irqchip_irq_state which, bool val) { @@ -404,6 +409,9 @@ static u32 gic_get_pribits(void) static bool gic_has_group0(void) { u32 val; + u32 old_pmr; + + old_pmr = gic_read_pmr(); /* * Let's find out if Group0 is under control of EL3 or not by @@ -419,6 +427,8 @@ static bool gic_has_group0(void) gic_write_pmr(BIT(8 - gic_get_pribits())); val = gic_read_pmr(); + gic_write_pmr(old_pmr); + return val != 0; } @@ -580,7 +590,8 @@ static void gic_cpu_sys_reg_init(void) group0 = gic_has_group0(); /* Set priority mask register */ - write_gicreg(DEFAULT_PMR_VALUE, ICC_PMR_EL1); + if (!arch_uses_gic_prios()) + write_gicreg(DEFAULT_PMR_VALUE, ICC_PMR_EL1); /* * Some firmwares hand over to the kernel with the BPR changed from -- 1.9.1
next prev parent reply other threads:[~2018-05-25 9:50 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-25 9:49 [PATCH v4 00/26] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 01/26] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 02/26] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 10:04 ` Suzuki K Poulose 2018-05-25 10:04 ` Suzuki K Poulose 2018-05-25 10:17 ` Julien Thierry 2018-05-25 10:17 ` Julien Thierry 2018-05-25 10:36 ` Suzuki K Poulose 2018-05-25 10:36 ` Suzuki K Poulose 2018-05-25 10:39 ` Julien Thierry 2018-05-25 10:39 ` Julien Thierry 2018-05-25 10:41 ` Suzuki K Poulose 2018-05-25 10:41 ` Suzuki K Poulose 2018-05-25 10:48 ` Julien Thierry 2018-05-25 10:48 ` Julien Thierry 2018-06-12 13:46 ` Julien Thierry 2018-06-12 13:46 ` Julien Thierry 2018-06-15 10:16 ` Suzuki K Poulose 2018-06-15 10:16 ` Suzuki K Poulose 2018-05-25 9:49 ` [PATCH v4 03/26] arm64: cpufeature: Use alternatives for VHE cpu_enable Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 04/26] arm64: alternative: Apply alternatives early in boot process Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 10:00 ` Suzuki K Poulose 2018-05-25 10:00 ` Suzuki K Poulose 2018-05-25 10:25 ` Julien Thierry 2018-05-25 10:25 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 05/26] irqchip/gic: Unify GIC priority definitions Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 06/26] irqchip/gic: Lower priority of GIC interrupts Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 07/26] irqchip/gic-v3: Remove acknowledge loop Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 08/26] arm64: daifflags: Use irqflags functions for daifflags Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 09/26] arm64: Use daifflag_restore after bp_hardening Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 10/26] arm64: Delay daif masking for user return Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 11/26] arm64: Make PMR part of task context Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 12/26] arm64: Unmask PMR before going idle Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 13/26] arm/arm64: gic-v3: Add helper functions to manage IRQ priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 14/26] arm64: kvm: Unmask PMR before entering guest Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 15/26] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 16/26] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 17/26] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` Julien Thierry [this message] 2018-05-25 9:49 ` [PATCH v4 18/26] irqchip/gic-v3: Do not overwrite PMR value Julien Thierry 2018-05-25 9:49 ` [PATCH v4 19/26] irqchip/gic-v3: Switch to PMR masking after IRQ acknowledge Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 20/26] arm64: Switch to PMR masking when starting CPUs Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 21/26] arm64: Add build option for IRQ masking via priority Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 22/26] arm64: Detect current view of GIC priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 23/26] irqchip/gic: Add functions to access irq priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 24/26] irqchip/gic-v3: Add base support for pseudo-NMI Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-06-13 11:14 ` Julien Thierry 2018-06-13 11:14 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 25/26] irqchip/gic-v3: Provide NMI handlers Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 26/26] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-06-13 11:07 ` Julien Thierry 2018-06-13 11:07 ` Julien Thierry 2018-05-25 10:16 ` [PATCH v4 00/26] arm64: provide pseudo NMI with GICv3 Daniel Thompson 2018-05-25 10:16 ` Daniel Thompson 2018-05-25 10:40 ` Julien Thierry 2018-05-25 10:40 ` Julien Thierry 2018-05-25 13:42 ` Julien Thierry 2018-05-25 13:42 ` Julien Thierry 2018-07-20 15:09 ` Daniel Thompson 2018-07-20 15:09 ` Daniel Thompson 2018-07-23 12:39 ` Julien Thierry 2018-07-23 12:39 ` Julien Thierry
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=1527241772-48007-19-git-send-email-julien.thierry@arm.com \ --to=julien.thierry@arm.com \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@arm.com \ --cc=daniel.thompson@linaro.org \ --cc=james.morse@arm.com \ --cc=jason@lakedaemon.net \ --cc=joel@joelfernandes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.