From f2e3b468c261d65b7ad0cb34e8fba131d0de3850 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 14 Dec 2019 16:40:21 +0100 Subject: [PATCH] 4.9-stable patches added patches: usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch usb-uas-heed-capacity_heuristics.patch usb-uas-honor-flag-to-avoid-capacity16.patch --- queue-4.9/series | 3 + ...-to-be-warm-reset-in-suspended-state.patch | 104 ++++++++++++++++++ .../usb-uas-heed-capacity_heuristics.patch | 37 +++++++ ...b-uas-honor-flag-to-avoid-capacity16.patch | 33 ++++++ 4 files changed, 177 insertions(+) create mode 100644 queue-4.9/usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch create mode 100644 queue-4.9/usb-uas-heed-capacity_heuristics.patch create mode 100644 queue-4.9/usb-uas-honor-flag-to-avoid-capacity16.patch diff --git a/queue-4.9/series b/queue-4.9/series index 8a94f7811c0..c7cea7ba6b5 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -94,4 +94,7 @@ kvm-x86-fix-out-of-bounds-write-in-kvm_get_emulated_cpuid-cve-2019-19332.patch appletalk-fix-potential-null-pointer-dereference-in-unregister_snap_client.patch appletalk-set-error-code-if-register_snap_client-failed.patch usb-gadget-configfs-fix-missing-spin_lock_init.patch +usb-uas-honor-flag-to-avoid-capacity16.patch +usb-uas-heed-capacity_heuristics.patch +usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch alsa-hda-fix-pending-unsol-events-at-shutdown.patch diff --git a/queue-4.9/usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch b/queue-4.9/usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch new file mode 100644 index 00000000000..c3db86eb27e --- /dev/null +++ b/queue-4.9/usb-allow-usb-device-to-be-warm-reset-in-suspended-state.patch @@ -0,0 +1,104 @@ +From e76b3bf7654c3c94554c24ba15a3d105f4006c80 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Wed, 6 Nov 2019 14:27:10 +0800 +Subject: usb: Allow USB device to be warm reset in suspended state + +From: Kai-Heng Feng + +commit e76b3bf7654c3c94554c24ba15a3d105f4006c80 upstream. + +On Dell WD15 dock, sometimes USB ethernet cannot be detected after plugging +cable to the ethernet port, the hub and roothub get runtime resumed and +runtime suspended immediately: +... +[ 433.315169] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_resume: 0 +[ 433.315204] usb usb4: usb auto-resume +[ 433.315226] hub 4-0:1.0: hub_resume +[ 433.315239] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10202e2, return 0x10343 +[ 433.315264] usb usb4-port1: status 0343 change 0001 +[ 433.315279] xhci_hcd 0000:3a:00.0: clear port1 connect change, portsc: 0x10002e2 +[ 433.315293] xhci_hcd 0000:3a:00.0: Get port status 4-2 read: 0x2a0, return 0x2a0 +[ 433.317012] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. +[ 433.422282] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10002e2, return 0x343 +[ 433.422307] usb usb4-port1: do warm reset +[ 433.422311] usb 4-1: device reset not allowed in state 8 +[ 433.422339] hub 4-0:1.0: state 7 ports 2 chg 0002 evt 0000 +[ 433.422346] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10002e2, return 0x343 +[ 433.422356] usb usb4-port1: do warm reset +[ 433.422358] usb 4-1: device reset not allowed in state 8 +[ 433.422428] xhci_hcd 0000:3a:00.0: set port remote wake mask, actual port 0 status = 0xf0002e2 +[ 433.422455] xhci_hcd 0000:3a:00.0: set port remote wake mask, actual port 1 status = 0xe0002a0 +[ 433.422465] hub 4-0:1.0: hub_suspend +[ 433.422475] usb usb4: bus auto-suspend, wakeup 1 +[ 433.426161] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. +[ 433.466209] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.510204] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.554051] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.598235] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.642154] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.686204] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.730205] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.774203] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.818207] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.862040] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting +[ 433.862053] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. +[ 433.862077] xhci_hcd 0000:3a:00.0: xhci_suspend: stopping port polling. +[ 433.862096] xhci_hcd 0000:3a:00.0: // Setting command ring address to 0x8578fc001 +[ 433.862312] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_suspend: 0 +[ 433.862445] xhci_hcd 0000:3a:00.0: PME# enabled +[ 433.902376] xhci_hcd 0000:3a:00.0: restoring config space at offset 0xc (was 0x0, writing 0x20) +[ 433.902395] xhci_hcd 0000:3a:00.0: restoring config space at offset 0x4 (was 0x100000, writing 0x100403) +[ 433.902490] xhci_hcd 0000:3a:00.0: PME# disabled +[ 433.902504] xhci_hcd 0000:3a:00.0: enabling bus mastering +[ 433.902547] xhci_hcd 0000:3a:00.0: // Setting command ring address to 0x8578fc001 +[ 433.902649] pcieport 0000:00:1b.0: PME: Spurious native interrupt! +[ 433.902839] xhci_hcd 0000:3a:00.0: Port change event, 4-1, id 3, portsc: 0xb0202e2 +[ 433.902842] xhci_hcd 0000:3a:00.0: resume root hub +[ 433.902845] xhci_hcd 0000:3a:00.0: handle_port_status: starting port polling. +[ 433.902877] xhci_hcd 0000:3a:00.0: xhci_resume: starting port polling. +[ 433.902889] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. +[ 433.902891] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_resume: 0 +[ 433.902919] usb usb4: usb wakeup-resume +[ 433.902942] usb usb4: usb auto-resume +[ 433.902966] hub 4-0:1.0: hub_resume +... + +As Mathias pointed out, the hub enters Cold Attach Status state and +requires a warm reset. However usb_reset_device() bails out early when +the device is in suspended state, as its callers port_event() and +hub_event() don't always resume the device. + +Since there's nothing wrong to reset a suspended device, allow +usb_reset_device() to do so to solve the issue. + +Signed-off-by: Kai-Heng Feng +Acked-by: Alan Stern +Cc: stable +Link: https://lore.kernel.org/r/20191106062710.29880-1-kai.heng.feng@canonical.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/core/hub.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -5620,7 +5620,7 @@ re_enumerate_no_bos: + + /** + * usb_reset_device - warn interface drivers and perform a USB port reset +- * @udev: device to reset (not in SUSPENDED or NOTATTACHED state) ++ * @udev: device to reset (not in NOTATTACHED state) + * + * Warns all drivers bound to registered interfaces (using their pre_reset + * method), performs the port reset, and then lets the drivers know that +@@ -5648,8 +5648,7 @@ int usb_reset_device(struct usb_device * + struct usb_host_config *config = udev->actconfig; + struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent); + +- if (udev->state == USB_STATE_NOTATTACHED || +- udev->state == USB_STATE_SUSPENDED) { ++ if (udev->state == USB_STATE_NOTATTACHED) { + dev_dbg(&udev->dev, "device reset not allowed in state %d\n", + udev->state); + return -EINVAL; diff --git a/queue-4.9/usb-uas-heed-capacity_heuristics.patch b/queue-4.9/usb-uas-heed-capacity_heuristics.patch new file mode 100644 index 00000000000..244467d0559 --- /dev/null +++ b/queue-4.9/usb-uas-heed-capacity_heuristics.patch @@ -0,0 +1,37 @@ +From 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Thu, 14 Nov 2019 12:27:57 +0100 +Subject: USB: uas: heed CAPACITY_HEURISTICS + +From: Oliver Neukum + +commit 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f upstream. + +There is no need to ignore this flag. We should be as close +to storage in that regard as makes sense, so honor flags whose +cost is tiny. + +Signed-off-by: Oliver Neukum +Cc: stable +Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/uas.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/storage/uas.c ++++ b/drivers/usb/storage/uas.c +@@ -845,6 +845,12 @@ static int uas_slave_configure(struct sc + sdev->fix_capacity = 1; + + /* ++ * in some cases we have to guess ++ */ ++ if (devinfo->flags & US_FL_CAPACITY_HEURISTICS) ++ sdev->guess_capacity = 1; ++ ++ /* + * Some devices don't like MODE SENSE with page=0x3f, + * which is the command used for checking if a device + * is write-protected. Now that we tell the sd driver diff --git a/queue-4.9/usb-uas-honor-flag-to-avoid-capacity16.patch b/queue-4.9/usb-uas-honor-flag-to-avoid-capacity16.patch new file mode 100644 index 00000000000..c0ca3f8537a --- /dev/null +++ b/queue-4.9/usb-uas-honor-flag-to-avoid-capacity16.patch @@ -0,0 +1,33 @@ +From bff000cae1eec750d62e265c4ba2db9af57b17e1 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Thu, 14 Nov 2019 12:27:56 +0100 +Subject: USB: uas: honor flag to avoid CAPACITY16 + +From: Oliver Neukum + +commit bff000cae1eec750d62e265c4ba2db9af57b17e1 upstream. + +Copy the support over from usb-storage to get feature parity + +Signed-off-by: Oliver Neukum +Cc: stable +Link: https://lore.kernel.org/r/20191114112758.32747-2-oneukum@suse.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/uas.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/storage/uas.c ++++ b/drivers/usb/storage/uas.c +@@ -832,6 +832,10 @@ static int uas_slave_configure(struct sc + sdev->wce_default_on = 1; + } + ++ /* Some disks cannot handle READ_CAPACITY_16 */ ++ if (devinfo->flags & US_FL_NO_READ_CAPACITY_16) ++ sdev->no_read_capacity_16 = 1; ++ + /* + * Some disks return the total number of blocks in response + * to READ CAPACITY rather than the highest block number. -- 2.47.3