On Mon, Mar 4, 2019 at 4:09 PM Maxim Mikityanskiy <maxtra...@gmail.com> wrote:
>
> On Tue, Feb 5, 2019 at 8:20 PM Andy Shevchenko
> <andy.shevche...@gmail.com> wrote:
> >
> > On Sun, Feb 3, 2019 at 11:42 AM Hans de Goede <hdego...@redhat.com> wrote:
> > >
> > > Commit c3b8e884defa ("platform/x86: intel_int0002_vgpio: Implement
> > > irq_set_wake"), was written to fix some wakeup issues on Bay Trail (BYT)
> > > devices.
> > >
> > > We've received a bug report that this causes a suspend regression on some
> > > Cherry Trail (CHT) based devices.
> > >
> > > To fix the issues this causes on CHT devices, this commit modifies the
> > > irq_set_wake support so that we only implement irq_set_wake on BYT
> > > devices,
> > >
> >
> > Pushed to my review and testing queue, thanks!
>
> Kernel 5.0 was released without this patch, is it still planned to merge it?
It will be in 5.1-rc1 and then we may send it to stable trees.
>
> > > Fixes: c3b8e884defa ("platform/x86: intel_int0002_vgpio: ...
> > > irq_set_wake")
> > > Reported-and-tested-by: Maxim Mikityanskiy <maxtra...@gmail.com>
> > > Signed-off-by: Hans de Goede <hdego...@redhat.com>
> > > ---
> > > drivers/platform/x86/intel_int0002_vgpio.c | 32 ++++++++++++++++++----
> > > 1 file changed, 26 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/drivers/platform/x86/intel_int0002_vgpio.c
> > > b/drivers/platform/x86/intel_int0002_vgpio.c
> > > index 4b8f7305fc8a..78787934b572 100644
> > > --- a/drivers/platform/x86/intel_int0002_vgpio.c
> > > +++ b/drivers/platform/x86/intel_int0002_vgpio.c
> > > @@ -51,11 +51,14 @@
> > > #define GPE0A_STS_PORT 0x420
> > > #define GPE0A_EN_PORT 0x428
> > >
> > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
> > > +#define BAYTRAIL 0x01
> > > +#define CHERRYTRAIL 0x02
> > > +
> > > +#define ICPU(model, data) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY,
> > > data}
> > >
> > > static const struct x86_cpu_id int0002_cpu_ids[] = {
> > > - ICPU(INTEL_FAM6_ATOM_SILVERMONT), /* Valleyview, Bay Trail
> > > */
> > > - ICPU(INTEL_FAM6_ATOM_AIRMONT), /* Braswell, Cherry Trail
> > > */
> > > + ICPU(INTEL_FAM6_ATOM_SILVERMONT, BAYTRAIL), /* Valleyview, Bay
> > > Trail */
> > > + ICPU(INTEL_FAM6_ATOM_AIRMONT, CHERRYTRAIL), /* Braswell, Cherry
> > > Trail */
> > > {}
> > > };
> > >
> > > @@ -135,7 +138,7 @@ static irqreturn_t int0002_irq(int irq, void *data)
> > > return IRQ_HANDLED;
> > > }
> > >
> > > -static struct irq_chip int0002_irqchip = {
> > > +static struct irq_chip int0002_byt_irqchip = {
> > > .name = DRV_NAME,
> > > .irq_ack = int0002_irq_ack,
> > > .irq_mask = int0002_irq_mask,
> > > @@ -143,10 +146,22 @@ static struct irq_chip int0002_irqchip = {
> > > .irq_set_wake = int0002_irq_set_wake,
> > > };
> > >
> > > +static struct irq_chip int0002_cht_irqchip = {
> > > + .name = DRV_NAME,
> > > + .irq_ack = int0002_irq_ack,
> > > + .irq_mask = int0002_irq_mask,
> > > + .irq_unmask = int0002_irq_unmask,
> > > + /*
> > > + * No set_wake, on CHT the IRQ is typically shared with the ACPI
> > > SCI
> > > + * and we don't want to mess with the ACPI SCI irq settings.
> > > + */
> > > +};
> > > +
> > > static int int0002_probe(struct platform_device *pdev)
> > > {
> > > struct device *dev = &pdev->dev;
> > > const struct x86_cpu_id *cpu_id;
> > > + struct irq_chip *irq_chip;
> > > struct gpio_chip *chip;
> > > int irq, ret;
> > >
> > > @@ -195,14 +210,19 @@ static int int0002_probe(struct platform_device
> > > *pdev)
> > > return ret;
> > > }
> > >
> > > - ret = gpiochip_irqchip_add(chip, &int0002_irqchip, 0,
> > > handle_edge_irq,
> > > + if (cpu_id->driver_data == BAYTRAIL)
> > > + irq_chip = &int0002_byt_irqchip;
> > > + else
> > > + irq_chip = &int0002_cht_irqchip;
> > > +
> > > + ret = gpiochip_irqchip_add(chip, irq_chip, 0, handle_edge_irq,
> > > IRQ_TYPE_NONE);
> > > if (ret) {
> > > dev_err(dev, "Error adding irqchip: %d\n", ret);
> > > return ret;
> > > }
> > >
> > > - gpiochip_set_chained_irqchip(chip, &int0002_irqchip, irq, NULL);
> > > + gpiochip_set_chained_irqchip(chip, irq_chip, irq, NULL);
> > >
> > > return 0;
> > > }
> > > --
> > > 2.20.1
> > >
> >
> >
> > --
> > With Best Regards,
> > Andy Shevchenko
--
With Best Regards,
Andy Shevchenko
