Skip to content

L
linux
Commit c69fcea5 authored by Julia Cartwright's avatar Julia Cartwright Committed by Linus Walleij
Browse files
Options

gpio: bcm-kona: make use of raw_spinlock variants 

The bcm-kona gpio driver currently implements an irq_chip for handling
interrupts; due to how irq_chip handling is done, it's necessary for the
irq_chip methods to be invoked from hardirq context, even on a a
real-time kernel.  Because the spinlock_t type becomes a "sleeping"
spinlock w/ RT kernels, it is not suitable to be used with irq_chips.

A quick audit of the operations under the lock reveal that they do only
minimal, bounded work, and are therefore safe to do under a raw spinlock.
Signed-off-by: default avatarJulia Cartwright <julia@ni.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 45897809
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
drivers/gpio/gpio-bcm-kona.c
View file @ c69fcea5
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
struct bcm_kona_gpio { struct bcm_kona_gpio {
void __iomem *reg_base; void __iomem *reg_base;
int num_bank; int num_bank;
spinlock_t lock; raw_spinlock_t lock;
struct gpio_chip gpio_chip; struct gpio_chip gpio_chip;
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
struct bcm_kona_gpio_bank *banks; struct bcm_kona_gpio_bank *banks;
...@@ -95,13 +95,13 @@ static void bcm_kona_gpio_lock_gpio(struct bcm_kona_gpio *kona_gpio, ...@@ -95,13 +95,13 @@ static void bcm_kona_gpio_lock_gpio(struct bcm_kona_gpio *kona_gpio,
unsigned long flags; unsigned long flags;
int bank_id = GPIO_BANK(gpio); int bank_id = GPIO_BANK(gpio);
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id)); val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id));
val |= BIT(gpio); val |= BIT(gpio);
bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val); bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val);
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio, static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio,
...@@ -111,13 +111,13 @@ static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio, ...@@ -111,13 +111,13 @@ static void bcm_kona_gpio_unlock_gpio(struct bcm_kona_gpio *kona_gpio,
unsigned long flags; unsigned long flags;
int bank_id = GPIO_BANK(gpio); int bank_id = GPIO_BANK(gpio);
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id)); val = readl(kona_gpio->reg_base + GPIO_PWD_STATUS(bank_id));
val &= ~BIT(gpio); val &= ~BIT(gpio);
bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val); bcm_kona_gpio_write_lock_regs(kona_gpio->reg_base, bank_id, val);
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static int bcm_kona_gpio_get_dir(struct gpio_chip *chip, unsigned gpio) static int bcm_kona_gpio_get_dir(struct gpio_chip *chip, unsigned gpio)
...@@ -141,7 +141,7 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) ...@@ -141,7 +141,7 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
kona_gpio = gpiochip_get_data(chip); kona_gpio = gpiochip_get_data(chip);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
/* this function only applies to output pin */ /* this function only applies to output pin */
if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN)
...@@ -154,7 +154,7 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) ...@@ -154,7 +154,7 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
writel(val, reg_base + reg_offset); writel(val, reg_base + reg_offset);
out: out:
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio) static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio)
...@@ -168,7 +168,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio) ...@@ -168,7 +168,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio)
kona_gpio = gpiochip_get_data(chip); kona_gpio = gpiochip_get_data(chip);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN) if (bcm_kona_gpio_get_dir(chip, gpio) == GPIOF_DIR_IN)
reg_offset = GPIO_IN_STATUS(bank_id); reg_offset = GPIO_IN_STATUS(bank_id);
...@@ -178,7 +178,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio) ...@@ -178,7 +178,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio)
/* read the GPIO bank status */ /* read the GPIO bank status */
val = readl(reg_base + reg_offset); val = readl(reg_base + reg_offset);
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
/* return the specified bit status */ /* return the specified bit status */
return !!(val & BIT(bit)); return !!(val & BIT(bit));
...@@ -208,14 +208,14 @@ static int bcm_kona_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) ...@@ -208,14 +208,14 @@ static int bcm_kona_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
kona_gpio = gpiochip_get_data(chip); kona_gpio = gpiochip_get_data(chip);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_CONTROL(gpio)); val = readl(reg_base + GPIO_CONTROL(gpio));
val &= ~GPIO_GPCTR0_IOTR_MASK; val &= ~GPIO_GPCTR0_IOTR_MASK;
val |= GPIO_GPCTR0_IOTR_CMD_INPUT; val |= GPIO_GPCTR0_IOTR_CMD_INPUT;
writel(val, reg_base + GPIO_CONTROL(gpio)); writel(val, reg_base + GPIO_CONTROL(gpio));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
return 0; return 0;
} }
...@@ -232,7 +232,7 @@ static int bcm_kona_gpio_direction_output(struct gpio_chip *chip, ...@@ -232,7 +232,7 @@ static int bcm_kona_gpio_direction_output(struct gpio_chip *chip,
kona_gpio = gpiochip_get_data(chip); kona_gpio = gpiochip_get_data(chip);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_CONTROL(gpio)); val = readl(reg_base + GPIO_CONTROL(gpio));
val &= ~GPIO_GPCTR0_IOTR_MASK; val &= ~GPIO_GPCTR0_IOTR_MASK;
...@@ -244,7 +244,7 @@ static int bcm_kona_gpio_direction_output(struct gpio_chip *chip, ...@@ -244,7 +244,7 @@ static int bcm_kona_gpio_direction_output(struct gpio_chip *chip,
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + reg_offset); writel(val, reg_base + reg_offset);
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
return 0; return 0;
} }
...@@ -288,7 +288,7 @@ static int bcm_kona_gpio_set_debounce(struct gpio_chip *chip, unsigned gpio, ...@@ -288,7 +288,7 @@ static int bcm_kona_gpio_set_debounce(struct gpio_chip *chip, unsigned gpio,
} }
/* spin lock for read-modify-write of the GPIO register */ /* spin lock for read-modify-write of the GPIO register */
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_CONTROL(gpio)); val = readl(reg_base + GPIO_CONTROL(gpio));
val &= ~GPIO_GPCTR0_DBR_MASK; val &= ~GPIO_GPCTR0_DBR_MASK;
...@@ -303,7 +303,7 @@ static int bcm_kona_gpio_set_debounce(struct gpio_chip *chip, unsigned gpio, ...@@ -303,7 +303,7 @@ static int bcm_kona_gpio_set_debounce(struct gpio_chip *chip, unsigned gpio,
writel(val, reg_base + GPIO_CONTROL(gpio)); writel(val, reg_base + GPIO_CONTROL(gpio));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
return 0; return 0;
} }
...@@ -347,13 +347,13 @@ static void bcm_kona_gpio_irq_ack(struct irq_data *d) ...@@ -347,13 +347,13 @@ static void bcm_kona_gpio_irq_ack(struct irq_data *d)
kona_gpio = irq_data_get_irq_chip_data(d); kona_gpio = irq_data_get_irq_chip_data(d);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_INT_STATUS(bank_id)); val = readl(reg_base + GPIO_INT_STATUS(bank_id));
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + GPIO_INT_STATUS(bank_id)); writel(val, reg_base + GPIO_INT_STATUS(bank_id));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static void bcm_kona_gpio_irq_mask(struct irq_data *d) static void bcm_kona_gpio_irq_mask(struct irq_data *d)
...@@ -368,13 +368,13 @@ static void bcm_kona_gpio_irq_mask(struct irq_data *d) ...@@ -368,13 +368,13 @@ static void bcm_kona_gpio_irq_mask(struct irq_data *d)
kona_gpio = irq_data_get_irq_chip_data(d); kona_gpio = irq_data_get_irq_chip_data(d);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_INT_MASK(bank_id)); val = readl(reg_base + GPIO_INT_MASK(bank_id));
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + GPIO_INT_MASK(bank_id)); writel(val, reg_base + GPIO_INT_MASK(bank_id));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static void bcm_kona_gpio_irq_unmask(struct irq_data *d) static void bcm_kona_gpio_irq_unmask(struct irq_data *d)
...@@ -389,13 +389,13 @@ static void bcm_kona_gpio_irq_unmask(struct irq_data *d) ...@@ -389,13 +389,13 @@ static void bcm_kona_gpio_irq_unmask(struct irq_data *d)
kona_gpio = irq_data_get_irq_chip_data(d); kona_gpio = irq_data_get_irq_chip_data(d);
reg_base = kona_gpio->reg_base; reg_base = kona_gpio->reg_base;
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_INT_MSKCLR(bank_id)); val = readl(reg_base + GPIO_INT_MSKCLR(bank_id));
val |= BIT(bit); val |= BIT(bit);
writel(val, reg_base + GPIO_INT_MSKCLR(bank_id)); writel(val, reg_base + GPIO_INT_MSKCLR(bank_id));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
} }
static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type) static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type)
...@@ -431,14 +431,14 @@ static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -431,14 +431,14 @@ static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type)
return -EINVAL; return -EINVAL;
} }
spin_lock_irqsave(&kona_gpio->lock, flags); raw_spin_lock_irqsave(&kona_gpio->lock, flags);
val = readl(reg_base + GPIO_CONTROL(gpio)); val = readl(reg_base + GPIO_CONTROL(gpio));
val &= ~GPIO_GPCTR0_ITR_MASK; val &= ~GPIO_GPCTR0_ITR_MASK;
val |= lvl_type << GPIO_GPCTR0_ITR_SHIFT; val |= lvl_type << GPIO_GPCTR0_ITR_SHIFT;
writel(val, reg_base + GPIO_CONTROL(gpio)); writel(val, reg_base + GPIO_CONTROL(gpio));
spin_unlock_irqrestore(&kona_gpio->lock, flags); raw_spin_unlock_irqrestore(&kona_gpio->lock, flags);
return 0; return 0;
} }
...@@ -655,7 +655,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) ...@@ -655,7 +655,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
bank); bank);
} }
spin_lock_init(&kona_gpio->lock); raw_spin_lock_init(&kona_gpio->lock);
return 0; return 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7