lkml.org 
[lkml]   [2015]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 82/86] pinctrl: baytrail: Serialize all register access
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mika Westerberg <mika.westerberg@linux.intel.com>

    commit 39ce8150a079e3ae6ed9abf26d7918a558ef7c19 upstream.

    There is a hardware issue in Intel Baytrail where concurrent GPIO register
    access might result reads of 0xffffffff and writes might get dropped
    completely.

    Prevent this from happening by taking the serializing lock in all places
    where it is possible that more than one thread might be accessing the
    hardware concurrently.

    Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Cc: Lucas De Marchi <lucas.de.marchi@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/pinctrl/intel/pinctrl-baytrail.c | 21 ++++++++++++++++-----
    1 file changed, 16 insertions(+), 5 deletions(-)

    --- a/drivers/pinctrl/intel/pinctrl-baytrail.c
    +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
    @@ -201,6 +201,9 @@ static int byt_gpio_request(struct gpio_
    struct byt_gpio *vg = to_byt_gpio(chip);
    void __iomem *reg = byt_gpio_reg(chip, offset, BYT_CONF0_REG);
    u32 value, gpio_mux;
    + unsigned long flags;
    +
    + spin_lock_irqsave(&vg->lock, flags);

    /*
    * In most cases, func pin mux 000 means GPIO function.
    @@ -214,18 +217,16 @@ static int byt_gpio_request(struct gpio_
    value = readl(reg) & BYT_PIN_MUX;
    gpio_mux = byt_get_gpio_mux(vg, offset);
    if (WARN_ON(gpio_mux != value)) {
    - unsigned long flags;
    -
    - spin_lock_irqsave(&vg->lock, flags);
    value = readl(reg) & ~BYT_PIN_MUX;
    value |= gpio_mux;
    writel(value, reg);
    - spin_unlock_irqrestore(&vg->lock, flags);

    dev_warn(&vg->pdev->dev,
    "pin %u forcibly re-configured as GPIO\n", offset);
    }

    + spin_unlock_irqrestore(&vg->lock, flags);
    +
    pm_runtime_get(&vg->pdev->dev);

    return 0;
    @@ -277,7 +278,15 @@ static int byt_irq_type(struct irq_data
    static int byt_gpio_get(struct gpio_chip *chip, unsigned offset)
    {
    void __iomem *reg = byt_gpio_reg(chip, offset, BYT_VAL_REG);
    - return readl(reg) & BYT_LEVEL;
    + struct byt_gpio *vg = to_byt_gpio(chip);
    + unsigned long flags;
    + u32 val;
    +
    + spin_lock_irqsave(&vg->lock, flags);
    + val = readl(reg);
    + spin_unlock_irqrestore(&vg->lock, flags);
    +
    + return val & BYT_LEVEL;
    }

    static void byt_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
    @@ -450,8 +459,10 @@ static void byt_irq_ack(struct irq_data
    unsigned offset = irqd_to_hwirq(d);
    void __iomem *reg;

    + spin_lock(&vg->lock);
    reg = byt_gpio_reg(&vg->chip, offset, BYT_INT_STAT_REG);
    writel(BIT(offset % 32), reg);
    + spin_unlock(&vg->lock);
    }

    static void byt_irq_unmask(struct irq_data *d)



    \
     
     \ /
      Last update: 2015-11-06 21:01    [W:4.152 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site