LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers
@ 2021-08-12 10:09 Sven Peter
  2021-08-18 11:35 ` Hector Martin
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Sven Peter @ 2021-08-12 10:09 UTC (permalink / raw)
  To: Hector Martin
  Cc: Sven Peter, Thomas Gleixner, Marc Zyngier, Will Deacon,
	linux-arm-kernel, linux-kernel

When disable_irq_nosync for an interrupt is called from within its
interrupt handler, this interrupt is only marked as disabled with the
intention to mask it when it triggers again.
The AIC hardware however automatically masks the interrupt when it is read.
aic_irq_eoi then unmasks it again if it's not disabled *and* not masked.
This results in a state mismatch between the hardware state and the
state kept in irq_data: The hardware interrupt is masked but
IRQD_IRQ_MASKED is not set. Any further calls to unmask_irq will directly
return and the interrupt can never be enabled again.

Fix this by keeping the hardware and irq_data state in sync by unmasking in
aic_irq_eoi if and only if the irq_data state also assumes the interrupt to
be unmasked.

Fixes: 76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
 drivers/irqchip/irq-apple-aic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-aic.c
index b8c06bd8659e..6fc145aacaf0 100644
--- a/drivers/irqchip/irq-apple-aic.c
+++ b/drivers/irqchip/irq-apple-aic.c
@@ -226,7 +226,7 @@ static void aic_irq_eoi(struct irq_data *d)
 	 * Reading the interrupt reason automatically acknowledges and masks
 	 * the IRQ, so we just unmask it here if needed.
 	 */
-	if (!irqd_irq_disabled(d) && !irqd_irq_masked(d))
+	if (!irqd_irq_masked(d))
 		aic_irq_unmask(d);
 }
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers
  2021-08-12 10:09 [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers Sven Peter
@ 2021-08-18 11:35 ` Hector Martin
  2021-08-20 12:22 ` Marc Zyngier
  2021-08-20 13:34 ` [irqchip: irq/irqchip-next] irqchip/apple-aic: Fix " irqchip-bot for Sven Peter
  2 siblings, 0 replies; 4+ messages in thread
From: Hector Martin @ 2021-08-18 11:35 UTC (permalink / raw)
  To: Sven Peter
  Cc: Thomas Gleixner, Marc Zyngier, Will Deacon, linux-arm-kernel,
	linux-kernel

*Puts on kernel maintainer hat again*

Sorry for the delay. I've been spending too much time on hardware RE 
recently...

On 12/08/2021 19.09, Sven Peter wrote:
> When disable_irq_nosync for an interrupt is called from within its
> interrupt handler, this interrupt is only marked as disabled with the
> intention to mask it when it triggers again.
> The AIC hardware however automatically masks the interrupt when it is read.
> aic_irq_eoi then unmasks it again if it's not disabled *and* not masked.
> This results in a state mismatch between the hardware state and the
> state kept in irq_data: The hardware interrupt is masked but
> IRQD_IRQ_MASKED is not set. Any further calls to unmask_irq will directly
> return and the interrupt can never be enabled again.
> 
> Fix this by keeping the hardware and irq_data state in sync by unmasking in
> aic_irq_eoi if and only if the irq_data state also assumes the interrupt to
> be unmasked.
> 
> Fixes: 76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
> ---
>   drivers/irqchip/irq-apple-aic.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-aic.c
> index b8c06bd8659e..6fc145aacaf0 100644
> --- a/drivers/irqchip/irq-apple-aic.c
> +++ b/drivers/irqchip/irq-apple-aic.c
> @@ -226,7 +226,7 @@ static void aic_irq_eoi(struct irq_data *d)
>   	 * Reading the interrupt reason automatically acknowledges and masks
>   	 * the IRQ, so we just unmask it here if needed.
>   	 */
> -	if (!irqd_irq_disabled(d) && !irqd_irq_masked(d))
> +	if (!irqd_irq_masked(d))
>   		aic_irq_unmask(d);
>   }
>   
> 

Looks good to me. I can't remember exactly where this code came from, 
but looking again at the irqchip code it's clear that the mask state and 
hardware mask always have to be in sync.

Acked-by: Hector Martin <marcan@marcan.st>

