| Message ID | 2812577.lIftRZubdO@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
On Tue, 25 Jul 2017, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared > HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for > the primary one. > > Among other thigs, this prevents check_root_hub_suspended() from > returning -EBUSY for dead HCDs which helps to work around system > suspend issues in some situations. > > This actually fixes occasional suspend failures on one of my test > machines. > > Suggested-by: Alan Stern <stern@rowland.harvard.edu> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/usb/core/hcd.c | 2 ++ > 1 file changed, 2 insertions(+) > > Index: linux-pm/drivers/usb/core/hcd.c > =================================================================== > --- linux-pm.orig/drivers/usb/core/hcd.c > +++ linux-pm/drivers/usb/core/hcd.c > @@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) > } > if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) { > hcd = hcd->shared_hcd; > + clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags); > + set_bit(HCD_FLAG_DEAD, &hcd->flags); > if (hcd->rh_registered) { > clear_bit(HCD_FLAG_POLL_RH, &hcd->flags); Acked-by: Alan Stern <stern@rowland.harvard.edu>
On Wednesday, July 26, 2017 10:21:54 AM Alan Stern wrote: > On Tue, 25 Jul 2017, Rafael J. Wysocki wrote: > > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared > > HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for > > the primary one. > > > > Among other thigs, this prevents check_root_hub_suspended() from > > returning -EBUSY for dead HCDs which helps to work around system > > suspend issues in some situations. > > > > This actually fixes occasional suspend failures on one of my test > > machines. > > > > Suggested-by: Alan Stern <stern@rowland.harvard.edu> > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > --- > > drivers/usb/core/hcd.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > Index: linux-pm/drivers/usb/core/hcd.c > > =================================================================== > > --- linux-pm.orig/drivers/usb/core/hcd.c > > +++ linux-pm/drivers/usb/core/hcd.c > > @@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) > > } > > if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) { > > hcd = hcd->shared_hcd; > > + clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags); > > + set_bit(HCD_FLAG_DEAD, &hcd->flags); > > if (hcd->rh_registered) { > > clear_bit(HCD_FLAG_POLL_RH, &hcd->flags); > > Acked-by: Alan Stern <stern@rowland.harvard.edu> > Thanks! I guess this should go in via USB, so Felipe & Greg, please apply or let me know if you prefer me to handle it. Thanks, Rafael
On Wed, Jul 26, 2017 at 07:07:51PM +0200, Rafael J. Wysocki wrote: > On Wednesday, July 26, 2017 10:21:54 AM Alan Stern wrote: > > On Tue, 25 Jul 2017, Rafael J. Wysocki wrote: > > > > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > > > Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared > > > HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for > > > the primary one. > > > > > > Among other thigs, this prevents check_root_hub_suspended() from > > > returning -EBUSY for dead HCDs which helps to work around system > > > suspend issues in some situations. > > > > > > This actually fixes occasional suspend failures on one of my test > > > machines. > > > > > > Suggested-by: Alan Stern <stern@rowland.harvard.edu> > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > --- > > > drivers/usb/core/hcd.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > Index: linux-pm/drivers/usb/core/hcd.c > > > =================================================================== > > > --- linux-pm.orig/drivers/usb/core/hcd.c > > > +++ linux-pm/drivers/usb/core/hcd.c > > > @@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) > > > } > > > if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) { > > > hcd = hcd->shared_hcd; > > > + clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags); > > > + set_bit(HCD_FLAG_DEAD, &hcd->flags); > > > if (hcd->rh_registered) { > > > clear_bit(HCD_FLAG_POLL_RH, &hcd->flags); > > > > Acked-by: Alan Stern <stern@rowland.harvard.edu> > > > > Thanks! > > I guess this should go in via USB, so Felipe & Greg, please apply or let me > know if you prefer me to handle it. I'll take it, thanks. greg k-h
Index: linux-pm/drivers/usb/core/hcd.c =================================================================== --- linux-pm.orig/drivers/usb/core/hcd.c +++ linux-pm/drivers/usb/core/hcd.c @@ -2485,6 +2485,8 @@ void usb_hc_died (struct usb_hcd *hcd) } if (usb_hcd_is_primary_hcd(hcd) && hcd->shared_hcd) { hcd = hcd->shared_hcd; + clear_bit(HCD_FLAG_RH_RUNNING, &hcd->flags); + set_bit(HCD_FLAG_DEAD, &hcd->flags); if (hcd->rh_registered) { clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);