From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935875AbeEYGa2 (ORCPT ); Fri, 25 May 2018 02:30:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:47122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791AbeEYGa1 (ORCPT ); Fri, 25 May 2018 02:30:27 -0400 Date: Fri, 25 May 2018 08:30:09 +0200 From: Greg Kroah-Hartman To: Nicolas Boichat Cc: linux-usb@vger.kernel.org, Alan Stern , Mathias Nyman , Felipe Balbi , Eugene Korenevsky , Peter Chen , Daniel Drake , Joe Perches , Johan Hovold , Richard Leitner , linux-kernel@vger.kernel.org, groeck@chromium.org Subject: Re: [PATCH] usb: hub: Per-port setting to use old enumeration scheme Message-ID: <20180525063009.GB11968@kroah.com> References: <20180523021656.122455-1-drinkcat@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180523021656.122455-1-drinkcat@chromium.org> User-Agent: Mutt/1.10.0 (2018-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 23, 2018 at 10:16:56AM +0800, Nicolas Boichat wrote: > The "old" enumeration scheme is considerably faster (it takes > ~294ms instead of ~439ms to get the descriptor). > > It is currently only possible to use the old scheme globally > (/sys/module/usbcore/parameters/old_scheme_first), which is not > desirable as the new scheme was introduced to increase compatibility > with more devices. > > However, in our case, we care about time-to-active for a specific > USB device (which we make the firmware for), on a specific port > (that is pogo-pin based: not a standard USB port). This new > sysfs option makes it possible to use the old scheme on a single > port only. > > Signed-off-by: Nicolas Boichat > --- > > There are other "quirks" that we could add to reduce further > enumeration time (e.g. reduce USB debounce time, reduce TRSTRCY > to 10ms instead of 50ms as used currently), but the logic is quite > similar, so it'd be good to have this reviewed first. > > drivers/usb/core/hub.c | 13 +++++++++---- > drivers/usb/core/hub.h | 1 + > drivers/usb/core/port.c | 23 +++++++++++++++++++++++ > include/linux/usb.h | 7 +++++++ > 4 files changed, 40 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c > index c2d993d3816f0..f900f66a62856 100644 > --- a/drivers/usb/core/hub.c > +++ b/drivers/usb/core/hub.c > @@ -2636,7 +2636,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub) > #define SET_ADDRESS_TRIES 2 > #define GET_DESCRIPTOR_TRIES 2 > #define SET_CONFIG_TRIES (2 * (use_both_schemes + 1)) > -#define USE_NEW_SCHEME(i) ((i) / 2 == (int)old_scheme_first) > +#define USE_NEW_SCHEME(i, scheme) ((i) / 2 == (int)scheme) > > #define HUB_ROOT_RESET_TIME 60 /* times are in msec */ > #define HUB_SHORT_RESET_TIME 10 > @@ -2651,12 +2651,16 @@ static unsigned hub_is_wusb(struct usb_hub *hub) > * enumeration failures, so disable this enumeration scheme for USB3 > * devices. > */ > -static bool use_new_scheme(struct usb_device *udev, int retry) > +static bool use_new_scheme(struct usb_device *udev, int retry, > + struct usb_port *port_dev) > { > + int old_scheme_first_port = > + port_dev->quirks & USB_PORT_QUIRK_OLD_SCHEME; > + > if (udev->speed >= USB_SPEED_SUPER) > return false; > > - return USE_NEW_SCHEME(retry); > + return USE_NEW_SCHEME(retry, old_scheme_first_port || old_scheme_first); > } > > /* Is a USB 3.0 port in the Inactive or Compliance Mode state? > @@ -4392,6 +4396,7 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, > { > struct usb_device *hdev = hub->hdev; > struct usb_hcd *hcd = bus_to_hcd(hdev->bus); > + struct usb_port *port_dev = hub->ports[port1 - 1]; > int retries, operations, retval, i; > unsigned delay = HUB_SHORT_RESET_TIME; > enum usb_device_speed oldspeed = udev->speed; > @@ -4513,7 +4518,7 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, > for (retries = 0; retries < GET_DESCRIPTOR_TRIES; (++retries, msleep(100))) { > bool did_new_scheme = false; > > - if (use_new_scheme(udev, retry_counter)) { > + if (use_new_scheme(udev, retry_counter, port_dev)) { > struct usb_device_descriptor *buf; > int r = 0; > > diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h > index 4dc769ee9c740..4accfb63f7dcb 100644 > --- a/drivers/usb/core/hub.h > +++ b/drivers/usb/core/hub.h > @@ -98,6 +98,7 @@ struct usb_port { > struct mutex status_lock; > u32 over_current_count; > u8 portnum; > + u32 quirks; > unsigned int is_superspeed:1; > unsigned int usb3_lpm_u1_permit:1; > unsigned int usb3_lpm_u2_permit:1; > diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c > index 6979bde87d310..4a21431953953 100644 > --- a/drivers/usb/core/port.c > +++ b/drivers/usb/core/port.c > @@ -50,6 +50,28 @@ static ssize_t over_current_count_show(struct device *dev, > } > static DEVICE_ATTR_RO(over_current_count); > > +static ssize_t quirks_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct usb_port *port_dev = to_usb_port(dev); > + > + return sprintf(buf, "%08x\n", port_dev->quirks); > +} > + > +static ssize_t quirks_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t count) > +{ > + struct usb_port *port_dev = to_usb_port(dev); > + u32 value; > + > + if (kstrtou32(buf, 16, &value)) > + return -EINVAL; > + > + port_dev->quirks = value; > + return count; > +} > +static DEVICE_ATTR_RW(quirks); > + > static ssize_t usb3_lpm_permit_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -118,6 +140,7 @@ static DEVICE_ATTR_RW(usb3_lpm_permit); > > static struct attribute *port_dev_attrs[] = { > &dev_attr_connect_type.attr, > + &dev_attr_quirks.attr, > &dev_attr_over_current_count.attr, > NULL, > }; Oops, you add a new sysfs file, but do not document it anywhere. It needs to go into Documentation/ABI/ along with the other files, otherwise no one knows how to use it. Please fix that up and resend. thanks, greg k-h 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: usb: hub: Per-port setting to use old enumeration scheme From: Greg Kroah-Hartman Message-Id: <20180525063009.GB11968@kroah.com> Date: Fri, 25 May 2018 08:30:09 +0200 To: Nicolas Boichat Cc: linux-usb@vger.kernel.org, Alan Stern , Mathias Nyman , Felipe Balbi , Eugene Korenevsky , Peter Chen , Daniel Drake , Joe Perches , Johan Hovold , Richard Leitner , linux-kernel@vger.kernel.org, groeck@chromium.org List-ID: T24gV2VkLCBNYXkgMjMsIDIwMTggYXQgMTA6MTY6NTZBTSArMDgwMCwgTmljb2xhcyBCb2ljaGF0 IHdyb3RlOgo+IFRoZSAib2xkIiBlbnVtZXJhdGlvbiBzY2hlbWUgaXMgY29uc2lkZXJhYmx5IGZh c3RlciAoaXQgdGFrZXMKPiB+Mjk0bXMgaW5zdGVhZCBvZiB+NDM5bXMgdG8gZ2V0IHRoZSBkZXNj cmlwdG9yKS4KPiAKPiBJdCBpcyBjdXJyZW50bHkgb25seSBwb3NzaWJsZSB0byB1c2UgdGhlIG9s ZCBzY2hlbWUgZ2xvYmFsbHkKPiAoL3N5cy9tb2R1bGUvdXNiY29yZS9wYXJhbWV0ZXJzL29sZF9z Y2hlbWVfZmlyc3QpLCB3aGljaCBpcyBub3QKPiBkZXNpcmFibGUgYXMgdGhlIG5ldyBzY2hlbWUg d2FzIGludHJvZHVjZWQgdG8gaW5jcmVhc2UgY29tcGF0aWJpbGl0eQo+IHdpdGggbW9yZSBkZXZp Y2VzLgo+IAo+IEhvd2V2ZXIsIGluIG91ciBjYXNlLCB3ZSBjYXJlIGFib3V0IHRpbWUtdG8tYWN0 aXZlIGZvciBhIHNwZWNpZmljCj4gVVNCIGRldmljZSAod2hpY2ggd2UgbWFrZSB0aGUgZmlybXdh cmUgZm9yKSwgb24gYSBzcGVjaWZpYyBwb3J0Cj4gKHRoYXQgaXMgcG9nby1waW4gYmFzZWQ6IG5v dCBhIHN0YW5kYXJkIFVTQiBwb3J0KS4gVGhpcyBuZXcKPiBzeXNmcyBvcHRpb24gbWFrZXMgaXQg cG9zc2libGUgdG8gdXNlIHRoZSBvbGQgc2NoZW1lIG9uIGEgc2luZ2xlCj4gcG9ydCBvbmx5Lgo+ IAo+IFNpZ25lZC1vZmYtYnk6IE5pY29sYXMgQm9pY2hhdCA8ZHJpbmtjYXRAY2hyb21pdW0ub3Jn Pgo+IC0tLQo+IAo+IFRoZXJlIGFyZSBvdGhlciAicXVpcmtzIiB0aGF0IHdlIGNvdWxkIGFkZCB0 byByZWR1Y2UgZnVydGhlcgo+IGVudW1lcmF0aW9uIHRpbWUgKGUuZy4gcmVkdWNlIFVTQiBkZWJv dW5jZSB0aW1lLCByZWR1Y2UgVFJTVFJDWQo+IHRvIDEwbXMgaW5zdGVhZCBvZiA1MG1zIGFzIHVz ZWQgY3VycmVudGx5KSwgYnV0IHRoZSBsb2dpYyBpcyBxdWl0ZQo+IHNpbWlsYXIsIHNvIGl0J2Qg YmUgZ29vZCB0byBoYXZlIHRoaXMgcmV2aWV3ZWQgZmlyc3QuCj4gCj4gIGRyaXZlcnMvdXNiL2Nv cmUvaHViLmMgIHwgMTMgKysrKysrKysrLS0tLQo+ICBkcml2ZXJzL3VzYi9jb3JlL2h1Yi5oICB8 ICAxICsKPiAgZHJpdmVycy91c2IvY29yZS9wb3J0LmMgfCAyMyArKysrKysrKysrKysrKysrKysr KysrKwo+ICBpbmNsdWRlL2xpbnV4L3VzYi5oICAgICB8ICA3ICsrKysrKysKPiAgNCBmaWxlcyBj aGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9jb3JlL2h1Yi5jIGIvZHJpdmVycy91c2IvY29yZS9odWIuYwo+IGluZGV4 IGMyZDk5M2QzODE2ZjAuLmY5MDBmNjZhNjI4NTYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2Iv Y29yZS9odWIuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL2NvcmUvaHViLmMKPiBAQCAtMjYzNiw3ICsy NjM2LDcgQEAgc3RhdGljIHVuc2lnbmVkIGh1Yl9pc193dXNiKHN0cnVjdCB1c2JfaHViICpodWIp Cj4gICNkZWZpbmUgU0VUX0FERFJFU1NfVFJJRVMJMgo+ICAjZGVmaW5lIEdFVF9ERVNDUklQVE9S X1RSSUVTCTIKPiAgI2RlZmluZSBTRVRfQ09ORklHX1RSSUVTCSgyICogKHVzZV9ib3RoX3NjaGVt ZXMgKyAxKSkKPiAtI2RlZmluZSBVU0VfTkVXX1NDSEVNRShpKQkoKGkpIC8gMiA9PSAoaW50KW9s ZF9zY2hlbWVfZmlyc3QpCj4gKyNkZWZpbmUgVVNFX05FV19TQ0hFTUUoaSwgc2NoZW1lKQkoKGkp IC8gMiA9PSAoaW50KXNjaGVtZSkKPiAgCj4gICNkZWZpbmUgSFVCX1JPT1RfUkVTRVRfVElNRQk2 MAkvKiB0aW1lcyBhcmUgaW4gbXNlYyAqLwo+ICAjZGVmaW5lIEhVQl9TSE9SVF9SRVNFVF9USU1F CTEwCj4gQEAgLTI2NTEsMTIgKzI2NTEsMTYgQEAgc3RhdGljIHVuc2lnbmVkIGh1Yl9pc193dXNi KHN0cnVjdCB1c2JfaHViICpodWIpCj4gICAqIGVudW1lcmF0aW9uIGZhaWx1cmVzLCBzbyBkaXNh YmxlIHRoaXMgZW51bWVyYXRpb24gc2NoZW1lIGZvciBVU0IzCj4gICAqIGRldmljZXMuCj4gICAq Lwo+IC1zdGF0aWMgYm9vbCB1c2VfbmV3X3NjaGVtZShzdHJ1Y3QgdXNiX2RldmljZSAqdWRldiwg aW50IHJldHJ5KQo+ICtzdGF0aWMgYm9vbCB1c2VfbmV3X3NjaGVtZShzdHJ1Y3QgdXNiX2Rldmlj ZSAqdWRldiwgaW50IHJldHJ5LAo+ICsJCQkgICBzdHJ1Y3QgdXNiX3BvcnQgKnBvcnRfZGV2KQo+ ICB7Cj4gKwlpbnQgb2xkX3NjaGVtZV9maXJzdF9wb3J0ID0KPiArCQlwb3J0X2Rldi0+cXVpcmtz ICYgVVNCX1BPUlRfUVVJUktfT0xEX1NDSEVNRTsKPiArCj4gIAlpZiAodWRldi0+c3BlZWQgPj0g VVNCX1NQRUVEX1NVUEVSKQo+ICAJCXJldHVybiBmYWxzZTsKPiAgCj4gLQlyZXR1cm4gVVNFX05F V19TQ0hFTUUocmV0cnkpOwo+ICsJcmV0dXJuIFVTRV9ORVdfU0NIRU1FKHJldHJ5LCBvbGRfc2No ZW1lX2ZpcnN0X3BvcnQgfHwgb2xkX3NjaGVtZV9maXJzdCk7Cj4gIH0KPiAgCj4gIC8qIElzIGEg VVNCIDMuMCBwb3J0IGluIHRoZSBJbmFjdGl2ZSBvciBDb21wbGlhbmNlIE1vZGUgc3RhdGU/Cj4g QEAgLTQzOTIsNiArNDM5Niw3IEBAIGh1Yl9wb3J0X2luaXQoc3RydWN0IHVzYl9odWIgKmh1Yiwg c3RydWN0IHVzYl9kZXZpY2UgKnVkZXYsIGludCBwb3J0MSwKPiAgewo+ICAJc3RydWN0IHVzYl9k ZXZpY2UJKmhkZXYgPSBodWItPmhkZXY7Cj4gIAlzdHJ1Y3QgdXNiX2hjZAkJKmhjZCA9IGJ1c190 b19oY2QoaGRldi0+YnVzKTsKPiArCXN0cnVjdCB1c2JfcG9ydAkJKnBvcnRfZGV2ID0gaHViLT5w b3J0c1twb3J0MSAtIDFdOwo+ICAJaW50CQkJcmV0cmllcywgb3BlcmF0aW9ucywgcmV0dmFsLCBp Owo+ICAJdW5zaWduZWQJCWRlbGF5ID0gSFVCX1NIT1JUX1JFU0VUX1RJTUU7Cj4gIAllbnVtIHVz Yl9kZXZpY2Vfc3BlZWQJb2xkc3BlZWQgPSB1ZGV2LT5zcGVlZDsKPiBAQCAtNDUxMyw3ICs0NTE4 LDcgQEAgaHViX3BvcnRfaW5pdChzdHJ1Y3QgdXNiX2h1YiAqaHViLCBzdHJ1Y3QgdXNiX2Rldmlj ZSAqdWRldiwgaW50IHBvcnQxLAo+ICAJZm9yIChyZXRyaWVzID0gMDsgcmV0cmllcyA8IEdFVF9E RVNDUklQVE9SX1RSSUVTOyAoKytyZXRyaWVzLCBtc2xlZXAoMTAwKSkpIHsKPiAgCQlib29sIGRp ZF9uZXdfc2NoZW1lID0gZmFsc2U7Cj4gIAo+IC0JCWlmICh1c2VfbmV3X3NjaGVtZSh1ZGV2LCBy ZXRyeV9jb3VudGVyKSkgewo+ICsJCWlmICh1c2VfbmV3X3NjaGVtZSh1ZGV2LCByZXRyeV9jb3Vu dGVyLCBwb3J0X2RldikpIHsKPiAgCQkJc3RydWN0IHVzYl9kZXZpY2VfZGVzY3JpcHRvciAqYnVm Owo+ICAJCQlpbnQgciA9IDA7Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9jb3JlL2h1 Yi5oIGIvZHJpdmVycy91c2IvY29yZS9odWIuaAo+IGluZGV4IDRkYzc2OWVlOWM3NDAuLjRhY2Nm YjYzZjdkY2IgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvY29yZS9odWIuaAo+ICsrKyBiL2Ry aXZlcnMvdXNiL2NvcmUvaHViLmgKPiBAQCAtOTgsNiArOTgsNyBAQCBzdHJ1Y3QgdXNiX3BvcnQg ewo+ICAJc3RydWN0IG11dGV4IHN0YXR1c19sb2NrOwo+ICAJdTMyIG92ZXJfY3VycmVudF9jb3Vu dDsKPiAgCXU4IHBvcnRudW07Cj4gKwl1MzIgcXVpcmtzOwo+ICAJdW5zaWduZWQgaW50IGlzX3N1 cGVyc3BlZWQ6MTsKPiAgCXVuc2lnbmVkIGludCB1c2IzX2xwbV91MV9wZXJtaXQ6MTsKPiAgCXVu c2lnbmVkIGludCB1c2IzX2xwbV91Ml9wZXJtaXQ6MTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91 c2IvY29yZS9wb3J0LmMgYi9kcml2ZXJzL3VzYi9jb3JlL3BvcnQuYwo+IGluZGV4IDY5NzliZGU4 N2QzMTAuLjRhMjE0MzE5NTM5NTMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvY29yZS9wb3J0 LmMKPiArKysgYi9kcml2ZXJzL3VzYi9jb3JlL3BvcnQuYwo+IEBAIC01MCw2ICs1MCwyOCBAQCBz dGF0aWMgc3NpemVfdCBvdmVyX2N1cnJlbnRfY291bnRfc2hvdyhzdHJ1Y3QgZGV2aWNlICpkZXYs Cj4gIH0KPiAgc3RhdGljIERFVklDRV9BVFRSX1JPKG92ZXJfY3VycmVudF9jb3VudCk7Cj4gIAo+ ICtzdGF0aWMgc3NpemVfdCBxdWlya3Nfc2hvdyhzdHJ1Y3QgZGV2aWNlICpkZXYsCj4gKwkJCSAg IHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYpCj4gK3sKPiArCXN0cnVj dCB1c2JfcG9ydCAqcG9ydF9kZXYgPSB0b191c2JfcG9ydChkZXYpOwo+ICsKPiArCXJldHVybiBz cHJpbnRmKGJ1ZiwgIiUwOHhcbiIsIHBvcnRfZGV2LT5xdWlya3MpOwo+ICt9Cj4gKwo+ICtzdGF0 aWMgc3NpemVfdCBxdWlya3Nfc3RvcmUoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNl X2F0dHJpYnV0ZSAqYXR0ciwKPiArCQkJICAgIGNvbnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IGNvdW50 KQo+ICt7Cj4gKwlzdHJ1Y3QgdXNiX3BvcnQgKnBvcnRfZGV2ID0gdG9fdXNiX3BvcnQoZGV2KTsK PiArCXUzMiB2YWx1ZTsKPiArCj4gKwlpZiAoa3N0cnRvdTMyKGJ1ZiwgMTYsICZ2YWx1ZSkpCj4g KwkJcmV0dXJuIC1FSU5WQUw7Cj4gKwo+ICsJcG9ydF9kZXYtPnF1aXJrcyA9IHZhbHVlOwo+ICsJ cmV0dXJuIGNvdW50Owo+ICt9Cj4gK3N0YXRpYyBERVZJQ0VfQVRUUl9SVyhxdWlya3MpOwo+ICsK PiAgc3RhdGljIHNzaXplX3QgdXNiM19scG1fcGVybWl0X3Nob3coc3RydWN0IGRldmljZSAqZGV2 LAo+ICAJCQkgICAgICBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVmKQo+ ICB7Cj4gQEAgLTExOCw2ICsxNDAsNyBAQCBzdGF0aWMgREVWSUNFX0FUVFJfUlcodXNiM19scG1f cGVybWl0KTsKPiAgCj4gIHN0YXRpYyBzdHJ1Y3QgYXR0cmlidXRlICpwb3J0X2Rldl9hdHRyc1td ID0gewo+ICAJJmRldl9hdHRyX2Nvbm5lY3RfdHlwZS5hdHRyLAo+ICsJJmRldl9hdHRyX3F1aXJr cy5hdHRyLAo+ICAJJmRldl9hdHRyX292ZXJfY3VycmVudF9jb3VudC5hdHRyLAo+ICAJTlVMTCwK PiAgfTsKCk9vcHMsIHlvdSBhZGQgYSBuZXcgc3lzZnMgZmlsZSwgYnV0IGRvIG5vdCBkb2N1bWVu dCBpdCBhbnl3aGVyZS4gIEl0Cm5lZWRzIHRvIGdvIGludG8gRG9jdW1lbnRhdGlvbi9BQkkvIGFs b25nIHdpdGggdGhlIG90aGVyIGZpbGVzLApvdGhlcndpc2Ugbm8gb25lIGtub3dzIGhvdyB0byB1 c2UgaXQuCgpQbGVhc2UgZml4IHRoYXQgdXAgYW5kIHJlc2VuZC4KCnRoYW5rcywKCmdyZWcgay1o Ci0tLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJz Y3JpYmUgbGludXgtdXNiIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZn ZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwu b3JnL21ham9yZG9tby1pbmZvLmh0bWwK