lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 353/563] gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock
    Date
    From: Iwona Winiarska <iwona.winiarska@intel.com>

    [ Upstream commit 61a7904b6ace99b1bde0d0e867fa3097f5c8cee2 ]

    The gpio-aspeed driver implements an irq_chip which need to be invoked
    from hardirq context. Since spin_lock() can sleep with PREEMPT_RT, it is
    no longer legal to invoke it while interrupts are disabled.
    This also causes lockdep to complain about:
    [ 0.649797] [ BUG: Invalid wait context ]
    because aspeed_gpio.lock (spin_lock_t) is taken under irq_desc.lock
    (raw_spinlock_t).
    Let's use of raw_spinlock_t instead of spinlock_t.

    Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com>
    Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpio-aspeed.c | 52 +++++++++++++++++++-------------------
    1 file changed, 26 insertions(+), 26 deletions(-)

    diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
    index b966f5e28ebff..e0d5d80ec8e0f 100644
    --- a/drivers/gpio/gpio-aspeed.c
    +++ b/drivers/gpio/gpio-aspeed.c
    @@ -53,7 +53,7 @@ struct aspeed_gpio_config {
    struct aspeed_gpio {
    struct gpio_chip chip;
    struct irq_chip irqc;
    - spinlock_t lock;
    + raw_spinlock_t lock;
    void __iomem *base;
    int irq;
    const struct aspeed_gpio_config *config;
    @@ -413,14 +413,14 @@ static void aspeed_gpio_set(struct gpio_chip *gc, unsigned int offset,
    unsigned long flags;
    bool copro;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);
    copro = aspeed_gpio_copro_request(gpio, offset);

    __aspeed_gpio_set(gc, offset, val);

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);
    }

    static int aspeed_gpio_dir_in(struct gpio_chip *gc, unsigned int offset)
    @@ -435,7 +435,7 @@ static int aspeed_gpio_dir_in(struct gpio_chip *gc, unsigned int offset)
    if (!have_input(gpio, offset))
    return -ENOTSUPP;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    reg = ioread32(addr);
    reg &= ~GPIO_BIT(offset);
    @@ -445,7 +445,7 @@ static int aspeed_gpio_dir_in(struct gpio_chip *gc, unsigned int offset)
    if (copro)
    aspeed_gpio_copro_release(gpio, offset);

    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return 0;
    }
    @@ -463,7 +463,7 @@ static int aspeed_gpio_dir_out(struct gpio_chip *gc,
    if (!have_output(gpio, offset))
    return -ENOTSUPP;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    reg = ioread32(addr);
    reg |= GPIO_BIT(offset);
    @@ -474,7 +474,7 @@ static int aspeed_gpio_dir_out(struct gpio_chip *gc,

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return 0;
    }
    @@ -492,11 +492,11 @@ static int aspeed_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
    if (!have_output(gpio, offset))
    return GPIO_LINE_DIRECTION_IN;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    val = ioread32(bank_reg(gpio, bank, reg_dir)) & GPIO_BIT(offset);

    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return val ? GPIO_LINE_DIRECTION_OUT : GPIO_LINE_DIRECTION_IN;
    }
    @@ -539,14 +539,14 @@ static void aspeed_gpio_irq_ack(struct irq_data *d)

    status_addr = bank_reg(gpio, bank, reg_irq_status);

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);
    copro = aspeed_gpio_copro_request(gpio, offset);

    iowrite32(bit, status_addr);

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);
    }

    static void aspeed_gpio_irq_set_mask(struct irq_data *d, bool set)
    @@ -565,7 +565,7 @@ static void aspeed_gpio_irq_set_mask(struct irq_data *d, bool set)

    addr = bank_reg(gpio, bank, reg_irq_enable);

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);
    copro = aspeed_gpio_copro_request(gpio, offset);

    reg = ioread32(addr);
    @@ -577,7 +577,7 @@ static void aspeed_gpio_irq_set_mask(struct irq_data *d, bool set)

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);
    }

    static void aspeed_gpio_irq_mask(struct irq_data *d)
    @@ -629,7 +629,7 @@ static int aspeed_gpio_set_type(struct irq_data *d, unsigned int type)
    return -EINVAL;
    }

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);
    copro = aspeed_gpio_copro_request(gpio, offset);

    addr = bank_reg(gpio, bank, reg_irq_type0);
    @@ -649,7 +649,7 @@ static int aspeed_gpio_set_type(struct irq_data *d, unsigned int type)

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    irq_set_handler_locked(d, handler);

    @@ -719,7 +719,7 @@ static int aspeed_gpio_reset_tolerance(struct gpio_chip *chip,

    treg = bank_reg(gpio, to_bank(offset), reg_tolerance);

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);
    copro = aspeed_gpio_copro_request(gpio, offset);

    val = readl(treg);
    @@ -733,7 +733,7 @@ static int aspeed_gpio_reset_tolerance(struct gpio_chip *chip,

    if (copro)
    aspeed_gpio_copro_release(gpio, offset);
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return 0;
    }
    @@ -859,7 +859,7 @@ static int enable_debounce(struct gpio_chip *chip, unsigned int offset,
    return rc;
    }

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    if (timer_allocation_registered(gpio, offset)) {
    rc = unregister_allocated_timer(gpio, offset);
    @@ -919,7 +919,7 @@ static int enable_debounce(struct gpio_chip *chip, unsigned int offset,
    configure_timer(gpio, offset, i);

    out:
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return rc;
    }
    @@ -930,13 +930,13 @@ static int disable_debounce(struct gpio_chip *chip, unsigned int offset)
    unsigned long flags;
    int rc;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    rc = unregister_allocated_timer(gpio, offset);
    if (!rc)
    configure_timer(gpio, offset, 0);

    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);

    return rc;
    }
    @@ -1018,7 +1018,7 @@ int aspeed_gpio_copro_grab_gpio(struct gpio_desc *desc,
    return -EINVAL;
    bindex = offset >> 3;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    /* Sanity check, this shouldn't happen */
    if (gpio->cf_copro_bankmap[bindex] == 0xff) {
    @@ -1039,7 +1039,7 @@ int aspeed_gpio_copro_grab_gpio(struct gpio_desc *desc,
    if (bit)
    *bit = GPIO_OFFSET(offset);
    bail:
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);
    return rc;
    }
    EXPORT_SYMBOL_GPL(aspeed_gpio_copro_grab_gpio);
    @@ -1063,7 +1063,7 @@ int aspeed_gpio_copro_release_gpio(struct gpio_desc *desc)
    return -EINVAL;
    bindex = offset >> 3;

    - spin_lock_irqsave(&gpio->lock, flags);
    + raw_spin_lock_irqsave(&gpio->lock, flags);

    /* Sanity check, this shouldn't happen */
    if (gpio->cf_copro_bankmap[bindex] == 0) {
    @@ -1077,7 +1077,7 @@ int aspeed_gpio_copro_release_gpio(struct gpio_desc *desc)
    aspeed_gpio_change_cmd_source(gpio, bank, bindex,
    GPIO_CMDSRC_ARM);
    bail:
    - spin_unlock_irqrestore(&gpio->lock, flags);
    + raw_spin_unlock_irqrestore(&gpio->lock, flags);
    return rc;
    }
    EXPORT_SYMBOL_GPL(aspeed_gpio_copro_release_gpio);
    @@ -1151,7 +1151,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
    if (IS_ERR(gpio->base))
    return PTR_ERR(gpio->base);

    - spin_lock_init(&gpio->lock);
    + raw_spin_lock_init(&gpio->lock);

    gpio_id = of_match_node(aspeed_gpio_of_table, pdev->dev.of_node);
    if (!gpio_id)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:11    [W:2.943 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site