usb: core: handle hub C_PORT_OVER_CURRENT condition (249a32b7) · Commits · 戴 / test

Based on USB2.0 Spec Section 11.12.5, "If a hub has per-port power switching and per-port current limiting, an over-current on one port may still cause the power on another port to fall below specific minimums. In this case, the affected port is placed in the Power-Off state and C_PORT_OVER_CURRENT is set for the port, but PORT_OVER_CURRENT is not set." so let's check C_PORT_OVER_CURRENT too for over current condition. Fixes: ("usb:hub set hub->change_bits when over-current happens") Cc: <stable@vger.kernel.org> Tested-by:

Alessandro Antenucci <antenucci@korg.it> Signed-off-by:

Bin Liu <b-liu@ti.com> Acked-by:

Alan Stern <stern@rowland.harvard.edu> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/core/hub.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1142,10 +1142,14 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)

	if (!udev \|\| udev->state == USB_STATE_NOTATTACHED) {		if (!udev \|\| udev->state == USB_STATE_NOTATTACHED) {
	/* Tell hub_wq to disconnect the device or		/* Tell hub_wq to disconnect the device or
	* check for a new connection		* check for a new connection or over current condition.
			* Based on USB2.0 Spec Section 11.12.5,
			* C_PORT_OVER_CURRENT could be set while
			* PORT_OVER_CURRENT is not. So check for any of them.
	*/		*/
	if (udev \|\| (portstatus & USB_PORT_STAT_CONNECTION) \|\|		if (udev \|\| (portstatus & USB_PORT_STAT_CONNECTION) \|\|
	(portstatus & USB_PORT_STAT_OVERCURRENT))		(portstatus & USB_PORT_STAT_OVERCURRENT) \|\|
			(portchange & USB_PORT_STAT_C_OVERCURRENT))
	set_bit(port1, hub->change_bits);		set_bit(port1, hub->change_bits);

	} else if (portstatus & USB_PORT_STAT_ENABLE) {		} else if (portstatus & USB_PORT_STAT_ENABLE) {

Admin message