Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754654AbaAHRuA (ORCPT ); Wed, 8 Jan 2014 12:50:00 -0500 Received: from iolanthe.rowland.org ([192.131.102.54]:59188 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750839AbaAHRt6 (ORCPT ); Wed, 8 Jan 2014 12:49:58 -0500 Date: Wed, 8 Jan 2014 12:49:57 -0500 (EST) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Greg KH cc: Shen Guang , Sarah Sharp , , Subject: Re: [PATCH] usb:hub set hub->change_bits when over-current happens In-Reply-To: <20140108171548.GA16878@kroah.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 8 Jan 2014, Greg KH wrote: > On Wed, Jan 08, 2014 at 02:45:42PM +0800, Shen Guang wrote: > > When we are doing compliance test with xHCI, we found that if we > > enable CONFIG_USB_SUSPEND and plug in a bad device which causes > > over-current condition to the root port, software will not be noticed. > > The reason is that current code don't set hub->change_bits in > > hub_activate() when over-current happens, and then hub_events() will > > not check the port status because it thinks nothing changed. > > If CONFIG_USB_SUSPEND is disabled, the interrupt pipe of the hub will > > report the change and set hub->event_bits, and then hub_events() will > > check what events happened.In this case over-current can be detected. > > > > Signed-off-by: Shen Guang > > --- > > drivers/usb/core/hub.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c > > index bd9dc35..98b5679 100644 > > --- a/drivers/usb/core/hub.c > > +++ b/drivers/usb/core/hub.c > > @@ -1154,7 +1154,8 @@ static void hub_activate(struct usb_hub *hub, > > enum hub_activation_type type) > > /* Tell khubd to disconnect the device or > > * check for a new connection > > */ > > - if (udev || (portstatus & USB_PORT_STAT_CONNECTION)) > > + if (udev || (portstatus & USB_PORT_STAT_CONNECTION) || > > + (portstatus & USB_PORT_STAT_OVERCURRENT)) > > set_bit(port1, hub->change_bits); > > > > } else if (portstatus & USB_PORT_STAT_ENABLE) { > > -- > > 1.7.9.5 > > Alan and Sarah, any objection to this patch? It seems okay to me. Acked-by: Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/