FAILED: patch "[PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation" failed to apply to 5.3-stable tree

FAILED: patch "[PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation" failed to apply to 5.3-stable tree

[gregkh]

The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 63bdef6cd6941917c823b9cc9aa0219d19fcb716 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 18 Oct 2019 11:08:42 +0200
Subject: [PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation

Commit 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux
GPIO translation") has made the cherryview gpio numbers sparse, to get
a 1:1 mapping between ACPI pin numbers and gpio numbers in Linux.

This has greatly simplified things, but the code setting the
irq_valid_mask was not updated for this, so the valid mask is still in
the old "compressed" numbering with the gaps in the pin numbers skipped,
which is wrong as irq_valid_mask needs to be expressed in gpio numbers.

This results in the following error on devices using pin 24 (0x0018) on
the north GPIO controller as an ACPI event source:

[    0.422452] cherryview-pinctrl INT33FF:01: Failed to translate GPIO to IRQ

This has been reported (by email) to be happening on a Caterpillar CAT T20
tablet and I've reproduced this myself on a Medion Akoya e2215t 2-in-1.

This commit uses the pin number instead of the compressed index into
community->pins to clear the correct bits in irq_valid_mask for GPIOs
using GPEs for interrupts, fixing these errors and in case of the
Medion Akoya e2215t also fixing the LID switch not working.

Cc: stable@vger.kernel.org
Fixes: 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index c6251eac8946..c31266e70559 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1559,7 +1559,7 @@ static void chv_init_irq_valid_mask(struct gpio_chip *chip,
 		intsel >>= CHV_PADCTRL0_INTSEL_SHIFT;
 
 		if (intsel >= community->nirqs)
-			clear_bit(i, valid_mask);
+			clear_bit(desc->number, valid_mask);
 	}
 }
 

Re: FAILED: patch "[PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation" failed to apply to 5.3-stable tree

[Sasha Levin]

On Mon, Nov 11, 2019 at 07:08:03AM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 5.3-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 63bdef6cd6941917c823b9cc9aa0219d19fcb716 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Fri, 18 Oct 2019 11:08:42 +0200
>Subject: [PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation
>
>Commit 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux
>GPIO translation") has made the cherryview gpio numbers sparse, to get
>a 1:1 mapping between ACPI pin numbers and gpio numbers in Linux.
>
>This has greatly simplified things, but the code setting the
>irq_valid_mask was not updated for this, so the valid mask is still in
>the old "compressed" numbering with the gaps in the pin numbers skipped,
>which is wrong as irq_valid_mask needs to be expressed in gpio numbers.
>
>This results in the following error on devices using pin 24 (0x0018) on
>the north GPIO controller as an ACPI event source:
>
>[    0.422452] cherryview-pinctrl INT33FF:01: Failed to translate GPIO to IRQ
>
>This has been reported (by email) to be happening on a Caterpillar CAT T20
>tablet and I've reproduced this myself on a Medion Akoya e2215t 2-in-1.
>
>This commit uses the pin number instead of the compressed index into
>community->pins to clear the correct bits in irq_valid_mask for GPIOs
>using GPEs for interrupts, fixing these errors and in case of the
>Medion Akoya e2215t also fixing the LID switch not working.
>
>Cc: stable@vger.kernel.org
>Fixes: 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation")
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

I've adjust the patch to work around not having 5fbe5b5883f8 ("gpio:
Initialize the irqchip valid_mask with a callback") and queued it for
5.3 and 4.19.

-- 
Thanks,
Sasha

Re: FAILED: patch "[PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation" failed to apply to 5.3-stable tree

[Hans de Goede]

Hi,

On 11-11-2019 14:36, Sasha Levin wrote:
> On Mon, Nov 11, 2019 at 07:08:03AM +0100, gregkh@linuxfoundation.org wrote:
>>
>> The patch below does not apply to the 5.3-stable tree.
>> If someone wants it applied there, or to any other stable or longterm
>> tree, then please email the backport, including the original git commit
>> id to <stable@vger.kernel.org>.
>>
>> thanks,
>>
>> greg k-h
>>
>> ------------------ original commit in Linus's tree ------------------
>>
>> From 63bdef6cd6941917c823b9cc9aa0219d19fcb716 Mon Sep 17 00:00:00 2001
>> From: Hans de Goede <hdegoede@redhat.com>
>> Date: Fri, 18 Oct 2019 11:08:42 +0200
>> Subject: [PATCH] pinctrl: cherryview: Fix irq_valid_mask calculation
>>
>> Commit 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux
>> GPIO translation") has made the cherryview gpio numbers sparse, to get
>> a 1:1 mapping between ACPI pin numbers and gpio numbers in Linux.
>>
>> This has greatly simplified things, but the code setting the
>> irq_valid_mask was not updated for this, so the valid mask is still in
>> the old "compressed" numbering with the gaps in the pin numbers skipped,
>> which is wrong as irq_valid_mask needs to be expressed in gpio numbers.
>>
>> This results in the following error on devices using pin 24 (0x0018) on
>> the north GPIO controller as an ACPI event source:
>>
>> [    0.422452] cherryview-pinctrl INT33FF:01: Failed to translate GPIO to IRQ
>>
>> This has been reported (by email) to be happening on a Caterpillar CAT T20
>> tablet and I've reproduced this myself on a Medion Akoya e2215t 2-in-1.
>>
>> This commit uses the pin number instead of the compressed index into
>> community->pins to clear the correct bits in irq_valid_mask for GPIOs
>> using GPEs for interrupts, fixing these errors and in case of the
>> Medion Akoya e2215t also fixing the LID switch not working.
>>
>> Cc: stable@vger.kernel.org
>> Fixes: 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation")
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> I've adjust the patch to work around not having 5fbe5b5883f8 ("gpio:
> Initialize the irqchip valid_mask with a callback") and queued it for
> 5.3 and 4.19.

Great, thank you!

Regards,

Hans