]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.0-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Mar 2019 22:13:51 +0000 (15:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Mar 2019 22:13:51 +0000 (15:13 -0700)
added patches:
input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch
input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
iscsi_ibft-fix-missing-break-in-switch-statement.patch
scsi-aacraid-fix-missing-break-in-switch-statement.patch
x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch

queue-5.0/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch [new file with mode: 0644]
queue-5.0/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch [new file with mode: 0644]
queue-5.0/iscsi_ibft-fix-missing-break-in-switch-statement.patch [new file with mode: 0644]
queue-5.0/scsi-aacraid-fix-missing-break-in-switch-statement.patch [new file with mode: 0644]
queue-5.0/series
queue-5.0/x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch [new file with mode: 0644]

diff --git a/queue-5.0/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch b/queue-5.0/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch
new file mode 100644 (file)
index 0000000..b120b27
--- /dev/null
@@ -0,0 +1,30 @@
+From e154ab69321ce2c54f19863d75c77b4e2dc9d365 Mon Sep 17 00:00:00 2001
+From: Vincent Batts <vbatts@hashbangbash.com>
+Date: Sat, 9 Mar 2019 15:48:04 -0800
+Subject: Input: elan_i2c - add id for touchpad found in Lenovo s21e-20
+
+From: Vincent Batts <vbatts@hashbangbash.com>
+
+commit e154ab69321ce2c54f19863d75c77b4e2dc9d365 upstream.
+
+Lenovo s21e-20 uses ELAN0601 in its ACPI tables for the Elan touchpad.
+
+Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/elan_i2c_core.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/input/mouse/elan_i2c_core.c
++++ b/drivers/input/mouse/elan_i2c_core.c
+@@ -1337,6 +1337,7 @@ static const struct acpi_device_id elan_
+       { "ELAN0000", 0 },
+       { "ELAN0100", 0 },
+       { "ELAN0600", 0 },
++      { "ELAN0601", 0 },
+       { "ELAN0602", 0 },
+       { "ELAN0605", 0 },
+       { "ELAN0608", 0 },
diff --git a/queue-5.0/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch b/queue-5.0/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
new file mode 100644 (file)
index 0000000..9c9f8fa
--- /dev/null
@@ -0,0 +1,43 @@
+From 44fc95e218a09d7966a9d448941fdb003f6bb69f Mon Sep 17 00:00:00 2001
+From: Jason Gerecke <jason.gerecke@wacom.com>
+Date: Sat, 9 Mar 2019 15:32:13 -0800
+Subject: Input: wacom_serial4 - add support for Wacom ArtPad II tablet
+
+From: Jason Gerecke <jason.gerecke@wacom.com>
+
+commit 44fc95e218a09d7966a9d448941fdb003f6bb69f upstream.
+
+Tablet initially begins communicating at 9600 baud, so this command
+should be used to connect to the device:
+
+    $ inputattach --daemon --baud 9600 --wacom_iv /dev/ttyS0
+
+https://github.com/linuxwacom/xf86-input-wacom/issues/40
+
+Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/tablet/wacom_serial4.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/input/tablet/wacom_serial4.c
++++ b/drivers/input/tablet/wacom_serial4.c
+@@ -187,6 +187,7 @@ enum {
+       MODEL_DIGITIZER_II      = 0x5544, /* UD */
+       MODEL_GRAPHIRE          = 0x4554, /* ET */
+       MODEL_PENPARTNER        = 0x4354, /* CT */
++      MODEL_ARTPAD_II         = 0x4B54, /* KT */
+ };
+ static void wacom_handle_model_response(struct wacom *wacom)
+@@ -245,6 +246,7 @@ static void wacom_handle_model_response(
+               wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL;
+               break;
++      case MODEL_ARTPAD_II:
+       case MODEL_DIGITIZER_II:
+               wacom->dev->name = "Wacom Digitizer II";
+               wacom->dev->id.version = MODEL_DIGITIZER_II;
diff --git a/queue-5.0/iscsi_ibft-fix-missing-break-in-switch-statement.patch b/queue-5.0/iscsi_ibft-fix-missing-break-in-switch-statement.patch
new file mode 100644 (file)
index 0000000..e58ae8f
--- /dev/null
@@ -0,0 +1,35 @@
+From df997abeebadaa4824271009e2d2b526a70a11cb Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 11 Feb 2019 12:43:23 -0600
+Subject: iscsi_ibft: Fix missing break in switch statement
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit df997abeebadaa4824271009e2d2b526a70a11cb upstream.
+
+Add missing break statement in order to prevent the code from falling
+through to case ISCSI_BOOT_TGT_NAME, which is unnecessary.
+
+This bug was found thanks to the ongoing efforts to enable
+-Wimplicit-fallthrough.
+
+Fixes: b33a84a38477 ("ibft: convert iscsi_ibft module to iscsi boot lib")
+Cc: stable@vger.kernel.org
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/firmware/iscsi_ibft.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/firmware/iscsi_ibft.c
++++ b/drivers/firmware/iscsi_ibft.c
+@@ -542,6 +542,7 @@ static umode_t __init ibft_check_tgt_for
+       case ISCSI_BOOT_TGT_NIC_ASSOC:
+       case ISCSI_BOOT_TGT_CHAP_TYPE:
+               rc = S_IRUGO;
++              break;
+       case ISCSI_BOOT_TGT_NAME:
+               if (tgt->tgt_name_len)
+                       rc = S_IRUGO;
diff --git a/queue-5.0/scsi-aacraid-fix-missing-break-in-switch-statement.patch b/queue-5.0/scsi-aacraid-fix-missing-break-in-switch-statement.patch
new file mode 100644 (file)
index 0000000..a30332a
--- /dev/null
@@ -0,0 +1,38 @@
+From 5e420fe635813e5746b296cfc8fff4853ae205a2 Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Fri, 15 Feb 2019 15:42:42 -0600
+Subject: scsi: aacraid: Fix missing break in switch statement
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit 5e420fe635813e5746b296cfc8fff4853ae205a2 upstream.
+
+Add missing break statement and fix identation issue.
+
+This bug was found thanks to the ongoing efforts to enable
+-Wimplicit-fallthrough.
+
+Fixes: 9cb62fa24e0d ("aacraid: Log firmware AIF messages")
+Cc: stable@vger.kernel.org
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/aacraid/commsup.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/scsi/aacraid/commsup.c
++++ b/drivers/scsi/aacraid/commsup.c
+@@ -1303,8 +1303,9 @@ static void aac_handle_aif(struct aac_de
+                                 ADD : DELETE;
+                               break;
+                       }
+-                      case AifBuManagerEvent:
+-                              aac_handle_aif_bu(dev, aifcmd);
++                      break;
++              case AifBuManagerEvent:
++                      aac_handle_aif_bu(dev, aifcmd);
+                       break;
+               }
index db14c65e4a792012999f8f19d9ac1e8fc7ed3e98..96a3736714826bee43b56e453f5da6b3bcd64539 100644 (file)
@@ -1 +1,6 @@
 media-uvcvideo-fix-type-check-leading-to-overflow.patch
+input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
+input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch
+iscsi_ibft-fix-missing-break-in-switch-statement.patch
+scsi-aacraid-fix-missing-break-in-switch-statement.patch
+x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch
diff --git a/queue-5.0/x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch b/queue-5.0/x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch
new file mode 100644 (file)
index 0000000..b41941e
--- /dev/null
@@ -0,0 +1,88 @@
+From 2e095ce7b6ecce2f3e2ff330527f12056ed1e1a1 Mon Sep 17 00:00:00 2001
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Date: Thu, 7 Feb 2019 15:30:05 +0200
+Subject: x86/PCI: Fixup RTIT_BAR of Intel Denverton Trace Hub
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+
+commit 2e095ce7b6ecce2f3e2ff330527f12056ed1e1a1 upstream.
+
+On Denverton's integration of the Intel(R) Trace Hub (for a reference and
+overview see Documentation/trace/intel_th.rst) the reported size of one of
+its resources (RTIT_BAR) doesn't match its actual size, which leads to
+overlaps with other devices' resources.
+
+In practice, it overlaps with XHCI MMIO space, which results in the xhci
+driver bailing out after seeing its registers as 0xffffffff, and perceived
+disappearance of all USB devices:
+
+  intel_th_pci 0000:00:1f.7: enabling device (0004 -> 0006)
+  xhci_hcd 0000:00:15.0: xHCI host controller not responding, assume dead
+  xhci_hcd 0000:00:15.0: xHC not responding in xhci_irq, assume controller is dead
+  xhci_hcd 0000:00:15.0: HC died; cleaning up
+  usb 1-1: USB disconnect, device number 2
+
+For this reason, we need to resize the RTIT_BAR on Denverton to its actual
+size, which in this case is 4MB.  The corresponding erratum is DNV36 at the
+link below:
+
+  DNV36.       Processor Host Root Complex May Incorrectly Route Memory
+               Accesses to Intel® Trace Hub
+
+  Problem:     The Intel® Trace Hub RTIT_BAR (B0:D31:F7 offset 20h) is
+              reported as a 2KB memory range.  Due to this erratum, the
+              processor Host Root Complex will forward addresses from
+              RTIT_BAR to RTIT_BAR + 4MB -1 to Intel® Trace Hub.
+
+  Implication: Devices assigned within the RTIT_BAR to RTIT_BAR + 4MB -1
+               space may not function correctly.
+
+  Workaround:  A BIOS code change has been identified and may be
+               implemented as a workaround for this erratum.
+
+  Status:      No Fix.
+
+Note that 5118ccd34780 ("intel_th: pci: Add Denverton SOC support") updates
+the Trace Hub driver so it claims the Denverton device, but the resource
+overlap exists regardless of whether that driver is loaded or that commit
+is included.
+
+Link: https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/atom-c3000-family-spec-update.pdf
+Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+[bhelgaas: include erratum text, clarify relationship with 5118ccd34780]
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/pci/fixup.c |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/arch/x86/pci/fixup.c
++++ b/arch/x86/pci/fixup.c
+@@ -635,6 +635,22 @@ static void quirk_no_aersid(struct pci_d
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
+                             PCI_CLASS_BRIDGE_PCI, 8, quirk_no_aersid);
++static void quirk_intel_th_dnv(struct pci_dev *dev)
++{
++      struct resource *r = &dev->resource[4];
++
++      /*
++       * Denverton reports 2k of RTIT_BAR (intel_th resource 4), which
++       * appears to be 4 MB in reality.
++       */
++      if (r->end == r->start + 0x7ff) {
++              r->start = 0;
++              r->end   = 0x3fffff;
++              r->flags |= IORESOURCE_UNSET;
++      }
++}
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x19e1, quirk_intel_th_dnv);
++
+ #ifdef CONFIG_PHYS_ADDR_T_64BIT
+ #define AMD_141b_MMIO_BASE(x) (0x80 + (x) * 0x8)