Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1547025084-16999-1-git-send-email-rogerq@ti.com>
In-Reply-To: <1547025084-16999-1-git-send-email-rogerq@ti.com>
From:   Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date:   Thu, 10 Jan 2019 10:17:33 +0100
Message-ID: <CAMpxmJUx+LGUDoQQrAp6inWohFzM4W1E2gwWdQ2=O_wHAt164A@mail.gmail.com>
Subject: Re: [PATCH] gpio: pcf857x: Fix interrupts on multiple instances
To:     Roger Quadros <rogerq@ti.com>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        linux-gpio <linux-gpio@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        "Stable # 4 . 20+" <stable@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

=C5=9Br., 9 sty 2019 o 10:11 Roger Quadros <rogerq@ti.com> napisa=C5=82(a):
>
> When multiple instances of pcf857x chips are present, a fix up
> message [1] is printed during the probe of the 2nd and later
> instances.
>
> The issue is that the driver is using the same irq_chip data
> structure between multiple instances.
>
> Fix this by allocating the irq_chip data structure per instance.
>
> [1] fix up message addressed by this patch
> [    1.212100] gpio gpiochip9: (pcf8575): detected irqchip that is shared=
 with multiple gpiochips: please fix the driver.
>
> Cc: Stable <stable@vger.kernel.org> # 4.20+
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  drivers/gpio/gpio-pcf857x.c | 26 ++++++++++++--------------
>  1 file changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
> index adf72dd..68a35b6 100644
> --- a/drivers/gpio/gpio-pcf857x.c
> +++ b/drivers/gpio/gpio-pcf857x.c
> @@ -84,6 +84,7 @@ MODULE_DEVICE_TABLE(of, pcf857x_of_table);
>   */
>  struct pcf857x {
>         struct gpio_chip        chip;
> +       struct irq_chip         irqchip;
>         struct i2c_client       *client;
>         struct mutex            lock;           /* protect 'out' */
>         unsigned                out;            /* software latch */
> @@ -252,18 +253,6 @@ static void pcf857x_irq_bus_sync_unlock(struct irq_d=
ata *data)
>         mutex_unlock(&gpio->lock);
>  }
>
> -static struct irq_chip pcf857x_irq_chip =3D {
> -       .name           =3D "pcf857x",
> -       .irq_enable     =3D pcf857x_irq_enable,
> -       .irq_disable    =3D pcf857x_irq_disable,
> -       .irq_ack        =3D noop,
> -       .irq_mask       =3D noop,
> -       .irq_unmask     =3D noop,
> -       .irq_set_wake   =3D pcf857x_irq_set_wake,
> -       .irq_bus_lock           =3D pcf857x_irq_bus_lock,
> -       .irq_bus_sync_unlock    =3D pcf857x_irq_bus_sync_unlock,
> -};
> -
>  /*----------------------------------------------------------------------=
---*/
>
>  static int pcf857x_probe(struct i2c_client *client,
> @@ -376,8 +365,17 @@ static int pcf857x_probe(struct i2c_client *client,
>
>         /* Enable irqchip if we have an interrupt */
>         if (client->irq) {
> +               gpio->irqchip.name =3D "pcf857x",
> +               gpio->irqchip.irq_enable =3D pcf857x_irq_enable,
> +               gpio->irqchip.irq_disable =3D pcf857x_irq_disable,
> +               gpio->irqchip.irq_ack =3D noop,
> +               gpio->irqchip.irq_mask =3D noop,
> +               gpio->irqchip.irq_unmask =3D noop,
> +               gpio->irqchip.irq_set_wake =3D pcf857x_irq_set_wake,
> +               gpio->irqchip.irq_bus_lock =3D pcf857x_irq_bus_lock,
> +               gpio->irqchip.irq_bus_sync_unlock =3D pcf857x_irq_bus_syn=
c_unlock,
>                 status =3D gpiochip_irqchip_add_nested(&gpio->chip,
> -                                                    &pcf857x_irq_chip,
> +                                                    &gpio->irqchip,
>                                                      0, handle_level_irq,
>                                                      IRQ_TYPE_NONE);
>                 if (status) {
> @@ -392,7 +390,7 @@ static int pcf857x_probe(struct i2c_client *client,
>                 if (status)
>                         goto fail;
>
> -               gpiochip_set_nested_irqchip(&gpio->chip, &pcf857x_irq_chi=
p,
> +               gpiochip_set_nested_irqchip(&gpio->chip, &gpio->irqchip,
>                                             client->irq);
>                 gpio->irq_parent =3D client->irq;
>         }
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>

Applied to fixes. Thanks!

Bart