Skip to content

Commit 76e1ef1

Browse files
Eugeniu Roscagregkh
authored andcommitted
usb: core: hub: limit HUB_QUIRK_DISABLE_AUTOSUSPEND to USB5534B
On Tue, May 12, 2020 at 09:36:07PM +0800, Kai-Heng Feng wrote [1]: > This patch prevents my Raven Ridge xHCI from getting runtime suspend. The problem described in v5.6 commit 1208f9e ("USB: hub: Fix the broken detection of USB3 device in SMSC hub") applies solely to the USB5534B hub [2] present on the Kingfisher Infotainment Carrier Board, manufactured by Shimafuji Electric Inc [3]. Despite that, the aforementioned commit applied the quirk to _all_ hubs carrying vendor ID 0x424 (i.e. SMSC), of which there are more [4] than initially expected. Consequently, the quirk is now enabled on platforms carrying SMSC/Microchip hub models which potentially don't exhibit the original issue. To avoid reports like [1], further limit the quirk's scope to USB5534B [2], by employing both Vendor and Product ID checks. Tested on H3ULCB + Kingfisher rev. M05. [1] https://lore.kernel.org/linux-renesas-soc/[email protected]/ [2] https://www.microchip.com/wwwproducts/en/USB5534B [3] http://www.shimafuji.co.jp/wp/wp-content/uploads/2018/08/SBEV-RCAR-KF-M06Board_HWSpecificationEN_Rev130.pdf [4] https://devicehunt.com/search/type/usb/vendor/0424/device/any Fixes: 1208f9e ("USB: hub: Fix the broken detection of USB3 device in SMSC hub") Cc: [email protected] # v4.14+ Cc: Alan Stern <[email protected]> Cc: Hardik Gajjar <[email protected]> Cc: [email protected] Cc: [email protected] Reported-by: Kai-Heng Feng <[email protected]> Signed-off-by: Eugeniu Rosca <[email protected]> Tested-by: Kai-Heng Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 86e1cf7 commit 76e1ef1

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/usb/core/hub.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
#define USB_VENDOR_GENESYS_LOGIC 0x05e3
4141
#define USB_VENDOR_SMSC 0x0424
42+
#define USB_PRODUCT_USB5534B 0x5534
4243
#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01
4344
#define HUB_QUIRK_DISABLE_AUTOSUSPEND 0x02
4445

@@ -5621,8 +5622,11 @@ static void hub_event(struct work_struct *work)
56215622
}
56225623

56235624
static const struct usb_device_id hub_id_table[] = {
5624-
{ .match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_CLASS,
5625+
{ .match_flags = USB_DEVICE_ID_MATCH_VENDOR
5626+
| USB_DEVICE_ID_MATCH_PRODUCT
5627+
| USB_DEVICE_ID_MATCH_INT_CLASS,
56255628
.idVendor = USB_VENDOR_SMSC,
5629+
.idProduct = USB_PRODUCT_USB5534B,
56265630
.bInterfaceClass = USB_CLASS_HUB,
56275631
.driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},
56285632
{ .match_flags = USB_DEVICE_ID_MATCH_VENDOR

0 commit comments

Comments
 (0)