From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [RFC] xhci: clear port_remote_wakeup on device disconnection From: Oliver Neukum Message-Id: <1552993288.14757.23.camel@suse.com> Date: Tue, 19 Mar 2019 12:01:28 +0100 To: Nicolas Saenz Julienne , Mathias Nyman Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: T24gTW8sIDIwMTktMDMtMTggYXQgMTg6MDAgKzAxMDAsIE5pY29sYXMgU2FlbnogSnVsaWVubmUg d3JvdGU6Cj4gCj4gVGhpcyBwYXRjaCBjbGVhcnMgInBvcnRfcmVtb3RlX3dha2V1cCIgdXBvbiBk ZXRlY3RpbmcgYSBkZXZpY2UKPiBkaXNjb25uZWN0aW9uLiBNYWtpbmcgc3VyZSB0aGUgYWJvdmUg bWVudGlvbmVkIHNpdHVhdGlvbiBkb2Vzbid0IHRyaWdnZXIKPiBhIFBNIGJ1c3lsb29wLgoKSGks Cgp0aGF0IGlzIGFuIGludGVyZXN0aW5nIHJhY2UgY29uZGl0aW9uLgoKPiAKPiBTaWduZWQtb2Zm LWJ5OiBOaWNvbGFzIFNhZW56IEp1bGllbm5lIDxuc2FlbnpqdWxpZW5uZUBzdXNlLmRlPgo+IC0t LQo+ICBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktaHViLmMgfCAzICsrKwo+ICAxIGZpbGUgY2hhbmdl ZCwgMyBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QveGhj aS1odWIuYyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1odWIuYwo+IGluZGV4IGUyZWVjZTY5MzY1 NS4uYmVhODUzZjQ1YWVjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1odWIu Ywo+ICsrKyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1odWIuYwo+IEBAIC05NDIsNiArOTQyLDkg QEAgc3RhdGljIHZvaWQgeGhjaV9nZXRfdXNiM19wb3J0X3N0YXR1cyhzdHJ1Y3QgeGhjaV9wb3J0 ICpwb3J0LCB1MzIgKnN0YXR1cywKPiAgCQkJYnVzX3N0YXRlLT5zdXNwZW5kZWRfcG9ydHMgJj0g figxIDw8IHBvcnRudW0pOwo+ICAJfQo+ICAKPiArCWlmICghKHBvcnRzYyAmIFBPUlRfQ09OTkVD VCkpCj4gKwkJYnVzX3N0YXRlLT5wb3J0X3JlbW90ZV93YWtldXAgJj0gfigxIDw8IHBvcnRudW0p Owo+ICsKPiAgCXhoY2lfaHViX3JlcG9ydF91c2IzX2xpbmtfc3RhdGUoeGhjaSwgc3RhdHVzLCBw b3J0c2MpOwo+ICAJeGhjaV9kZWxfY29tcF9tb2RfdGltZXIoeGhjaSwgcG9ydHNjLCBwb3J0bnVt KTsKPiAgfQoKV2h5IGFyZSB5b3UgcHV0dGluZyB0aGF0IGxvZ2ljIGludG8geGhjaV9nZXRfdXNi M19wb3J0X3N0YXR1cygpPwpJdCBsb29rcyB0byBtZSBsaWtlIHRoZXJlIGlzIGFscmVhZHkgc29t ZXRoaW5nIHJlbGF0ZWQgaW4gdGhlIGNhbGxlcgoKICAgICAgICAvKiBVU0IyIGFuZCBVU0IzIHNw ZWNpZmljIGJpdHMsIGluY2x1ZGluZyBQb3J0IExpbmsgU3RhdGUgKi8KICAgICAgICBpZiAoaGNk LT5zcGVlZCA+PSBIQ0RfVVNCMykKICAgICAgICAgICAgICAgIHhoY2lfZ2V0X3VzYjNfcG9ydF9z dGF0dXMocG9ydCwgJnN0YXR1cywgcmF3X3BvcnRfc3RhdHVzKTsKICAgICAgICBlbHNlCiAgICAg ICAgICAgICAgICB4aGNpX2dldF91c2IyX3BvcnRfc3RhdHVzKHBvcnQsICZzdGF0dXMsIHJhd19w b3J0X3N0YXR1cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxh Z3MpOwogICAgICAgIC8qCiAgICAgICAgICogQ2xlYXIgc3RhbGUgdXNiMiByZXN1bWUgc2lnbmFs bGluZyB2YXJpYWJsZXMgaW4gY2FzZSBwb3J0IGNoYW5nZWQKICAgICAgICAgKiBzdGF0ZSBkdXJp bmcgcmVzdW1lIHNpZ25hbGxpbmcuIEZvciBleGFtcGxlIG9uIGVycm9yCiAgICAgICAgICovCiAg ICAgICAgaWYgKChidXNfc3RhdGUtPnJlc3VtZV9kb25lW3dJbmRleF0gfHwKICAgICAgICAgICAg IHRlc3RfYml0KHdJbmRleCwgJmJ1c19zdGF0ZS0+cmVzdW1pbmdfcG9ydHMpKSAmJgogICAgICAg ICAgICAocmF3X3BvcnRfc3RhdHVzICYgUE9SVF9QTFNfTUFTSykgIT0gWERFVl9VMyAmJgogICAg ICAgICAgICAocmF3X3BvcnRfc3RhdHVzICYgUE9SVF9QTFNfTUFTSykgIT0gWERFVl9SRVNVTUUp IHsKICAgICAgICAgICAgICAgIGJ1c19zdGF0ZS0+cmVzdW1lX2RvbmVbd0luZGV4XSA9IDA7CiAg ICAgICAgICAgICAgICBjbGVhcl9iaXQod0luZGV4LCAmYnVzX3N0YXRlLT5yZXN1bWluZ19wb3J0 cyk7CiAgICAgICAgICAgICAgICB1c2JfaGNkX2VuZF9wb3J0X3Jlc3VtZSgmaGNkLT5zZWxmLCB3 SW5kZXgpOwogICAgICAgIH0KCk90aGVyd2lzZSB2ZXJ5IGdvb2QgY2F0Y2ghCgoJUmVnYXJkcwoJ CU9saXZlcgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B48A4C43381 for ; Tue, 19 Mar 2019 11:13:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 813CA2146E for ; Tue, 19 Mar 2019 11:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727422AbfCSLNM (ORCPT ); Tue, 19 Mar 2019 07:13:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:44310 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725934AbfCSLNM (ORCPT ); Tue, 19 Mar 2019 07:13:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A0945B028; Tue, 19 Mar 2019 11:13:10 +0000 (UTC) Message-ID: <1552993288.14757.23.camel@suse.com> Subject: Re: [RFC] xhci: clear port_remote_wakeup on device disconnection From: Oliver Neukum To: Nicolas Saenz Julienne , Mathias Nyman Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Date: Tue, 19 Mar 2019 12:01:28 +0100 In-Reply-To: <20190318170038.23914-1-nsaenzjulienne@suse.de> References: <20190318170038.23914-1-nsaenzjulienne@suse.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.6 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mo, 2019-03-18 at 18:00 +0100, Nicolas Saenz Julienne wrote: > > This patch clears "port_remote_wakeup" upon detecting a device > disconnection. Making sure the above mentioned situation doesn't trigger > a PM busyloop. Hi, that is an interesting race condition. > > Signed-off-by: Nicolas Saenz Julienne > --- > drivers/usb/host/xhci-hub.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c > index e2eece693655..bea853f45aec 100644 > --- a/drivers/usb/host/xhci-hub.c > +++ b/drivers/usb/host/xhci-hub.c > @@ -942,6 +942,9 @@ static void xhci_get_usb3_port_status(struct xhci_port *port, u32 *status, > bus_state->suspended_ports &= ~(1 << portnum); > } > > + if (!(portsc & PORT_CONNECT)) > + bus_state->port_remote_wakeup &= ~(1 << portnum); > + > xhci_hub_report_usb3_link_state(xhci, status, portsc); > xhci_del_comp_mod_timer(xhci, portsc, portnum); > } Why are you putting that logic into xhci_get_usb3_port_status()? It looks to me like there is already something related in the caller /* USB2 and USB3 specific bits, including Port Link State */ if (hcd->speed >= HCD_USB3) xhci_get_usb3_port_status(port, &status, raw_port_status); else xhci_get_usb2_port_status(port, &status, raw_port_status, flags); /* * Clear stale usb2 resume signalling variables in case port changed * state during resume signalling. For example on error */ if ((bus_state->resume_done[wIndex] || test_bit(wIndex, &bus_state->resuming_ports)) && (raw_port_status & PORT_PLS_MASK) != XDEV_U3 && (raw_port_status & PORT_PLS_MASK) != XDEV_RESUME) { bus_state->resume_done[wIndex] = 0; clear_bit(wIndex, &bus_state->resuming_ports); usb_hcd_end_port_resume(&hcd->self, wIndex); } Otherwise very good catch! Regards Oliver