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: host: ehci: allow tine of highspeed nak-count From: Ben Dooks Message-Id: <20181114171315.27549-1-ben-linux@fluff.org> Date: Wed, 14 Nov 2018 17:13:15 +0000 To: stern@rowland.harvard.edu, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org Cc: linux-kernel@lists.codethink.co.uk, linux-kernel@vger.kernel.org, Ben Dooks List-ID: RnJvbTogQmVuIERvb2tzIDxiZW4uZG9va3NAY29kZXRoaW5rLmNvLnVrPgoKQXQgbGVhc3Qgc29t ZSBzeXN0ZW1zIGJlbmVmaXQgd2l0aCBsZXNzIHNjaGVkdWxpbmcgaWYgdGhlIE5BSyBjb3VudAp2 YWx1ZSBpcyBzZXQgaGlnaGVyIHRoYW4gdGhlIGRlZmF1bHQgNC4gRm9yIGluc3RhbmNlIGEgVGVn cmEzIHdpdGgKYW4gU01TQzk1MTIgc2hvd2VkIGxlc3MgaW50ZXJydXB0IGxvYWQgd2hlbiB0aGlz IHdhcyBjaGFuZ2VkIHRvIDE0LgoKVG8gYWxsb3cgdGhlIGNoYW5naW5nIG9mIHRoaXMgdmFsdWUs IGFkZCBhIHN5c2ZzIG5vZGUgdG8gZWFjaCBvZgp0aGUgY29udHJvbGxlcnMgdG8gYWxsb3cgcnVu LXRpbWUgY2hhbmdpbmcuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gRG9va3MgPGJlbi5kb29rc0Bjb2Rl dGhpbmsuY28udWs+Ci0tLQogZHJpdmVycy91c2IvaG9zdC9laGNpLWhjZC5jICAgfCAgMSArCiBk cml2ZXJzL3VzYi9ob3N0L2VoY2ktcS5jICAgICB8ICA0ICstLQogZHJpdmVycy91c2IvaG9zdC9l aGNpLXN5c2ZzLmMgfCA1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogZHJp dmVycy91c2IvaG9zdC9laGNpLmggICAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDU0IGlu c2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9z dC9laGNpLWhjZC5jIGIvZHJpdmVycy91c2IvaG9zdC9laGNpLWhjZC5jCmluZGV4IDg2MDhhYzUx M2ZiNy4uNzk5MjYyOTUxZjQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktaGNk LmMKKysrIGIvZHJpdmVycy91c2IvaG9zdC9laGNpLWhjZC5jCkBAIC01MjYsNiArNTI2LDcgQEAg c3RhdGljIGludCBlaGNpX2luaXQoc3RydWN0IHVzYl9oY2QgKmhjZCkKIAlody0+aHdfcXRkX25l eHQgPSBFSENJX0xJU1RfRU5EKGVoY2kpOwogCWVoY2ktPmFzeW5jLT5xaF9zdGF0ZSA9IFFIX1NU QVRFX0xJTktFRDsKIAlody0+aHdfYWx0X25leHQgPSBRVERfTkVYVChlaGNpLCBlaGNpLT5hc3lu Yy0+ZHVtbXktPnF0ZF9kbWEpOworCWVoY2ktPm5ha190dW5lX2hzID0gRUhDSV9UVU5FX1JMX0hT OwogCiAJLyogY2xlYXIgaW50ZXJydXB0IGVuYWJsZXMsIHNldCBpcnEgbGF0ZW5jeSAqLwogCWlm IChsb2cyX2lycV90aHJlc2ggPCAwIHx8IGxvZzJfaXJxX3RocmVzaCA+IDYpCmRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktcS5jIGIvZHJpdmVycy91c2IvaG9zdC9laGNpLXEuYwpp bmRleCAzMjc2MzA0MDU2OTUuLmNjYjc1NDg5M2I1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv aG9zdC9laGNpLXEuYworKysgYi9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktcS5jCkBAIC04OTgsMTIg Kzg5OCwxMiBAQCBxaF9tYWtlICgKIAljYXNlIFVTQl9TUEVFRF9ISUdIOgkJLyogbm8gVFQgaW52 b2x2ZWQgKi8KIAkJaW5mbzEgfD0gUUhfSElHSF9TUEVFRDsKIAkJaWYgKHR5cGUgPT0gUElQRV9D T05UUk9MKSB7Ci0JCQlpbmZvMSB8PSAoRUhDSV9UVU5FX1JMX0hTIDw8IDI4KTsKKwkJCWluZm8x IHw9IGVoY2ktPm5ha190dW5lX2hzIDw8IDI4OwogCQkJaW5mbzEgfD0gNjQgPDwgMTY7CS8qIHVz YjIgZml4ZWQgbWF4cGFja2V0ICovCiAJCQlpbmZvMSB8PSBRSF9UT0dHTEVfQ1RMOwkvKiB0b2dn bGUgZnJvbSBxdGQgKi8KIAkJCWluZm8yIHw9IChFSENJX1RVTkVfTVVMVF9IUyA8PCAzMCk7CiAJ CX0gZWxzZSBpZiAodHlwZSA9PSBQSVBFX0JVTEspIHsKLQkJCWluZm8xIHw9IChFSENJX1RVTkVf UkxfSFMgPDwgMjgpOworCQkJaW5mbzEgfD0gZWhjaS0+bmFrX3R1bmVfaHMgPDwgMjg7CiAJCQkv KiBUaGUgVVNCIHNwZWMgc2F5cyB0aGF0IGhpZ2ggc3BlZWQgYnVsayBlbmRwb2ludHMKIAkJCSAq IGFsd2F5cyB1c2UgNTEyIGJ5dGUgbWF4cGFja2V0LiAgQnV0IHNvbWUgZGV2aWNlCiAJCQkgKiB2 ZW5kb3JzIGRlY2lkZWQgdG8gaWdub3JlIHRoYXQsIGFuZCBNU0ZUIGlzIGhhcHB5CmRpZmYgLS1n aXQgYS9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktc3lzZnMuYyBiL2RyaXZlcnMvdXNiL2hvc3QvZWhj aS1zeXNmcy5jCmluZGV4IDhmNzVjYjdiMTk3Yy4uZDcxMGQzNTI4MmE2IDEwMDY0NAotLS0gYS9k cml2ZXJzL3VzYi9ob3N0L2VoY2ktc3lzZnMuYworKysgYi9kcml2ZXJzL3VzYi9ob3N0L2VoY2kt c3lzZnMuYwpAQCAtMTQ1LDE5ICsxNDUsNjYgQEAgc3RhdGljIHNzaXplX3QgdWZyYW1lX3Blcmlv ZGljX21heF9zdG9yZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiB9CiBzdGF0aWMgREVWSUNFX0FUVFJf UlcodWZyYW1lX3BlcmlvZGljX21heCk7CiAKK3N0YXRpYyBzc2l6ZV90IG5ha190dW5lX2hzX3No b3coc3RydWN0IGRldmljZSAqZGV2LAorCQkJCXN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRy LAorCQkJCWNoYXIgKmJ1ZikKK3sKKwlzdHJ1Y3QgZWhjaV9oY2QJCSplaGNpOworCisJZWhjaSA9 IGhjZF90b19laGNpKGRldl9nZXRfZHJ2ZGF0YShkZXYpKTsKKwlyZXR1cm4gc2NucHJpbnRmKGJ1 ZiwgUEFHRV9TSVpFLCAiJWRcbiIsIGVoY2ktPm5ha190dW5lX2hzKTsKK30KKworc3RhdGljIHNz aXplX3QgbmFrX3R1bmVfaHNfc3RvcmUoc3RydWN0IGRldmljZSAqZGV2LAorCQkJCQlzdHJ1Y3Qg ZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwKKwkJCQkJY29uc3QgY2hhciAqYnVmLCBzaXplX3QgY291 bnQpCit7CisJc3RydWN0IGVoY2lfaGNkCQkqZWhjaTsKKwl1bnNpZ25lZAkJdmFsOworCXVuc2ln bmVkIGxvbmcJCWZsYWdzOworCisJZWhjaSA9IGhjZF90b19laGNpKGRldl9nZXRfZHJ2ZGF0YShk ZXYpKTsKKworCWlmIChrc3RydG91aW50KGJ1ZiwgMCwgJnZhbCkgPCAwKQorCQlyZXR1cm4gLUVJ TlZBTDsKKworCWlmICh2YWwgPj0gMTUpIHsKKwkJZWhjaV9pbmZvKGVoY2ksICJpbnZhbGlkIHZh bHVlIGZvciBuYWtfdHVuZV9ocyAoJWQpXG4iLCB2YWwpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9 CisKKwlzcGluX2xvY2tfaXJxc2F2ZSAoJmVoY2ktPmxvY2ssIGZsYWdzKTsKKwllaGNpLT5uYWtf dHVuZV9ocyA9IHZhbDsKKwlzcGluX3VubG9ja19pcnFyZXN0b3JlICgmZWhjaS0+bG9jaywgZmxh Z3MpOworCXJldHVybiBjb3VudDsKK30KKworc3RhdGljIERFVklDRV9BVFRSX1JXKG5ha190dW5l X2hzKTsKIAogc3RhdGljIGlubGluZSBpbnQgY3JlYXRlX3N5c2ZzX2ZpbGVzKHN0cnVjdCBlaGNp X2hjZCAqZWhjaSkKIHsKIAlzdHJ1Y3QgZGV2aWNlCSpjb250cm9sbGVyID0gZWhjaV90b19oY2Qo ZWhjaSktPnNlbGYuY29udHJvbGxlcjsKIAlpbnQJaSA9IDA7CiAKKwlpID0gZGV2aWNlX2NyZWF0 ZV9maWxlKGNvbnRyb2xsZXIsICZkZXZfYXR0cl9uYWtfdHVuZV9ocyk7CisJaWYgKGkpCisJCWdv dG8gb3V0OworCisJaSA9IGRldmljZV9jcmVhdGVfZmlsZShjb250cm9sbGVyLCAmZGV2X2F0dHJf dWZyYW1lX3BlcmlvZGljX21heCk7CisJaWYgKGkpCisJCWdvdG8gb3V0X25hazsKKwogCS8qIHdp dGggaW50ZWdyYXRlZCBUVCB0aGVyZSBpcyBubyBjb21wYW5pb24hICovCiAJaWYgKCFlaGNpX2lz X1RESShlaGNpKSkKIAkJaSA9IGRldmljZV9jcmVhdGVfZmlsZShjb250cm9sbGVyLCAmZGV2X2F0 dHJfY29tcGFuaW9uKTsKIAlpZiAoaSkKLQkJZ290byBvdXQ7CisJCWdvdG8gb3V0X2FsbDsKIAot CWkgPSBkZXZpY2VfY3JlYXRlX2ZpbGUoY29udHJvbGxlciwgJmRldl9hdHRyX3VmcmFtZV9wZXJp b2RpY19tYXgpOworCXJldHVybiAwOworb3V0X2FsbDoKKwlkZXZpY2VfcmVtb3ZlX2ZpbGUoY29u dHJvbGxlciwgJmRldl9hdHRyX3VmcmFtZV9wZXJpb2RpY19tYXgpOworb3V0X25hazoKKwlkZXZp Y2VfcmVtb3ZlX2ZpbGUoY29udHJvbGxlciwgJmRldl9hdHRyX25ha190dW5lX2hzKTsKIG91dDoK IAlyZXR1cm4gaTsKIH0KQEAgLTE3MCw1ICsyMTcsNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcmVt b3ZlX3N5c2ZzX2ZpbGVzKHN0cnVjdCBlaGNpX2hjZCAqZWhjaSkKIAlpZiAoIWVoY2lfaXNfVERJ KGVoY2kpKQogCQlkZXZpY2VfcmVtb3ZlX2ZpbGUoY29udHJvbGxlciwgJmRldl9hdHRyX2NvbXBh bmlvbik7CiAKKwlkZXZpY2VfcmVtb3ZlX2ZpbGUoY29udHJvbGxlciwgJmRldl9hdHRyX25ha190 dW5lX2hzKTsKIAlkZXZpY2VfcmVtb3ZlX2ZpbGUoY29udHJvbGxlciwgJmRldl9hdHRyX3VmcmFt ZV9wZXJpb2RpY19tYXgpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC9laGNpLmgg Yi9kcml2ZXJzL3VzYi9ob3N0L2VoY2kuaAppbmRleCBjOGU5YTQ4ZTFkNTEuLjFmYjZmMWFkODEy OCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC9laGNpLmgKKysrIGIvZHJpdmVycy91c2Iv aG9zdC9laGNpLmgKQEAgLTE1NCw2ICsxNTQsNyBAQCBzdHJ1Y3QgZWhjaV9oY2QgewkJCS8qIG9u ZSBwZXIgY29udHJvbGxlciAqLwogCWRtYV9hZGRyX3QJCXBlcmlvZGljX2RtYTsKIAlzdHJ1Y3Qg bGlzdF9oZWFkCWludHJfcWhfbGlzdDsKIAl1bnNpZ25lZAkJaV90aHJlc2g7CS8qIHVmcmFtZXMg SEMgbWlnaHQgY2FjaGUgKi8KKwl1MzIJCQluYWtfdHVuZV9oczsKIAogCXVuaW9uIGVoY2lfc2hh ZG93CSpwc2hhZG93OwkvKiBtaXJyb3IgaHcgcGVyaW9kaWMgdGFibGUgKi8KIAlzdHJ1Y3QgbGlz dF9oZWFkCWludHJfdW5saW5rX3dhaXQ7Cg== 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT 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 0DFA4C43441 for ; Wed, 14 Nov 2018 17:50:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D39DF223DD for ; Wed, 14 Nov 2018 17:50:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D39DF223DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fluff.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733261AbeKODye (ORCPT ); Wed, 14 Nov 2018 22:54:34 -0500 Received: from cpc82359-stkp12-2-0-cust135.10-2.cable.virginm.net ([86.17.48.136]:36656 "EHLO freya" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727576AbeKODye (ORCPT ); Wed, 14 Nov 2018 22:54:34 -0500 X-Greylist: delayed 2222 seconds by postgrey-1.27 at vger.kernel.org; Wed, 14 Nov 2018 22:54:33 EST Received: from ben by freya with local (Exim 4.91) (envelope-from ) id 1gMyj8-0007B5-88; Wed, 14 Nov 2018 17:13:18 +0000 From: Ben Dooks To: stern@rowland.harvard.edu, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org Cc: linux-kernel@lists.codethink.co.uk, linux-kernel@vger.kernel.org, Ben Dooks Subject: [PATCH] USB: host: ehci: allow tine of highspeed nak-count Date: Wed, 14 Nov 2018 17:13:15 +0000 Message-Id: <20181114171315.27549-1-ben-linux@fluff.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Dooks At least some systems benefit with less scheduling if the NAK count value is set higher than the default 4. For instance a Tegra3 with an SMSC9512 showed less interrupt load when this was changed to 14. To allow the changing of this value, add a sysfs node to each of the controllers to allow run-time changing. Signed-off-by: Ben Dooks --- drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-q.c | 4 +-- drivers/usb/host/ehci-sysfs.c | 52 +++++++++++++++++++++++++++++++++-- drivers/usb/host/ehci.h | 1 + 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8608ac513fb7..799262951f41 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -526,6 +526,7 @@ static int ehci_init(struct usb_hcd *hcd) hw->hw_qtd_next = EHCI_LIST_END(ehci); ehci->async->qh_state = QH_STATE_LINKED; hw->hw_alt_next = QTD_NEXT(ehci, ehci->async->dummy->qtd_dma); + ehci->nak_tune_hs = EHCI_TUNE_RL_HS; /* clear interrupt enables, set irq latency */ if (log2_irq_thresh < 0 || log2_irq_thresh > 6) diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index 327630405695..ccb754893b5a 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c @@ -898,12 +898,12 @@ qh_make ( case USB_SPEED_HIGH: /* no TT involved */ info1 |= QH_HIGH_SPEED; if (type == PIPE_CONTROL) { - info1 |= (EHCI_TUNE_RL_HS << 28); + info1 |= ehci->nak_tune_hs << 28; info1 |= 64 << 16; /* usb2 fixed maxpacket */ info1 |= QH_TOGGLE_CTL; /* toggle from qtd */ info2 |= (EHCI_TUNE_MULT_HS << 30); } else if (type == PIPE_BULK) { - info1 |= (EHCI_TUNE_RL_HS << 28); + info1 |= ehci->nak_tune_hs << 28; /* The USB spec says that high speed bulk endpoints * always use 512 byte maxpacket. But some device * vendors decided to ignore that, and MSFT is happy diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c index 8f75cb7b197c..d710d35282a6 100644 --- a/drivers/usb/host/ehci-sysfs.c +++ b/drivers/usb/host/ehci-sysfs.c @@ -145,19 +145,66 @@ static ssize_t uframe_periodic_max_store(struct device *dev, } static DEVICE_ATTR_RW(uframe_periodic_max); +static ssize_t nak_tune_hs_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ehci_hcd *ehci; + + ehci = hcd_to_ehci(dev_get_drvdata(dev)); + return scnprintf(buf, PAGE_SIZE, "%d\n", ehci->nak_tune_hs); +} + +static ssize_t nak_tune_hs_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ehci_hcd *ehci; + unsigned val; + unsigned long flags; + + ehci = hcd_to_ehci(dev_get_drvdata(dev)); + + if (kstrtouint(buf, 0, &val) < 0) + return -EINVAL; + + if (val >= 15) { + ehci_info(ehci, "invalid value for nak_tune_hs (%d)\n", val); + return -EINVAL; + } + + spin_lock_irqsave (&ehci->lock, flags); + ehci->nak_tune_hs = val; + spin_unlock_irqrestore (&ehci->lock, flags); + return count; +} + +static DEVICE_ATTR_RW(nak_tune_hs); static inline int create_sysfs_files(struct ehci_hcd *ehci) { struct device *controller = ehci_to_hcd(ehci)->self.controller; int i = 0; + i = device_create_file(controller, &dev_attr_nak_tune_hs); + if (i) + goto out; + + i = device_create_file(controller, &dev_attr_uframe_periodic_max); + if (i) + goto out_nak; + /* with integrated TT there is no companion! */ if (!ehci_is_TDI(ehci)) i = device_create_file(controller, &dev_attr_companion); if (i) - goto out; + goto out_all; - i = device_create_file(controller, &dev_attr_uframe_periodic_max); + return 0; +out_all: + device_remove_file(controller, &dev_attr_uframe_periodic_max); +out_nak: + device_remove_file(controller, &dev_attr_nak_tune_hs); out: return i; } @@ -170,5 +217,6 @@ static inline void remove_sysfs_files(struct ehci_hcd *ehci) if (!ehci_is_TDI(ehci)) device_remove_file(controller, &dev_attr_companion); + device_remove_file(controller, &dev_attr_nak_tune_hs); device_remove_file(controller, &dev_attr_uframe_periodic_max); } diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index c8e9a48e1d51..1fb6f1ad8128 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -154,6 +154,7 @@ struct ehci_hcd { /* one per controller */ dma_addr_t periodic_dma; struct list_head intr_qh_list; unsigned i_thresh; /* uframes HC might cache */ + u32 nak_tune_hs; union ehci_shadow *pshadow; /* mirror hw periodic table */ struct list_head intr_unlink_wait; -- 2.19.1