1 |
|
From e0eef3690dc66b3ecc6e0f1267f332403eb22bea Mon Sep 17 00:00:00 2001 |
|
This patch reverts: |
|
|
*** |
|
|
From 509c3a6682055a672a6d5129bf0225d1eb3c026c Mon Sep 17 00:00:00 2001 |
|
|
From: Sasha Levin <sashal@kernel.org> |
|
|
Date: Wed, 9 Jun 2021 10:14:42 +0800 |
|
|
Subject: ACPI: resources: Add checks for ACPI IRQ override |
|
|
|
|
2 |
From: Hui Wang <hui.wang@canonical.com> |
From: Hui Wang <hui.wang@canonical.com> |
3 |
|
Date: Wed, 28 Jul 2021 23:19:58 +0800 |
4 |
|
Subject: Revert "ACPI: resources: Add checks for ACPI IRQ override" |
5 |
|
|
6 |
[ Upstream commit 0ec4e55e9f571f08970ed115ec0addc691eda613 ] |
From: Hui Wang <hui.wang@canonical.com> |
|
*** |
|
7 |
|
|
8 |
as it's reported on LKML and stable@ to cause some systems to boot slowly and |
commit e0eef3690dc66b3ecc6e0f1267f332403eb22bea upstream. |
|
others not at all. |
|
9 |
|
|
10 |
Signed-off-by: Thomas Backlund <tmb@mageia.org> |
The commit 0ec4e55e9f57 ("ACPI: resources: Add checks for ACPI IRQ |
11 |
|
override") introduces regression on some platforms, at least it makes |
12 |
|
the UART can't get correct irq setting on two different platforms, |
13 |
|
and it makes the kernel can't bootup on these two platforms. |
14 |
|
|
15 |
|
This reverts commit 0ec4e55e9f571f08970ed115ec0addc691eda613. |
16 |
|
|
17 |
|
Regression-discuss: https://bugzilla.kernel.org/show_bug.cgi?id=213031 |
18 |
|
Reported-by: PGNd <pgnet.dev@gmail.com> |
19 |
|
Cc: 5.4+ <stable@vger.kernel.org> # 5.4+ |
20 |
|
Signed-off-by: Hui Wang <hui.wang@canonical.com> |
21 |
|
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
22 |
|
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
23 |
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
24 |
--- |
--- |
25 |
drivers/acpi/resource.c | 9 +-------- |
drivers/acpi/resource.c | 9 +-------- |
26 |
1 file changed, 1 insertion(+), 8 deletions(-) |
1 file changed, 1 insertion(+), 8 deletions(-) |
27 |
|
|
|
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c |
|
28 |
--- a/drivers/acpi/resource.c |
--- a/drivers/acpi/resource.c |
29 |
+++ b/drivers/acpi/resource.c |
+++ b/drivers/acpi/resource.c |
30 |
@@ -423,13 +423,6 @@ static void acpi_dev_get_irqresource(str |
@@ -430,13 +430,6 @@ static void acpi_dev_get_irqresource(str |
31 |
} |
} |
32 |
} |
} |
33 |
|
|
41 |
/** |
/** |
42 |
* acpi_dev_resource_interrupt - Extract ACPI interrupt resource information. |
* acpi_dev_resource_interrupt - Extract ACPI interrupt resource information. |
43 |
* @ares: Input ACPI resource object. |
* @ares: Input ACPI resource object. |
44 |
@@ -468,7 +461,7 @@ bool acpi_dev_resource_interrupt(struct |
@@ -475,7 +468,7 @@ bool acpi_dev_resource_interrupt(struct |
45 |
} |
} |
46 |
acpi_dev_get_irqresource(res, irq->interrupts[index], |
acpi_dev_get_irqresource(res, irq->interrupts[index], |
47 |
irq->triggering, irq->polarity, |
irq->triggering, irq->polarity, |