]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Dec 2017 07:48:26 +0000 (08:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Dec 2017 07:48:26 +0000 (08:48 +0100)
added patches:
serial-8250_pci-add-amazon-pci-serial-device-id.patch
uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch
usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch

queue-4.4/serial-8250_pci-add-amazon-pci-serial-device-id.patch [new file with mode: 0644]
queue-4.4/series
queue-4.4/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch [new file with mode: 0644]
queue-4.4/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch [new file with mode: 0644]

diff --git a/queue-4.4/serial-8250_pci-add-amazon-pci-serial-device-id.patch b/queue-4.4/serial-8250_pci-add-amazon-pci-serial-device-id.patch
new file mode 100644 (file)
index 0000000..8bbc7b0
--- /dev/null
@@ -0,0 +1,34 @@
+From 3bfd1300abfe3adb18e84a89d97a0e82a22124bb Mon Sep 17 00:00:00 2001
+From: Matt Wilson <msw@amazon.com>
+Date: Mon, 13 Nov 2017 11:31:31 -0800
+Subject: serial: 8250_pci: Add Amazon PCI serial device ID
+
+From: Matt Wilson <msw@amazon.com>
+
+commit 3bfd1300abfe3adb18e84a89d97a0e82a22124bb upstream.
+
+This device will be used in future Amazon EC2 instances as the primary
+serial port (i.e., data sent to this port will be available via the
+GetConsoleOuput [1] EC2 API).
+
+[1] http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetConsoleOutput.html
+
+Signed-off-by: Matt Wilson <msw@amazon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/8250/8250_pci.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/tty/serial/8250/8250_pci.c
++++ b/drivers/tty/serial/8250/8250_pci.c
+@@ -5797,6 +5797,9 @@ static struct pci_device_id serial_pci_t
+       { PCI_DEVICE(0x1601, 0x0800), .driver_data = pbn_b0_4_1250000 },
+       { PCI_DEVICE(0x1601, 0xa801), .driver_data = pbn_b0_4_1250000 },
++      /* Amazon PCI serial device */
++      { PCI_DEVICE(0x1d0f, 0x8250), .driver_data = pbn_b0_1_115200 },
++
+       /*
+        * These entries match devices with class COMMUNICATION_SERIAL,
+        * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
index 0c803db1b53950597896a2874196bcf386662cf3..d8c417e6ab4a51ae25635d781d775bb8068eadcb 100644 (file)
@@ -1,2 +1,5 @@
 bcache-only-permit-to-recovery-read-error-when-cache-device-is-clean.patch
 bcache-recover-data-from-backing-when-data-is-clean.patch
+uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch
+usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch
+serial-8250_pci-add-amazon-pci-serial-device-id.patch
diff --git a/queue-4.4/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch b/queue-4.4/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch
new file mode 100644 (file)
index 0000000..df08ff7
--- /dev/null
@@ -0,0 +1,33 @@
+From 7fee72d5e8f1e7b8d8212e28291b1a0243ecf2f1 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 14 Nov 2017 19:27:22 +0100
+Subject: uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 7fee72d5e8f1e7b8d8212e28291b1a0243ecf2f1 upstream.
+
+We've been adding this as a quirk on a per device basis hoping that
+newer disk enclosures would do better, but that has not happened,
+so simply apply this quirk to all Seagate devices.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/storage/uas-detect.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/storage/uas-detect.h
++++ b/drivers/usb/storage/uas-detect.h
+@@ -111,6 +111,10 @@ static int uas_use_uas_driver(struct usb
+               }
+       }
++      /* All Seagate disk enclosures have broken ATA pass-through support */
++      if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bc2)
++              flags |= US_FL_NO_ATA_1X;
++
+       usb_stor_adjust_quirks(udev, &flags);
+       if (flags & US_FL_IGNORE_UAS) {
diff --git a/queue-4.4/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch b/queue-4.4/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch
new file mode 100644 (file)
index 0000000..25ecf4d
--- /dev/null
@@ -0,0 +1,34 @@
+From e43a12f1793ae1fe006e26fe9327a8840a92233c Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng <kai.heng.feng@canonical.com>
+Date: Tue, 14 Nov 2017 01:31:15 -0500
+Subject: usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
+
+From: Kai-Heng Feng <kai.heng.feng@canonical.com>
+
+commit e43a12f1793ae1fe006e26fe9327a8840a92233c upstream.
+
+KY-688 USB 3.1 Type-C Hub internally uses a Genesys Logic hub to connect
+to Realtek r8153.
+
+Similar to commit ("7496cfe5431f2 usb: quirks: Add no-lpm quirk for Moshi
+USB to Ethernet Adapter"), no-lpm can make r8153 ethernet work.
+
+Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/core/quirks.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -151,6 +151,9 @@ static const struct usb_device_id usb_qu
+       /* appletouch */
+       { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
++      /* Genesys Logic hub, internally used by KY-688 USB 3.1 Type-C Hub */
++      { USB_DEVICE(0x05e3, 0x0612), .driver_info = USB_QUIRK_NO_LPM },
++
+       /* Genesys Logic hub, internally used by Moshi USB to Ethernet Adapter */
+       { USB_DEVICE(0x05e3, 0x0616), .driver_info = USB_QUIRK_NO_LPM },