Merge tag 'usb-6.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/Thunderbolt fixes from Greg KH:
"Here are some tiny USB and Thunderbolt driver fixes and quirks.

Included in here are:

- three uas/usb-storage driver quirks to get the devices working
properly due to broken firmware images in them (they can not run at
high data rates, and are also throttled on other operating systems
because of this)

- thunderbolt bugfix for plug event delays

- typec runtime warning removal

- dwc3 st driver bugfix. Note, a follow-on fix for this will end up
coming in for 6.1-rc1 as the developers are still arguing over what
the final solution will be, but this should be sufficient for now

All of these have been in linux-next with no reported problems"

* tag 'usb-6.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
uas: ignore UAS for Thinkplus chips
usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS
uas: add no-uas quirk for Hiksemi usb_disk
usb: dwc3: st: Fix node's child name
usb: typec: ucsi: Remove incorrect warning
thunderbolt: Explicitly reset plug events delay back to USB4 spec value

Changed files
+23 -3
drivers
thunderbolt
usb
dwc3
storage
typec
ucsi
+1
drivers/thunderbolt/switch.c
··· 2413 2413 * additional capabilities. 2414 2414 */ 2415 2415 sw->config.cmuv = USB4_VERSION_1_0; 2416 + sw->config.plug_events_delay = 0xa; 2416 2417 2417 2418 /* Enumerate the switch */ 2418 2419 ret = tb_sw_write(sw, (u32 *)&sw->config + 1, TB_CFG_SWITCH,
+1 -1
drivers/usb/dwc3/dwc3-st.c
··· 251 251 /* Manage SoftReset */ 252 252 reset_control_deassert(dwc3_data->rstc_rst); 253 253 254 - child = of_get_child_by_name(node, "dwc3"); 254 + child = of_get_child_by_name(node, "usb"); 255 255 if (!child) { 256 256 dev_err(&pdev->dev, "failed to find dwc3 core node\n"); 257 257 ret = -ENODEV;
+21
drivers/usb/storage/unusual_uas.h
··· 52 52 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 53 53 US_FL_NO_REPORT_OPCODES | US_FL_NO_SAME), 54 54 55 + /* Reported-by: Hongling Zeng <zenghongling@kylinos.cn> */ 56 + UNUSUAL_DEV(0x090c, 0x2000, 0x0000, 0x9999, 57 + "Hiksemi", 58 + "External HDD", 59 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, 60 + US_FL_IGNORE_UAS), 61 + 55 62 /* 56 63 * Apricorn USB3 dongle sometimes returns "USBSUSBSUSBS" in response to SCSI 57 64 * commands in UAS mode. Observed with the 1.28 firmware; are there others? ··· 82 75 "Expansion Desk", 83 76 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 84 77 US_FL_NO_REPORT_LUNS), 78 + 79 + /* Reported-by: Hongling Zeng <zenghongling@kylinos.cn> */ 80 + UNUSUAL_DEV(0x0bda, 0x9210, 0x0000, 0x9999, 81 + "Hiksemi", 82 + "External HDD", 83 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, 84 + US_FL_IGNORE_UAS), 85 85 86 86 /* Reported-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> */ 87 87 UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, ··· 131 117 "Pro Elite SSD", 132 118 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 133 119 US_FL_NO_ATA_1X), 120 + 121 + /* Reported-by: Hongling Zeng <zenghongling@kylinos.cn> */ 122 + UNUSUAL_DEV(0x17ef, 0x3899, 0x0000, 0x9999, 123 + "Thinkplus", 124 + "External HDD", 125 + USB_SC_DEVICE, USB_PR_DEVICE, NULL, 126 + US_FL_IGNORE_UAS), 134 127 135 128 /* Reported-by: Hans de Goede <hdegoede@redhat.com> */ 136 129 UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999,
-2
drivers/usb/typec/ucsi/ucsi.c
··· 588 588 num_pdos * sizeof(u32)); 589 589 if (ret < 0 && ret != -ETIMEDOUT) 590 590 dev_err(ucsi->dev, "UCSI_GET_PDOS failed (%d)\n", ret); 591 - if (ret == 0 && offset == 0) 592 - dev_warn(ucsi->dev, "UCSI_GET_PDOS returned 0 bytes\n"); 593 591 594 592 return ret; 595 593 }