RE: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI" has been added to the 6.1-stable tree

RE: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI" has been added to the 6.1-stable tree

[Limonciello, Mario]

[Public]



> -----Original Message-----
> From: Sasha Levin <sashal@kernel.org>
> Sent: Wednesday, February 1, 2023 10:43
> To: stable-commits@vger.kernel.org; Limonciello, Mario
> <Mario.Limonciello@amd.com>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; Linus Walleij
> <linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>
> Subject: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't
> in _AEI" has been added to the 6.1-stable tree
> 
> This is a note to let you know that I've just added the patch titled
> 
>     gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI
> 
> to the 6.1-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-
> queue.git;a=summary
> 
> The filename of the patch is:
>      gpiolib-acpi-allow-ignoring-wake-capability-on-pins-.patch
> and it can be found in the queue-6.1 subdirectory.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.

Hi Sasha,

I suggest you also pick up two other fixes to go with this one.

1) this fix which was in the same series:

4cb786180dfb ("gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xRU")

2) This fix which is tangentially related (fixes something from the same original
series that exposed the regressions).

d63f11c02b8d ("gpiolib-acpi: Don't set GPIOs for wakeup in S3 mode")

> 
> 
> 
> commit 832a64f6e1557e017da518199dcab0e5fdca2808
> Author: Mario Limonciello <mario.limonciello@amd.com>
> Date:   Mon Jan 16 13:37:01 2023 -0600
> 
>     gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI
> 
>     [ Upstream commit 0e3b175f079247f0d40d2ab695999c309d3a7498 ]
> 
>     Using the `ignore_wake` quirk or module parameter doesn't work for any
> pin
>     that has been specified in the _CRS instead of _AEI.
> 
>     Extend the `acpi_gpio_irq_is_wake` check to cover both places.
> 
>     Suggested-by: Raul Rangel <rrangel@chromium.org>
>     Link: https://gitlab.freedesktop.org/drm/amd/-
> /issues/1722#note_1722335
>     Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>     Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>     Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>     Signed-off-by: Sasha Levin <sashal@kernel.org>
> 
> diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
> index a7d2358736fe..27f234637a15 100644
> --- a/drivers/gpio/gpiolib-acpi.c
> +++ b/drivers/gpio/gpiolib-acpi.c
> @@ -361,7 +361,7 @@ static bool acpi_gpio_in_ignore_list(const char
> *ignore_list, const char *contro
>  }
> 
>  static bool acpi_gpio_irq_is_wake(struct device *parent,
> -				  struct acpi_resource_gpio *agpio)
> +				  const struct acpi_resource_gpio *agpio)
>  {
>  	unsigned int pin = agpio->pin_table[0];
> 
> @@ -754,7 +754,7 @@ static int acpi_populate_gpio_lookup(struct
> acpi_resource *ares, void *data)
>  		lookup->info.pin_config = agpio->pin_config;
>  		lookup->info.debounce = agpio->debounce_timeout;
>  		lookup->info.gpioint = gpioint;
> -		lookup->info.wake_capable = agpio->wake_capable ==
> ACPI_WAKE_CAPABLE;
> +		lookup->info.wake_capable =
> acpi_gpio_irq_is_wake(&lookup->info.adev->dev, agpio);
> 
>  		/*
>  		 * Polarity and triggering are only specified for GpioInt

Re: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI" has been added to the 6.1-stable tree

[Sasha Levin]

On Wed, Feb 01, 2023 at 07:39:29PM +0000, Limonciello, Mario wrote:
>[Public]
>
>
>
>> -----Original Message-----
>> From: Sasha Levin <sashal@kernel.org>
>> Sent: Wednesday, February 1, 2023 10:43
>> To: stable-commits@vger.kernel.org; Limonciello, Mario
>> <Mario.Limonciello@amd.com>
>> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>; Andy Shevchenko
>> <andriy.shevchenko@linux.intel.com>; Linus Walleij
>> <linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>
>> Subject: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't
>> in _AEI" has been added to the 6.1-stable tree
>>
>> This is a note to let you know that I've just added the patch titled
>>
>>     gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI
>>
>> to the 6.1-stable tree which can be found at:
>>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-
>> queue.git;a=summary
>>
>> The filename of the patch is:
>>      gpiolib-acpi-allow-ignoring-wake-capability-on-pins-.patch
>> and it can be found in the queue-6.1 subdirectory.
>>
>> If you, or anyone else, feels it should not be added to the stable tree,
>> please let <stable@vger.kernel.org> know about it.
>
>Hi Sasha,
>
>I suggest you also pick up two other fixes to go with this one.
>
>1) this fix which was in the same series:
>
>4cb786180dfb ("gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xRU")

This commit has a fixes tag which points to a commit we don't have in
the 6.1 tree: 1796f808e4bb ("HID: i2c-hid: acpi: Stop setting
wakeup_capable"), could you confirm?

>2) This fix which is tangentially related (fixes something from the same original
>series that exposed the regressions).
>
>d63f11c02b8d ("gpiolib-acpi: Don't set GPIOs for wakeup in S3 mode")

Same as above.

-- 
Thanks,
Sasha

Re: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI" has been added to the 6.1-stable tree

[Mario Limonciello]

On 2/1/23 21:06, Sasha Levin wrote:
> On Wed, Feb 01, 2023 at 07:39:29PM +0000, Limonciello, Mario wrote:
>> [Public]
>>
>>
>>
>>> -----Original Message-----
>>> From: Sasha Levin <sashal@kernel.org>
>>> Sent: Wednesday, February 1, 2023 10:43
>>> To: stable-commits@vger.kernel.org; Limonciello, Mario
>>> <Mario.Limonciello@amd.com>
>>> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>; Andy Shevchenko
>>> <andriy.shevchenko@linux.intel.com>; Linus Walleij
>>> <linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>
>>> Subject: Patch "gpiolib: acpi: Allow ignoring wake capability on pins 
>>> that aren't
>>> in _AEI" has been added to the 6.1-stable tree
>>>
>>> This is a note to let you know that I've just added the patch titled
>>>
>>>     gpiolib: acpi: Allow ignoring wake capability on pins that aren't 
>>> in _AEI
>>>
>>> to the 6.1-stable tree which can be found at:
>>>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-
>>> queue.git;a=summary
>>>
>>> The filename of the patch is:
>>>      gpiolib-acpi-allow-ignoring-wake-capability-on-pins-.patch
>>> and it can be found in the queue-6.1 subdirectory.
>>>
>>> If you, or anyone else, feels it should not be added to the stable tree,
>>> please let <stable@vger.kernel.org> know about it.
>>
>> Hi Sasha,
>>
>> I suggest you also pick up two other fixes to go with this one.
>>
>> 1) this fix which was in the same series:
>>
>> 4cb786180dfb ("gpiolib: acpi: Add a ignore wakeup quirk for Clevo 
>> NL5xRU")
> 
> This commit has a fixes tag which points to a commit we don't have in
> the 6.1 tree: 1796f808e4bb ("HID: i2c-hid: acpi: Stop setting
> wakeup_capable"), could you confirm?

Yes; technically it's already problematic in 6.1 but the default policy 
doesn't set it for enabled.  If a user manually set it to enabled the 
problem happens.

6.2 it happens automatically because policy changed from that commit.

So I think this one makes sense.

> 
>> 2) This fix which is tangentially related (fixes something from the 
>> same original
>> series that exposed the regressions).
>>
>> d63f11c02b8d ("gpiolib-acpi: Don't set GPIOs for wakeup in S3 mode")
> 
> Same as above.

This has two fixes tags, one of them is in 6.1.  It makes sense to take 
back to 6.1, the reporters first noticed it in 6.1.

Re: Patch "gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI" has been added to the 6.1-stable tree

[Sasha Levin]

On Wed, Feb 01, 2023 at 09:10:01PM -0600, Mario Limonciello wrote:
>On 2/1/23 21:06, Sasha Levin wrote:
>>On Wed, Feb 01, 2023 at 07:39:29PM +0000, Limonciello, Mario wrote:
>>>[Public]
>>>
>>>
>>>
>>>>-----Original Message-----
>>>>From: Sasha Levin <sashal@kernel.org>
>>>>Sent: Wednesday, February 1, 2023 10:43
>>>>To: stable-commits@vger.kernel.org; Limonciello, Mario
>>>><Mario.Limonciello@amd.com>
>>>>Cc: Mika Westerberg <mika.westerberg@linux.intel.com>; Andy Shevchenko
>>>><andriy.shevchenko@linux.intel.com>; Linus Walleij
>>>><linus.walleij@linaro.org>; Bartosz Golaszewski <brgl@bgdev.pl>
>>>>Subject: Patch "gpiolib: acpi: Allow ignoring wake capability on 
>>>>pins that aren't
>>>>in _AEI" has been added to the 6.1-stable tree
>>>>
>>>>This is a note to let you know that I've just added the patch titled
>>>>
>>>>    gpiolib: acpi: Allow ignoring wake capability on pins that 
>>>>aren't in _AEI
>>>>
>>>>to the 6.1-stable tree which can be found at:
>>>>    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-
>>>>queue.git;a=summary
>>>>
>>>>The filename of the patch is:
>>>>     gpiolib-acpi-allow-ignoring-wake-capability-on-pins-.patch
>>>>and it can be found in the queue-6.1 subdirectory.
>>>>
>>>>If you, or anyone else, feels it should not be added to the stable tree,
>>>>please let <stable@vger.kernel.org> know about it.
>>>
>>>Hi Sasha,
>>>
>>>I suggest you also pick up two other fixes to go with this one.
>>>
>>>1) this fix which was in the same series:
>>>
>>>4cb786180dfb ("gpiolib: acpi: Add a ignore wakeup quirk for Clevo 
>>>NL5xRU")
>>
>>This commit has a fixes tag which points to a commit we don't have in
>>the 6.1 tree: 1796f808e4bb ("HID: i2c-hid: acpi: Stop setting
>>wakeup_capable"), could you confirm?
>
>Yes; technically it's already problematic in 6.1 but the default 
>policy doesn't set it for enabled.  If a user manually set it to 
>enabled the problem happens.
>
>6.2 it happens automatically because policy changed from that commit.
>
>So I think this one makes sense.
>
>>
>>>2) This fix which is tangentially related (fixes something from 
>>>the same original
>>>series that exposed the regressions).
>>>
>>>d63f11c02b8d ("gpiolib-acpi: Don't set GPIOs for wakeup in S3 mode")
>>
>>Same as above.
>
>This has two fixes tags, one of them is in 6.1.  It makes sense to 
>take back to 6.1, the reporters first noticed it in 6.1.
>

Queued both, thanks!

-- 
Thanks,
Sasha