-- 
Hector Martin (marcan@marcan.st)
Public Key: https://mrcn.st/pub

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers
  2021-08-12 10:09 [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers Sven Peter
  2021-08-18 11:35 ` Hector Martin
@ 2021-08-20 12:22 ` Marc Zyngier
  2021-08-20 13:34 ` [irqchip: irq/irqchip-next] irqchip/apple-aic: Fix " irqchip-bot for Sven Peter
  2 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2021-08-20 12:22 UTC (permalink / raw)
  To: Hector Martin, Sven Peter
  Cc: Will Deacon, linux-kernel, Thomas Gleixner, linux-arm-kernel

On Thu, 12 Aug 2021 12:09:42 +0200, Sven Peter wrote:
> When disable_irq_nosync for an interrupt is called from within its
> interrupt handler, this interrupt is only marked as disabled with the
> intention to mask it when it triggers again.
> The AIC hardware however automatically masks the interrupt when it is read.
> aic_irq_eoi then unmasks it again if it's not disabled *and* not masked.
> This results in a state mismatch between the hardware state and the
> state kept in irq_data: The hardware interrupt is masked but
> IRQD_IRQ_MASKED is not set. Any further calls to unmask_irq will directly
> return and the interrupt can never be enabled again.
> 
> [...]

Applied to irq/misc-5.15, thanks!

[1/1] irqchip/apple-aic: fix irq_disable from within irq handlers
      commit: 0fb038ba08dba0a5e937b79a67ed9c21ab5b59c5

Cheers,

	M.
-- 
Without deviation from the norm, progress is not possible.



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [irqchip: irq/irqchip-next] irqchip/apple-aic: Fix irq_disable from within irq handlers
  2021-08-12 10:09 [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers Sven Peter
  2021-08-18 11:35 ` Hector Martin
  2021-08-20 12:22 ` Marc Zyngier
@ 2021-08-20 13:34 ` irqchip-bot for Sven Peter
  2 siblings, 0 replies; 4+ messages in thread
From: irqchip-bot for Sven Peter @ 2021-08-20 13:34 UTC (permalink / raw)
  To: linux-kernel; +Cc: Sven Peter, Hector Martin, Marc Zyngier, tglx

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     60a1cd10b222e004f860d14651e80089c77e8e6b
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/60a1cd10b222e004f860d14651e80089c77e8e6b
Author:        Sven Peter <sven@svenpeter.dev>
AuthorDate:    Thu, 12 Aug 2021 12:09:42 +02:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Fri, 20 Aug 2021 14:32:33 +01:00

irqchip/apple-aic: Fix irq_disable from within irq handlers

When disable_irq_nosync for an interrupt is called from within its
interrupt handler, this interrupt is only marked as disabled with the
intention to mask it when it triggers again.
The AIC hardware however automatically masks the interrupt when it is read.
aic_irq_eoi then unmasks it again if it's not disabled *and* not masked.
This results in a state mismatch between the hardware state and the
state kept in irq_data: The hardware interrupt is masked but
IRQD_IRQ_MASKED is not set. Any further calls to unmask_irq will directly
return and the interrupt can never be enabled again.

Fix this by keeping the hardware and irq_data state in sync by unmasking in
aic_irq_eoi if and only if the irq_data state also assumes the interrupt to
be unmasked.

Fixes: 76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Acked-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210812100942.17206-1-sven@svenpeter.dev
---
 drivers/irqchip/irq-apple-aic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-aic.c
index b8c06bd..6fc145a 100644
--- a/drivers/irqchip/irq-apple-aic.c
+++ b/drivers/irqchip/irq-apple-aic.c
@@ -226,7 +226,7 @@ static void aic_irq_eoi(struct irq_data *d)
 	 * Reading the interrupt reason automatically acknowledges and masks
 	 * the IRQ, so we just unmask it here if needed.
 	 */
-	if (!irqd_irq_disabled(d) && !irqd_irq_masked(d))
+	if (!irqd_irq_masked(d))
 		aic_irq_unmask(d);
 }
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-20 13:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12 10:09 [PATCH] irqchip/apple-aic: fix irq_disable from within irq handlers Sven Peter
2021-08-18 11:35 ` Hector Martin
2021-08-20 12:22 ` Marc Zyngier
2021-08-20 13:34 ` [irqchip: irq/irqchip-next] irqchip/apple-aic: Fix " irqchip-bot for Sven Peter

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).