From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELv3Zj7isGcYkl2pZ60BM2A7CQY+qfGYp8cKSQxz4EuFWAkJsUIr4MTgTNXqJLanNxdbrRm6 ARC-Seal: i=1; a=rsa-sha256; t=1521023398; cv=none; d=google.com; s=arc-20160816; b=I9zEc5XzMvxUF1VTPP485JyYk3ypCZME5s5UNKT1nOggYsR4+XTEKxJrxfSmd2hXIK KyIVWAgpBsm9bRbuuNmgbBUu0sYfuHRN5mdJebRKqpZ8otwKWpix9/1d2f7FfOdljWaY pi4JtsrnzxpFtMk1Jy54Smgyp6TZPYrbREQSLh1CGe6n84yRjB2olV+1PhavOJflRE3p LbaGp4ByxQwTZ5kSfCC2/ZtJGdwD6SzQR2b+jAMpTCLZRY4U7yrj6i8/bmU7++OXdPDl b3J+piBfZ8KcU1Aqus08blLtiQDgcfz6L3KBYrbi734g5rSW90WgTVsH5V1F0cmy7FCy 585g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=XX5qrnja7q32g4MtAzLuKah7aRupCwOxUm4yzZnYMYo=; b=uEi3kyJhwh12HlYijO6Y7Cj+73H8OILBSRqqfuY0EAWg8qytcDIS0Fl58RoNXcnyx2 fKvcd5vcT6Lg1tLFEk8sFsGudH3c3+wXfJDBmnvPWEGY//Vi8WR/ZCgq1SInVNFd9G4W Uq/wGZw6RDyHsfbPEiorv5I7WCrSA3rLeQiuAWmVTJKwE4wjyfnFdLjGSTaC6CA7fnwY z9S1Mq0Bivp2Bx4eF2jdjkk8/m00OM9DOtg+/jPiljcZyUbKE90WHeKDcnnZNv+0E//Q pUFLbJDThHn85+uaf5oZvljiqAbfqpfU98vwDv5OI3Ykvu4uOW67C8jN0azhbbKQ0A/+ 2E3g== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 109.237.142.231 is neither permitted nor denied by best guess record for domain of dev@g0hl1n.net) smtp.mailfrom=dev@g0hl1n.net Authentication-Results: mx.google.com; spf=neutral (google.com: 109.237.142.231 is neither permitted nor denied by best guess record for domain of dev@g0hl1n.net) smtp.mailfrom=dev@g0hl1n.net X-Spam-DCC: : From: Richard Leitner To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Cc: gregkh@linuxfoundation.org, mathias.nyman@intel.com, bhelgaas@google.com, richard.leitner@skidata.com Subject: [PATCH 3/3] usb: host: pci: replace hardcoded renesas PCI IDs Date: Wed, 14 Mar 2018 11:29:33 +0100 Message-Id: <20180314102933.21367-4-dev@g0hl1n.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180314102933.21367-1-dev@g0hl1n.net> References: <20180314102933.21367-1-dev@g0hl1n.net> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594908630617691660?= X-GMAIL-MSGID: =?utf-8?q?1594908630617691660?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Richard Leitner Introduce Renesas uPD72020{1,2} PCI device IDs in pci_ids.h and replace the harcoded values with them. Signed-off-by: Richard Leitner --- drivers/usb/host/pci-quirks.c | 6 ++++-- drivers/usb/host/xhci-pci.c | 4 ++-- include/linux/pci_ids.h | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 39d163729b89..5e1ad523622e 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -1170,7 +1170,8 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) /* Auto handoff never worked for these devices. Force it and continue */ if ((pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == PCI_DEVICE_ID_TI_TUSB73X0) || - (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0014)) { + (pdev->vendor == PCI_VENDOR_ID_RENESAS && + pdev->device == PCI_DEVICE_ID_RENESAS_UPD720201)) { val = (val | XHCI_HC_OS_OWNED) & ~XHCI_HC_BIOS_OWNED; writel(val, base + ext_cap_offset); } @@ -1282,7 +1283,8 @@ bool usb_xhci_needs_pci_reset(struct pci_dev *pdev) * quirk, or the system will be in a rather bad state. */ if (pdev->vendor == PCI_VENDOR_ID_RENESAS && - (pdev->device == 0x0014 || pdev->device == 0x0015)) + (pdev->device == PCI_DEVICE_ID_RENESAS_UPD720201 || + pdev->device == PCI_DEVICE_ID_RENESAS_UPD720202)) return true; return false; diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index a5bfd890190c..a453e4c35ac7 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -189,10 +189,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_BROKEN_STREAMS; } if (pdev->vendor == PCI_VENDOR_ID_RENESAS && - pdev->device == 0x0014) + pdev->device == PCI_DEVICE_ID_RENESAS_UPD720201) xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_RENESAS && - pdev->device == 0x0015) + pdev->device == PCI_DEVICE_ID_RENESAS_UPD720202) xhci->quirks |= XHCI_RESET_ON_RESUME; if (pdev->vendor == PCI_VENDOR_ID_VIA) xhci->quirks |= XHCI_RESET_ON_RESUME; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d23a97868dee..eb52f0e9b651 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2427,6 +2427,8 @@ #define PCI_DEVICE_ID_RENESAS_SH7763 0x0004 #define PCI_DEVICE_ID_RENESAS_SH7785 0x0007 #define PCI_DEVICE_ID_RENESAS_SH7786 0x0010 +#define PCI_DEVICE_ID_RENESAS_UPD720201 0x0014 +#define PCI_DEVICE_ID_RENESAS_UPD720202 0x0015 #define PCI_VENDOR_ID_SOLARFLARE 0x1924 #define PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0 0x0703 -- 2.11.0 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: [3/3] usb: host: pci: replace hardcoded renesas PCI IDs From: Richard Leitner Message-Id: <20180314102933.21367-4-dev@g0hl1n.net> Date: Wed, 14 Mar 2018 11:29:33 +0100 To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Cc: gregkh@linuxfoundation.org, mathias.nyman@intel.com, bhelgaas@google.com, richard.leitner@skidata.com List-ID: RnJvbTogUmljaGFyZCBMZWl0bmVyIDxyaWNoYXJkLmxlaXRuZXJAc2tpZGF0YS5jb20+CgpJbnRy b2R1Y2UgUmVuZXNhcyB1UEQ3MjAyMHsxLDJ9IFBDSSBkZXZpY2UgSURzIGluIHBjaV9pZHMuaCBh bmQgcmVwbGFjZQp0aGUgaGFyY29kZWQgdmFsdWVzIHdpdGggdGhlbS4KClNpZ25lZC1vZmYtYnk6 IFJpY2hhcmQgTGVpdG5lciA8cmljaGFyZC5sZWl0bmVyQHNraWRhdGEuY29tPgotLS0KIGRyaXZl cnMvdXNiL2hvc3QvcGNpLXF1aXJrcy5jIHwgNiArKysrLS0KIGRyaXZlcnMvdXNiL2hvc3QveGhj aS1wY2kuYyAgIHwgNCArKy0tCiBpbmNsdWRlL2xpbnV4L3BjaV9pZHMuaCAgICAgICB8IDIgKysK IDMgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QvcGNpLXF1aXJrcy5jIGIvZHJpdmVycy91c2IvaG9zdC9w Y2ktcXVpcmtzLmMKaW5kZXggMzlkMTYzNzI5Yjg5Li41ZTFhZDUyMzYyMmUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvdXNiL2hvc3QvcGNpLXF1aXJrcy5jCisrKyBiL2RyaXZlcnMvdXNiL2hvc3QvcGNp LXF1aXJrcy5jCkBAIC0xMTcwLDcgKzExNzAsOCBAQCBzdGF0aWMgdm9pZCBxdWlya191c2JfaGFu ZG9mZl94aGNpKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCS8qIEF1dG8gaGFuZG9mZiBuZXZlciB3 b3JrZWQgZm9yIHRoZXNlIGRldmljZXMuIEZvcmNlIGl0IGFuZCBjb250aW51ZSAqLwogCWlmICgo cGRldi0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURfVEkgJiYKIAkgICAgIHBkZXYtPmRldmljZSA9 PSBQQ0lfREVWSUNFX0lEX1RJX1RVU0I3M1gwKSB8fAotCSAgICAocGRldi0+dmVuZG9yID09IFBD SV9WRU5ET1JfSURfUkVORVNBUyAmJiBwZGV2LT5kZXZpY2UgPT0gMHgwMDE0KSkgeworCSAgICAo cGRldi0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURfUkVORVNBUyAmJgorCSAgICAgcGRldi0+ZGV2 aWNlID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3MjAyMDEpKSB7CiAJCXZhbCA9ICh2YWwg fCBYSENJX0hDX09TX09XTkVEKSAmIH5YSENJX0hDX0JJT1NfT1dORUQ7CiAJCXdyaXRlbCh2YWws IGJhc2UgKyBleHRfY2FwX29mZnNldCk7CiAJfQpAQCAtMTI4Miw3ICsxMjgzLDggQEAgYm9vbCB1 c2JfeGhjaV9uZWVkc19wY2lfcmVzZXQoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJICogcXVpcmss IG9yIHRoZSBzeXN0ZW0gd2lsbCBiZSBpbiBhIHJhdGhlciBiYWQgc3RhdGUuCiAJICovCiAJaWYg KHBkZXYtPnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1JFTkVTQVMgJiYKLQkgICAgKHBkZXYtPmRl dmljZSA9PSAweDAwMTQgfHwgcGRldi0+ZGV2aWNlID09IDB4MDAxNSkpCisJICAgIChwZGV2LT5k ZXZpY2UgPT0gUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQRDcyMDIwMSB8fAorCSAgICAgcGRldi0+ ZGV2aWNlID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3MjAyMDIpKQogCQlyZXR1cm4gdHJ1 ZTsKIAogCXJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1w Y2kuYyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wY2kuYwppbmRleCBhNWJmZDg5MDE5MGMuLmE0 NTNlNGMzNWFjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC94aGNpLXBjaS5jCisrKyBi L2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wY2kuYwpAQCAtMTg5LDEwICsxODksMTAgQEAgc3RhdGlj IHZvaWQgeGhjaV9wY2lfcXVpcmtzKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IHhoY2lfaGNk ICp4aGNpKQogCQl4aGNpLT5xdWlya3MgfD0gWEhDSV9CUk9LRU5fU1RSRUFNUzsKIAl9CiAJaWYg KHBkZXYtPnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1JFTkVTQVMgJiYKLQkJCXBkZXYtPmRldmlj ZSA9PSAweDAwMTQpCisJCQlwZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQ RDcyMDIwMSkKIAkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfVFJVU1RfVFhfTEVOR1RIOwogCWlmIChw ZGV2LT52ZW5kb3IgPT0gUENJX1ZFTkRPUl9JRF9SRU5FU0FTICYmCi0JCQlwZGV2LT5kZXZpY2Ug PT0gMHgwMDE1KQorCQkJcGRldi0+ZGV2aWNlID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3 MjAyMDIpCiAJCXhoY2ktPnF1aXJrcyB8PSBYSENJX1JFU0VUX09OX1JFU1VNRTsKIAlpZiAocGRl di0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURfVklBKQogCQl4aGNpLT5xdWlya3MgfD0gWEhDSV9S RVNFVF9PTl9SRVNVTUU7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaCBiL2lu Y2x1ZGUvbGludXgvcGNpX2lkcy5oCmluZGV4IGQyM2E5Nzg2OGRlZS4uZWI1MmYwZTliNjUxIDEw MDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaAorKysgYi9pbmNsdWRlL2xpbnV4L3Bj aV9pZHMuaApAQCAtMjQyNyw2ICsyNDI3LDggQEAKICNkZWZpbmUgUENJX0RFVklDRV9JRF9SRU5F U0FTX1NINzc2MwkweDAwMDQKICNkZWZpbmUgUENJX0RFVklDRV9JRF9SRU5FU0FTX1NINzc4NQkw eDAwMDcKICNkZWZpbmUgUENJX0RFVklDRV9JRF9SRU5FU0FTX1NINzc4NgkweDAwMTAKKyNkZWZp bmUgUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQRDcyMDIwMQkweDAwMTQKKyNkZWZpbmUgUENJX0RF VklDRV9JRF9SRU5FU0FTX1VQRDcyMDIwMgkweDAwMTUKIAogI2RlZmluZSBQQ0lfVkVORE9SX0lE X1NPTEFSRkxBUkUJMHgxOTI0CiAjZGVmaW5lIFBDSV9ERVZJQ0VfSURfU09MQVJGTEFSRV9TRkM0 MDAwQV8wCTB4MDcwMwo=