From 8d3daaedfb8008b44eb154125a7cff0827b20200 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 6 Oct 2017 11:50:10 +0100 Subject: [PATCH] ARM ACPI fix for x-gene RHBZ #1498117 --- arm64-xgene-acpi-fix.patch | 38 ++++++++++++++++++++++++++++++++++++++ kernel.spec | 6 ++++++ 2 files changed, 44 insertions(+) create mode 100644 arm64-xgene-acpi-fix.patch diff --git a/arm64-xgene-acpi-fix.patch b/arm64-xgene-acpi-fix.patch new file mode 100644 index 000000000..e0df833c0 --- /dev/null +++ b/arm64-xgene-acpi-fix.patch @@ -0,0 +1,38 @@ +From bdb9458a3382ba745a66be5526d3899103c76eda Mon Sep 17 00:00:00 2001 +From: Loc Ho +Date: Fri, 21 Jul 2017 11:24:37 -0700 +Subject: ACPI: APEI: Enable APEI multiple GHES source to share a single + external IRQ + +X-Gene platforms describe multiple GHES error sources with the same +hardware error notification type (external interrupt) and interrupt +number. + +Change the GHES interrupt request to support sharing the same IRQ. + +This change includs contributions from Tuan Phan . + +Signed-off-by: Loc Ho +Acked-by: Borislav Petkov +Signed-off-by: Rafael J. Wysocki +--- + drivers/acpi/apei/ghes.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c +index d661d45..eed09fc 100644 +--- a/drivers/acpi/apei/ghes.c ++++ b/drivers/acpi/apei/ghes.c +@@ -1157,7 +1157,8 @@ static int ghes_probe(struct platform_device *ghes_dev) + generic->header.source_id); + goto err_edac_unreg; + } +- rc = request_irq(ghes->irq, ghes_irq_func, 0, "GHES IRQ", ghes); ++ rc = request_irq(ghes->irq, ghes_irq_func, IRQF_SHARED, ++ "GHES IRQ", ghes); + if (rc) { + pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n", + generic->header.source_id); +-- +cgit v1.1 + diff --git a/kernel.spec b/kernel.spec index 1c2546a7f..22e018bdc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -623,6 +623,9 @@ Patch322: bcm2837-move-dt.patch # https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20170912&id=723288836628bc1c0855f3bb7b64b1803e4b9e4a Patch324: arm-of-restrict-dma-configuration.patch +# Upstream ACPI fix +Patch331: arm64-xgene-acpi-fix.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -2250,6 +2253,9 @@ fi # # %changelog +* Fri Oct 6 2017 Peter Robinson +- ARM ACPI fix for x-gene RHBZ #1498117 + * Thu Oct 05 2017 Laura Abbott - 4.13.5-200 - Linux v4.13.5 - Fix for peaq_wmi nul spew (rhbz 1497861)