From ce796ae3083365b8d12c1dafd59a94bbf6fd9087 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Dec 2017 08:48:45 +0100 Subject: [PATCH] 4.9-stable patches 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 --- ..._pci-add-amazon-pci-serial-device-id.patch | 34 +++++++++++++++++++ queue-4.9/series | 3 ++ ...l_no_ata_1x-quirk-to-seagate-devices.patch | 33 ++++++++++++++++++ ...-quirk-for-ky-688-usb-3.1-type-c-hub.patch | 34 +++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 queue-4.9/serial-8250_pci-add-amazon-pci-serial-device-id.patch create mode 100644 queue-4.9/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch create mode 100644 queue-4.9/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch diff --git a/queue-4.9/serial-8250_pci-add-amazon-pci-serial-device-id.patch b/queue-4.9/serial-8250_pci-add-amazon-pci-serial-device-id.patch new file mode 100644 index 00000000000..eebfd720e11 --- /dev/null +++ b/queue-4.9/serial-8250_pci-add-amazon-pci-serial-device-id.patch @@ -0,0 +1,34 @@ +From 3bfd1300abfe3adb18e84a89d97a0e82a22124bb Mon Sep 17 00:00:00 2001 +From: Matt Wilson +Date: Mon, 13 Nov 2017 11:31:31 -0800 +Subject: serial: 8250_pci: Add Amazon PCI serial device ID + +From: Matt Wilson + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -5568,6 +5568,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 diff --git a/queue-4.9/series b/queue-4.9/series index 9ea31bc99ba..a8cbe7036c6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,3 +4,6 @@ drm-fsl-dcu-avoid-disabling-pixel-clock-twice-on-suspend.patch drm-fsl-dcu-enable-irq-before-drm_atomic_helper_resume.patch revert-crypto-caam-get-rid-of-tasklet.patch mm-oom_reaper-gather-each-vma-to-prevent-leaking-tlb-entry.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.9/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch b/queue-4.9/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch new file mode 100644 index 00000000000..df08ff70977 --- /dev/null +++ b/queue-4.9/uas-always-apply-us_fl_no_ata_1x-quirk-to-seagate-devices.patch @@ -0,0 +1,33 @@ +From 7fee72d5e8f1e7b8d8212e28291b1a0243ecf2f1 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +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 + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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.9/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch b/queue-4.9/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch new file mode 100644 index 00000000000..25ecf4d9ee0 --- /dev/null +++ b/queue-4.9/usb-quirks-add-no-lpm-quirk-for-ky-688-usb-3.1-type-c-hub.patch @@ -0,0 +1,34 @@ +From e43a12f1793ae1fe006e26fe9327a8840a92233c Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +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 + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 }, + -- 2.47.3