patch "usb: core: handle hub C_PORT_OVER_CURRENT condition" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
usb: core: handle hub C_PORT_OVER_CURRENT condition
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
249a32b7eeb3edb6897dd38f89651a62163ac4edMon Sep 17 00:00:00 2001
From: Bin Liu <[email protected]>
Date: Thu, 19 Jul 2018 14:39:37 -0500
Subject: usb: core: handle hub C_PORT_OVER_CURRENT condition
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.
--- drivers/usb/core/hub.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/core/hub.c +6 -2
@@ -1142,10 +1142,14 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)if (!udev || udev->state ==USB_STATE_NOTATTACHED ) {/* 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 ) || - (portstatus &USB_PORT_STAT_OVERCURRENT )) + (portstatus &USB_PORT_STAT_OVERCURRENT ) || + (portchange &USB_PORT_STAT_C_OVERCURRENT ))set_bit (port1, hub->change_bits); }else if (portstatus &USB_PORT_STAT_ENABLE ) {
Signature · 1 line
2.18.0