Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdGZRPy (ORCPT ); Wed, 26 Jul 2017 13:15:54 -0400 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:51417 "EHLO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767AbdGZRPv (ORCPT ); Wed, 26 Jul 2017 13:15:51 -0400 From: "Rafael J. Wysocki" To: Alan Stern , Greg Kroah-Hartman , Felipe Balbi Cc: Linux USB , Linux PM , LKML , Mathias Nyman Subject: Re: [PATCH] USB: hcd: Mark secondary HCD as dead if the primary one died Date: Wed, 26 Jul 2017 19:07:51 +0200 Message-ID: <29451701.e6zKZOze4p@aspire.rjw.lan> User-Agent: KMail/4.14.10 (Linux/4.12.0-rc1+; KDE/4.14.9; x86_64; ; ) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1560 Lines: 45 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 > > > > 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 > > Signed-off-by: Rafael J. Wysocki > > --- > > 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 > 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