Commit 5257169a authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Marc Zyngier

irqchip/stm32-exti: Use the hwspin_lock_timeout_in_atomic() API

Now that the hwspin_lock_timeout_in_atomic() API is available use it.
Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200706081115.25180-1-alexandre.torgue@st.com
parent fa03587c
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define IRQS_PER_BANK 32 #define IRQS_PER_BANK 32
#define HWSPNLCK_TIMEOUT 1000 /* usec */ #define HWSPNLCK_TIMEOUT 1000 /* usec */
#define HWSPNLCK_RETRY_DELAY 100 /* usec */
struct stm32_exti_bank { struct stm32_exti_bank {
u32 imr_ofst; u32 imr_ofst;
...@@ -277,55 +276,24 @@ static int stm32_exti_set_type(struct irq_data *d, ...@@ -277,55 +276,24 @@ static int stm32_exti_set_type(struct irq_data *d,
return 0; return 0;
} }
static int stm32_exti_hwspin_lock(struct stm32_exti_chip_data *chip_data)
{
int ret, timeout = 0;
if (!chip_data->host_data->hwlock)
return 0;
/*
* Use the x_raw API since we are under spin_lock protection.
* Do not use the x_timeout API because we are under irq_disable
* mode (see __setup_irq())
*/
do {
ret = hwspin_trylock_raw(chip_data->host_data->hwlock);
if (!ret)
return 0;
udelay(HWSPNLCK_RETRY_DELAY);
timeout += HWSPNLCK_RETRY_DELAY;
} while (timeout < HWSPNLCK_TIMEOUT);
if (ret == -EBUSY)
ret = -ETIMEDOUT;
if (ret)
pr_err("%s can't get hwspinlock (%d)\n", __func__, ret);
return ret;
}
static void stm32_exti_hwspin_unlock(struct stm32_exti_chip_data *chip_data)
{
if (chip_data->host_data->hwlock)
hwspin_unlock_raw(chip_data->host_data->hwlock);
}
static int stm32_irq_set_type(struct irq_data *d, unsigned int type) static int stm32_irq_set_type(struct irq_data *d, unsigned int type)
{ {
struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
struct stm32_exti_chip_data *chip_data = gc->private; struct stm32_exti_chip_data *chip_data = gc->private;
const struct stm32_exti_bank *stm32_bank = chip_data->reg_bank; const struct stm32_exti_bank *stm32_bank = chip_data->reg_bank;
struct hwspinlock *hwlock = chip_data->host_data->hwlock;
u32 rtsr, ftsr; u32 rtsr, ftsr;
int err; int err;
irq_gc_lock(gc); irq_gc_lock(gc);
err = stm32_exti_hwspin_lock(chip_data); if (hwlock) {
if (err) err = hwspin_lock_timeout_in_atomic(hwlock, HWSPNLCK_TIMEOUT);
goto unlock; if (err) {
pr_err("%s can't get hwspinlock (%d)\n", __func__, err);
goto unlock;
}
}
rtsr = irq_reg_readl(gc, stm32_bank->rtsr_ofst); rtsr = irq_reg_readl(gc, stm32_bank->rtsr_ofst);
ftsr = irq_reg_readl(gc, stm32_bank->ftsr_ofst); ftsr = irq_reg_readl(gc, stm32_bank->ftsr_ofst);
...@@ -338,7 +306,8 @@ static int stm32_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -338,7 +306,8 @@ static int stm32_irq_set_type(struct irq_data *d, unsigned int type)
irq_reg_writel(gc, ftsr, stm32_bank->ftsr_ofst); irq_reg_writel(gc, ftsr, stm32_bank->ftsr_ofst);
unspinlock: unspinlock:
stm32_exti_hwspin_unlock(chip_data); if (hwlock)
hwspin_unlock_in_atomic(hwlock);
unlock: unlock:
irq_gc_unlock(gc); irq_gc_unlock(gc);
...@@ -504,15 +473,20 @@ static int stm32_exti_h_set_type(struct irq_data *d, unsigned int type) ...@@ -504,15 +473,20 @@ static int stm32_exti_h_set_type(struct irq_data *d, unsigned int type)
{ {
struct stm32_exti_chip_data *chip_data = irq_data_get_irq_chip_data(d); struct stm32_exti_chip_data *chip_data = irq_data_get_irq_chip_data(d);
const struct stm32_exti_bank *stm32_bank = chip_data->reg_bank; const struct stm32_exti_bank *stm32_bank = chip_data->reg_bank;
struct hwspinlock *hwlock = chip_data->host_data->hwlock;
void __iomem *base = chip_data->host_data->base; void __iomem *base = chip_data->host_data->base;
u32 rtsr, ftsr; u32 rtsr, ftsr;
int err; int err;
raw_spin_lock(&chip_data->rlock); raw_spin_lock(&chip_data->rlock);
err = stm32_exti_hwspin_lock(chip_data); if (hwlock) {
if (err) err = hwspin_lock_timeout_in_atomic(hwlock, HWSPNLCK_TIMEOUT);
goto unlock; if (err) {
pr_err("%s can't get hwspinlock (%d)\n", __func__, err);
goto unlock;
}
}
rtsr = readl_relaxed(base + stm32_bank->rtsr_ofst); rtsr = readl_relaxed(base + stm32_bank->rtsr_ofst);
ftsr = readl_relaxed(base + stm32_bank->ftsr_ofst); ftsr = readl_relaxed(base + stm32_bank->ftsr_ofst);
...@@ -525,7 +499,8 @@ static int stm32_exti_h_set_type(struct irq_data *d, unsigned int type) ...@@ -525,7 +499,8 @@ static int stm32_exti_h_set_type(struct irq_data *d, unsigned int type)
writel_relaxed(ftsr, base + stm32_bank->ftsr_ofst); writel_relaxed(ftsr, base + stm32_bank->ftsr_ofst);
unspinlock: unspinlock:
stm32_exti_hwspin_unlock(chip_data); if (hwlock)
hwspin_unlock_in_atomic(hwlock);
unlock: unlock:
raw_spin_unlock(&chip_data->rlock); raw_spin_unlock(&chip_data->rlock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment