--- /dev/null
+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
+@@ -5137,6 +5137,9 @@ static const struct pci_device_id serial
+ { 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
drm-fsl-dcu-enable-irq-before-drm_atomic_helper_resume.patch
drm-amdgpu-use-unsigned-ring-indices-in-amdgpu_queue_mgr_map.patch
s390-runtime-instrumentation-simplify-task-exit-handling.patch
+usbip-fix-usbip-attach-to-find-a-port-that-matches-the-requested-speed.patch
+usbip-fix-usb-device-hang-due-to-wrong-enabling-of-scatter-gather.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
--- /dev/null
+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
+@@ -112,6 +112,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) {
--- /dev/null
+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 },
+
--- /dev/null
+From 770b2edece42fa55bbe7d4cbe53347a07b8968d4 Mon Sep 17 00:00:00 2001
+From: Yuyang Du <yuyang.du@intel.com>
+Date: Thu, 30 Nov 2017 10:22:40 +0800
+Subject: usbip: Fix USB device hang due to wrong enabling of scatter-gather
+
+From: Yuyang Du <yuyang.du@intel.com>
+
+commit 770b2edece42fa55bbe7d4cbe53347a07b8968d4 upstream.
+
+The previous USB3 SuperSpeed enabling patches mistakenly enabled
+URB scatter-gather chaining, which is actually not supported by
+the VHCI HCD. This patch fixes that.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197867
+Fixes: 03cd00d538a6feb ("usbip: vhci-hcd: Set the vhci structure up to work")
+Reported-by: Juan Zea <juan.zea@qindel.com>
+Signed-off-by: Yuyang Du <yuyang.du@intel.com>
+Acked-by: Shuah Khan <shuahkh@osg.samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/usbip/vhci_hcd.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/usb/usbip/vhci_hcd.c
++++ b/drivers/usb/usbip/vhci_hcd.c
+@@ -1112,7 +1112,6 @@ static int hcd_name_to_id(const char *na
+ static int vhci_setup(struct usb_hcd *hcd)
+ {
+ struct vhci *vhci = *((void **)dev_get_platdata(hcd->self.controller));
+- hcd->self.sg_tablesize = ~0;
+ if (usb_hcd_is_primary_hcd(hcd)) {
+ vhci->vhci_hcd_hs = hcd_to_vhci_hcd(hcd);
+ vhci->vhci_hcd_hs->vhci = vhci;
--- /dev/null
+From 1ac7c8a78be85f84b019d3d2742d1a9f07255cc5 Mon Sep 17 00:00:00 2001
+From: Shuah Khan <shuahkh@osg.samsung.com>
+Date: Wed, 29 Nov 2017 15:24:22 -0700
+Subject: usbip: fix usbip attach to find a port that matches the requested speed
+
+From: Shuah Khan <shuahkh@osg.samsung.com>
+
+commit 1ac7c8a78be85f84b019d3d2742d1a9f07255cc5 upstream.
+
+usbip attach fails to find a free port when the device on the first port
+is a USB_SPEED_SUPER device and non-super speed device is being attached.
+It keeps checking the first port and returns without a match getting stuck
+in a loop.
+
+Fix it check to find the first port with matching speed.
+
+Reported-by: Juan Zea <juan.zea@qindel.com>
+Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/usb/usbip/libsrc/vhci_driver.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+--- a/tools/usb/usbip/libsrc/vhci_driver.c
++++ b/tools/usb/usbip/libsrc/vhci_driver.c
+@@ -329,9 +329,17 @@ err:
+ int usbip_vhci_get_free_port(uint32_t speed)
+ {
+ for (int i = 0; i < vhci_driver->nports; i++) {
+- if (speed == USB_SPEED_SUPER &&
+- vhci_driver->idev[i].hub != HUB_SPEED_SUPER)
+- continue;
++
++ switch (speed) {
++ case USB_SPEED_SUPER:
++ if (vhci_driver->idev[i].hub != HUB_SPEED_SUPER)
++ continue;
++ break;
++ default:
++ if (vhci_driver->idev[i].hub != HUB_SPEED_HIGH)
++ continue;
++ break;
++ }
+
+ if (vhci_driver->idev[i].status == VDEV_ST_NULL)
+ return vhci_driver->idev[i].port;
projects / thirdparty / kernel / stable-queue.git / commitdiff
