diff mbox series

Revert "ACPI: resources: Add checks for ACPI IRQ override"

Message ID 20210728151958.15205-1-hui.wang@canonical.com
State Accepted
Commit e0eef3690dc66b3ecc6e0f1267f332403eb22bea
Headers show
Series Revert "ACPI: resources: Add checks for ACPI IRQ override" | expand

Commit Message

Hui Wang July 28, 2021, 3:19 p.m. UTC
The commit 0ec4e55e9f57 ("ACPI: resources: Add checks for ACPI IRQ
override") introduces regression on some platforms, at least it makes
the UART can't get correct irq setting on two different platforms,
and it makes the kernel can't bootup on these two platforms.

This reverts commit 0ec4e55e9f571f08970ed115ec0addc691eda613.

Regression-discuss: https://bugzilla.kernel.org/show_bug.cgi?id=213031
Reported-by: PGNd <pgnet.dev@gmail.com>
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 drivers/acpi/resource.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Rafael J. Wysocki July 28, 2021, 4:38 p.m. UTC | #1
On Wed, Jul 28, 2021 at 6:08 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Jul 28, 2021 at 11:19:58PM +0800, Hui Wang wrote:
> > The commit 0ec4e55e9f57 ("ACPI: resources: Add checks for ACPI IRQ
> > override") introduces regression on some platforms, at least it makes
> > the UART can't get correct irq setting on two different platforms,
> > and it makes the kernel can't bootup on these two platforms.
> >
> > This reverts commit 0ec4e55e9f571f08970ed115ec0addc691eda613.
> >
> > Regression-discuss: https://bugzilla.kernel.org/show_bug.cgi?id=213031
> > Reported-by: PGNd <pgnet.dev@gmail.com>
> > Cc: 5.4+ <stable@vger.kernel.org> # 5.4+
> > Signed-off-by: Hui Wang <hui.wang@canonical.com>
> > ---
> >  drivers/acpi/resource.c | 9 +--------
> >  1 file changed, 1 insertion(+), 8 deletions(-)
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Applied as 5.14-rc material, thanks!
PGNet Dev July 28, 2021, 4:52 p.m. UTC | #2
On 7/28/21 12:38 PM, Rafael J. Wysocki wrote:
> On Wed, Jul 28, 2021 at 6:08 PM Greg KH <gregkh@linuxfoundation.org> wrote:
> Applied as 5.14-rc material, thanks!

ty!

Will this revert be auto-magically backported to earlier stable (5.12x/5.13x) trees?
Or does that require a manual trigger?
Or, is that a distro kernel release issue?
PGNet Dev July 28, 2021, 6:23 p.m. UTC | #3
On 7/28/21 12:54 PM, Rafael J. Wysocki wrote:
>> Will this revert be auto-magically backported to earlier stable (5.12x/5.13x) trees?
> 
> It carries the Cc:stable tag, so it should be picked up automatically.


thx all!
Sasha Levin July 29, 2021, 5:57 p.m. UTC | #4
On Wed, Jul 28, 2021 at 12:52:20PM -0400, PGNet Dev wrote:
>On 7/28/21 12:38 PM, Rafael J. Wysocki wrote:
>>On Wed, Jul 28, 2021 at 6:08 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>>Applied as 5.14-rc material, thanks!
>
>ty!
>
>Will this revert be auto-magically backported to earlier stable (5.12x/5.13x) trees?
>Or does that require a manual trigger?
>Or, is that a distro kernel release issue?

Since it has a cc to stable it should happen automagically.
diff mbox series

Patch

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index dc01fb550b28..ee78a210c606 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -423,13 +423,6 @@  static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
 	}
 }
 
-static bool irq_is_legacy(struct acpi_resource_irq *irq)
-{
-	return irq->triggering == ACPI_EDGE_SENSITIVE &&
-		irq->polarity == ACPI_ACTIVE_HIGH &&
-		irq->shareable == ACPI_EXCLUSIVE;
-}
-
 /**
  * acpi_dev_resource_interrupt - Extract ACPI interrupt resource information.
  * @ares: Input ACPI resource object.
@@ -468,7 +461,7 @@  bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
 		}
 		acpi_dev_get_irqresource(res, irq->interrupts[index],
 					 irq->triggering, irq->polarity,
-					 irq->shareable, irq_is_legacy(irq));
+					 irq->shareable, true);
 		break;
 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
 		ext_irq = &ares->data.extended_irq;