4.14-stable patches

added patches:
	x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index c6c679eeafaeadf4d49074acff40d8ea62f8be55..78807e24790aa5506d0ec723e67862dabf945588 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -28,3 +28,4 @@ alsa-pcm-allow-aborting-mutex-lock-at-oss-read-write-loops.patch
 alsa-aloop-release-cable-upon-open-error-path.patch
 alsa-aloop-fix-inconsistent-format-due-to-incomplete-rule.patch
 alsa-aloop-fix-racy-hw-constraints-adjustment.patch
+x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch

diff --git a/queue-4.14/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch b/queue-4.14/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch
new file mode 100644 (file)
index 0000000..db2e925
--- /dev/null
+++ b/queue-4.14/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch
@@ -0,0 +1,83 @@
+From 4ee2ec1b122599f7b10c849fa7915cebb37b7edb Mon Sep 17 00:00:00 2001
+From: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
+Date: Thu, 16 Nov 2017 21:43:45 +0530
+Subject: x86/acpi: Reduce code duplication in mp_override_legacy_irq()
+
+From: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
+
+commit 4ee2ec1b122599f7b10c849fa7915cebb37b7edb upstream.
+
+The new function mp_register_ioapic_irq() is a subset of the code in
+mp_override_legacy_irq().
+
+Replace the code duplication by invoking mp_register_ioapic_irq() from
+mp_override_legacy_irq().
+
+Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
+Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: linux-pm@vger.kernel.org
+Cc: kkamagui@gmail.com
+Cc: linux-acpi@vger.kernel.org
+Link: https://lkml.kernel.org/r/1510848825-21965-3-git-send-email-vikas.cha.sajjan@hpe.com
+Cc: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/acpi/boot.c |   27 +++++----------------------
+ 1 file changed, 5 insertions(+), 22 deletions(-)
+
+--- a/arch/x86/kernel/acpi/boot.c
++++ b/arch/x86/kernel/acpi/boot.c
+@@ -342,13 +342,12 @@ acpi_parse_lapic_nmi(struct acpi_subtabl
+ #ifdef CONFIG_X86_IO_APIC
+ #define MP_ISA_BUS            0
+ 
++static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity,
++                                              u8 trigger, u32 gsi);
++
+ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
+                                         u32 gsi)
+ {
+-      int ioapic;
+-      int pin;
+-      struct mpc_intsrc mp_irq;
+-
+       /*
+        * Check bus_irq boundary.
+        */
+@@ -358,14 +357,6 @@ static void __init mp_override_legacy_ir
+       }
+ 
+       /*
+-       * Convert 'gsi' to 'ioapic.pin'.
+-       */
+-      ioapic = mp_find_ioapic(gsi);
+-      if (ioapic < 0)
+-              return;
+-      pin = mp_find_ioapic_pin(ioapic, gsi);
+-
+-      /*
+        * TBD: This check is for faulty timer entries, where the override
+        *      erroneously sets the trigger to level, resulting in a HUGE
+        *      increase of timer interrupts!
+@@ -373,16 +364,8 @@ static void __init mp_override_legacy_ir
+       if ((bus_irq == 0) && (trigger == 3))
+               trigger = 1;
+ 
+-      mp_irq.type = MP_INTSRC;
+-      mp_irq.irqtype = mp_INT;
+-      mp_irq.irqflag = (trigger << 2) | polarity;
+-      mp_irq.srcbus = MP_ISA_BUS;
+-      mp_irq.srcbusirq = bus_irq;     /* IRQ */
+-      mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */
+-      mp_irq.dstirq = pin;    /* INTIN# */
+-
+-      mp_save_irq(&mp_irq);
+-
++      if (mp_register_ioapic_irq(bus_irq, polarity, trigger, gsi) < 0)
++              return;
+       /*
+        * Reset default identity mapping if gsi is also an legacy IRQ,
+        * otherwise there will be more than one entry with the same GSI