From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Alessandro Antenucci <antenucci@korg.it>,
Bin Liu <b-liu@ti.com>, Alan Stern <stern@rowland.harvard.edu>
Subject: [PATCH 3.18 20/27] usb: core: handle hub C_PORT_OVER_CURRENT condition
Date: Fri, 27 Jul 2018 12:26:57 +0200 [thread overview]
Message-ID: <20180727102649.787286813@linuxfoundation.org> (raw)
In-Reply-To: <20180727102649.049641021@linuxfoundation.org>
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bin Liu <b-liu@ti.com>
commit 249a32b7eeb3edb6897dd38f89651a62163ac4ed upstream.
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: 08d1dec6f405 ("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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1151,10 +1151,14 @@ static void hub_activate(struct usb_hub
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) {
next prev parent reply other threads:[~2018-07-27 10:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 10:26 [PATCH 3.18 00/27] 3.18.117-stable review Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 01/27] x86/MCE: Remove min interval polling limitation Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 02/27] fat: fix memory allocation failure handling of match_strdup() Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 03/27] ALSA: rawmidi: Change resized buffers atomically Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 04/27] ARC: Fix CONFIG_SWAP Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 05/27] ARC: mm: allow mprotect to make stack mappings executable Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 06/27] ipv4: Return EINVAL when ping_group_range sysctl doesnt map to user ns Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 07/27] ptp: fix missing break in switch Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 08/27] net: Dont copy pfmemalloc flag in __copy_skb_header() Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 09/27] skbuff: Unconditionally copy pfmemalloc in __skb_clone() Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 10/27] ip: hash fragments consistently Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 11/27] net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 12/27] rtnetlink: add rtnl_link_state check in rtnl_configure_link Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 13/27] tcp: fix dctcp delayed ACK schedule Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 14/27] tcp: helpers to send special DCTCP ack Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 15/27] tcp: do not cancel delay-AcK on DCTCP special ACK Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 16/27] tcp: do not delay ACK in DCTCP upon CE status change Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 17/27] tcp: avoid collapses in tcp_prune_queue() if possible Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 18/27] tcp: detect malicious patterns in tcp_collapse_ofo_queue() Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 19/27] usb: cdc_acm: Add quirk for Castles VEGA3000 Greg Kroah-Hartman
2018-07-27 10:26 ` Greg Kroah-Hartman [this message]
2018-07-27 10:26 ` [PATCH 3.18 21/27] usb: gadget: f_fs: Only return delayed status when len is 0 Greg Kroah-Hartman
2018-07-27 10:26 ` [PATCH 3.18 22/27] can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK Greg Kroah-Hartman
2018-07-27 10:27 ` [PATCH 3.18 23/27] can: xilinx_can: fix device dropping off bus on RX overrun Greg Kroah-Hartman
2018-07-27 10:27 ` [PATCH 3.18 24/27] can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting Greg Kroah-Hartman
2018-07-27 10:27 ` [PATCH 3.18 25/27] can: xilinx_can: fix RX overflow interrupt not being enabled Greg Kroah-Hartman
2018-07-27 10:27 ` [PATCH 3.18 26/27] ARM: fix put_user() for gcc-8 Greg Kroah-Hartman
2018-07-27 10:27 ` [PATCH 3.18 27/27] turn off -Wattribute-alias Greg Kroah-Hartman
2018-07-27 12:21 ` [PATCH 3.18 00/27] 3.18.117-stable review Nathan Chancellor
2018-07-27 12:29 ` Greg Kroah-Hartman
2018-07-27 17:28 ` Guenter Roeck
2018-07-27 20:25 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727102649.787286813@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=antenucci@korg.it \
--cc=b-liu@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).