2024-05-20 07:21:01

by claudiu beznea

[permalink] [raw]
Subject: [PATCH] pinctrl: renesas: rzg2l: use spin_{lock,unlock}_irq{save,restore}

From: Claudiu Beznea <[email protected]>

On PREEMPT_RT kernels the spinlock_t maps to an rtmutex. Using
raw_spin_lock_irqsave()/raw_spin_unlock_irqrestore() on
&pctrl->lock.rlock breaks the PREEMPT_RT builds. To fix this use
spin_lock_irqsave()/spin_unlock_irqrestore() on &pctrl->lock.

Fixes: e1fd1f9f457b ("pinctrl: renesas: rzg2l: Configure the interrupt type on resume")
Reported-by: Diederik de Haas <[email protected]>
Closes: https://lore.kernel.org/all/131999629.KQPSlr0Zke@bagend
Signed-off-by: Claudiu Beznea <[email protected]>
---
drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 20425afc6b33..78f947a8e26e 100644
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -2069,11 +2069,11 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl)
* This has to be atomically executed to protect against a concurrent
* interrupt.
*/
- raw_spin_lock_irqsave(&pctrl->lock.rlock, flags);
+ spin_lock_irqsave(&pctrl->lock, flags);
ret = rzg2l_gpio_irq_set_type(data, irqd_get_trigger_type(data));
if (!ret && !irqd_irq_disabled(data))
rzg2l_gpio_irq_enable(data);
- raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags);
+ spin_unlock_irqrestore(&pctrl->lock, flags);

if (ret)
dev_crit(pctrl->dev, "Failed to set IRQ type for virq=%u\n", virq);
--
2.39.2



Subject: Re: [PATCH] pinctrl: renesas: rzg2l: use spin_{lock,unlock}_irq{save,restore}

On 2024-05-20 10:20:33 [+0300], Claudiu wrote:
> From: Claudiu Beznea <[email protected]>
>
> On PREEMPT_RT kernels the spinlock_t maps to an rtmutex. Using
> raw_spin_lock_irqsave()/raw_spin_unlock_irqrestore() on
> &pctrl->lock.rlock breaks the PREEMPT_RT builds. To fix this use
> spin_lock_irqsave()/spin_unlock_irqrestore() on &pctrl->lock.
>
> Fixes: e1fd1f9f457b ("pinctrl: renesas: rzg2l: Configure the interrupt type on resume")

02cd2d3be1c31 ("pinctrl: renesas: rzg2l: Configure the interrupt type on resume")

> Reported-by: Diederik de Haas <[email protected]>
> Closes: https://lore.kernel.org/all/131999629.KQPSlr0Zke@bagend
> Signed-off-by: Claudiu Beznea <[email protected]>

Sebastian

2024-05-21 15:14:46

by Diederik de Haas

[permalink] [raw]
Subject: Re: [PATCH] pinctrl: renesas: rzg2l: use spin_{lock,unlock}_irq{save,restore}

On Monday, 20 May 2024 09:20:33 CEST Claudiu wrote:
> From: Claudiu Beznea <[email protected]>
>
> On PREEMPT_RT kernels the spinlock_t maps to an rtmutex. Using
> raw_spin_lock_irqsave()/raw_spin_unlock_irqrestore() on
> &pctrl->lock.rlock breaks the PREEMPT_RT builds. To fix this use
> spin_lock_irqsave()/spin_unlock_irqrestore() on &pctrl->lock.
>
> Fixes: e1fd1f9f457b ("pinctrl: renesas: rzg2l: Configure the interrupt type
> on resume") Reported-by: Diederik de Haas <[email protected]>
> Closes: https://lore.kernel.org/all/131999629.KQPSlr0Zke@bagend
> Signed-off-by: Claudiu Beznea <[email protected]>
> ---
> drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
> b/drivers/pinctrl/renesas/pinctrl-rzg2l.c index 20425afc6b33..78f947a8e26e
> 100644
> --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
> +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
> @@ -2069,11 +2069,11 @@ static void rzg2l_gpio_irq_restore(struct
> rzg2l_pinctrl *pctrl) * This has to be atomically executed to protect
> against a concurrent * interrupt.
> */
> - raw_spin_lock_irqsave(&pctrl->lock.rlock, flags);
> + spin_lock_irqsave(&pctrl->lock, flags);
> ret = rzg2l_gpio_irq_set_type(data,
irqd_get_trigger_type(data));
> if (!ret && !irqd_irq_disabled(data))
> rzg2l_gpio_irq_enable(data);
> - raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags);
> + spin_unlock_irqrestore(&pctrl->lock, flags);
>
> if (ret)
> dev_crit(pctrl->dev, "Failed to set IRQ type
for virq=%u\n", virq);

Now the build succeeds on both amd64 and arm64.
Thanks!


Attachments:
signature.asc (235.00 B)
This is a digitally signed message part.