[PATCH dovetail-6.16] generic: irq_pipeline: Fix fallouts of lock guard conversion

[PATCH dovetail-6.16] generic: irq_pipeline: Fix fallouts of lock guard conversion

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

The irq_chip_generic struct uses a hard_spinlock to support the irq
pipeline.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Should unbreak the Xenomai CI pipeline.

 drivers/irqchip/irq-bcm7120-l2.c | 2 +-
 drivers/soc/dove/pmu.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index 28cebe480eb1d..a2f8433d9a564 100644
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -68,7 +68,7 @@ static void bcm7120_l2_intc_irq_handle(struct irq_desc *desc)
 		int hwirq;
 
 		gc = irq_get_domain_generic_chip(b->domain, base);
-		scoped_guard (raw_spinlock, &gc->lock) {
+		scoped_guard (hard_spinlock, &gc->lock) {
 			pending = irq_reg_readl(gc, b->stat_offset[idx]) & gc->mask_cache &
 				data->irq_map_mask[idx];
 		}
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index 7bbd3f940e4d9..142ccda535176 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -257,7 +257,7 @@ static void pmu_irq_handler(struct irq_desc *desc)
 	 * So, let's structure the code so that the window is as small as
 	 * possible.
 	 */
-	guard(raw_spinlock)(&gc->lock);
+	guard(hard_spinlock)(&gc->lock);
 	done &= readl_relaxed(base + PMC_IRQ_CAUSE);
 	writel_relaxed(done, base + PMC_IRQ_CAUSE);
 }
-- 
2.43.0

Re: [PATCH dovetail-6.16] generic: irq_pipeline: Fix fallouts of lock guard conversion

[Philippe Gerum]

Jan Kiszka <jan.kiszka@siemens.com> writes:

> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> The irq_chip_generic struct uses a hard_spinlock to support the irq
> pipeline.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Should unbreak the Xenomai CI pipeline.
>
>  drivers/irqchip/irq-bcm7120-l2.c | 2 +-
>  drivers/soc/dove/pmu.c           | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
> index 28cebe480eb1d..a2f8433d9a564 100644
> --- a/drivers/irqchip/irq-bcm7120-l2.c
> +++ b/drivers/irqchip/irq-bcm7120-l2.c
> @@ -68,7 +68,7 @@ static void bcm7120_l2_intc_irq_handle(struct irq_desc *desc)
>  		int hwirq;
>  
>  		gc = irq_get_domain_generic_chip(b->domain, base);
> -		scoped_guard (raw_spinlock, &gc->lock) {
> +		scoped_guard (hard_spinlock, &gc->lock) {
>  			pending = irq_reg_readl(gc, b->stat_offset[idx]) & gc->mask_cache &
>  				data->irq_map_mask[idx];
>  		}
> diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
> index 7bbd3f940e4d9..142ccda535176 100644
> --- a/drivers/soc/dove/pmu.c
> +++ b/drivers/soc/dove/pmu.c
> @@ -257,7 +257,7 @@ static void pmu_irq_handler(struct irq_desc *desc)
>  	 * So, let's structure the code so that the window is as small as
>  	 * possible.
>  	 */
> -	guard(raw_spinlock)(&gc->lock);
> +	guard(hard_spinlock)(&gc->lock);
>  	done &= readl_relaxed(base + PMC_IRQ_CAUSE);
>  	writel_relaxed(done, base + PMC_IRQ_CAUSE);
>  }

Merged, thanks.

-- 
Philippe.