From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38504 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751370AbeCNKsX (ORCPT ); Wed, 14 Mar 2018 06:48:23 -0400 Date: Wed, 14 Mar 2018 11:48:21 +0100 From: Greg KH To: Richard Leitner Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, mathias.nyman@intel.com, bhelgaas@google.com, richard.leitner@skidata.com Subject: Re: [PATCH 1/3] usb: host: pci: use existing Intel PCI ID macros Message-ID: <20180314104821.GA32615@kroah.com> References: <20180314102933.21367-1-dev@g0hl1n.net> <20180314102933.21367-2-dev@g0hl1n.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20180314102933.21367-2-dev@g0hl1n.net> Sender: linux-pci-owner@vger.kernel.org List-ID: On Wed, Mar 14, 2018 at 11:29:31AM +0100, Richard Leitner wrote: > From: Richard Leitner > > Instead of the hardcoded hexadecimal PCI IDs use the existing macros > from pci_ids.h for Intel IDs. You also did something else in this patch, yet failed to mention it here: > Signed-off-by: Richard Leitner > --- > drivers/usb/host/pci-quirks.c | 10 +++++----- > drivers/usb/host/xhci-pci.c | 3 ++- > include/linux/pci_ids.h | 1 + > 3 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c > index 67ad4bb6919a..4f4a9f36a68e 100644 > --- a/drivers/usb/host/pci-quirks.c > +++ b/drivers/usb/host/pci-quirks.c > @@ -858,8 +858,8 @@ static void ehci_bios_handoff(struct pci_dev *pdev, > * > * The HASEE E200 hangs when the semaphore is set (bugzilla #77021). > */ > - if (pdev->vendor == 0x8086 && (pdev->device == 0x283a || > - pdev->device == 0x27cc)) { > + if (pdev->vendor == PCI_VENDOR_ID_INTEL && > + (pdev->device == 0x283a || pdev->device == 0x27cc)) { > if (dmi_check_system(ehci_dmi_nohandoff_table)) > try_handoff = 0; > } > @@ -1168,9 +1168,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) > val = readl(base + ext_cap_offset); > > /* Auto handoff never worked for these devices. Force it and continue */ > - if ((pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241) || > - (pdev->vendor == PCI_VENDOR_ID_RENESAS > - && pdev->device == 0x0014)) { > + if ((pdev->vendor == PCI_VENDOR_ID_TI && > + pdev->device == PCI_DEVICE_ID_TI_TUSB73X0) || > + (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0014)) { > val = (val | XHCI_HC_OS_OWNED) & ~XHCI_HC_BIOS_OWNED; > writel(val, base + ext_cap_offset); > } > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 5262fa571a5d..a5bfd890190c 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -213,7 +213,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) > pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) > xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL; > > - if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241) > + if (pdev->vendor == PCI_VENDOR_ID_TI && > + pdev->device == PCI_DEVICE_ID_TI_TUSB73X0) > xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7; > > if (xhci->quirks & XHCI_RESET_ON_RESUME) > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index a6b30667a331..e8d1af82a688 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -838,6 +838,7 @@ > #define PCI_DEVICE_ID_TI_XX12 0x8039 > #define PCI_DEVICE_ID_TI_XX12_FM 0x803b > #define PCI_DEVICE_ID_TI_XIO2000A 0x8231 > +#define PCI_DEVICE_ID_TI_TUSB73X0 0x8241 You shared a TI device id. Please break this up into 2 patches. 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: [1/3] usb: host: pci: use existing Intel PCI ID macros From: Greg Kroah-Hartman Message-Id: <20180314104821.GA32615@kroah.com> Date: Wed, 14 Mar 2018 11:48:21 +0100 To: Richard Leitner Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, mathias.nyman@intel.com, bhelgaas@google.com, richard.leitner@skidata.com List-ID: T24gV2VkLCBNYXIgMTQsIDIwMTggYXQgMTE6Mjk6MzFBTSArMDEwMCwgUmljaGFyZCBMZWl0bmVy IHdyb3RlOgo+IEZyb206IFJpY2hhcmQgTGVpdG5lciA8cmljaGFyZC5sZWl0bmVyQHNraWRhdGEu Y29tPgo+IAo+IEluc3RlYWQgb2YgdGhlIGhhcmRjb2RlZCBoZXhhZGVjaW1hbCBQQ0kgSURzIHVz ZSB0aGUgZXhpc3RpbmcgbWFjcm9zCj4gZnJvbSBwY2lfaWRzLmggZm9yIEludGVsIElEcy4KCgpZ b3UgYWxzbyBkaWQgc29tZXRoaW5nIGVsc2UgaW4gdGhpcyBwYXRjaCwgeWV0IGZhaWxlZCB0byBt ZW50aW9uIGl0CmhlcmU6Cgo+IFNpZ25lZC1vZmYtYnk6IFJpY2hhcmQgTGVpdG5lciA8cmljaGFy ZC5sZWl0bmVyQHNraWRhdGEuY29tPgo+IC0tLQo+ICBkcml2ZXJzL3VzYi9ob3N0L3BjaS1xdWly a3MuYyB8IDEwICsrKysrLS0tLS0KPiAgZHJpdmVycy91c2IvaG9zdC94aGNpLXBjaS5jICAgfCAg MyArKy0KPiAgaW5jbHVkZS9saW51eC9wY2lfaWRzLmggICAgICAgfCAgMSArCj4gIDMgZmlsZXMg Y2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L3BjaS1xdWlya3MuYyBiL2RyaXZlcnMvdXNiL2hvc3QvcGNpLXF1 aXJrcy5jCj4gaW5kZXggNjdhZDRiYjY5MTlhLi40ZjRhOWYzNmE2OGUgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy91c2IvaG9zdC9wY2ktcXVpcmtzLmMKPiArKysgYi9kcml2ZXJzL3VzYi9ob3N0L3Bj aS1xdWlya3MuYwo+IEBAIC04NTgsOCArODU4LDggQEAgc3RhdGljIHZvaWQgZWhjaV9iaW9zX2hh bmRvZmYoc3RydWN0IHBjaV9kZXYgKnBkZXYsCj4gIAkgKgo+ICAJICogVGhlIEhBU0VFIEUyMDAg aGFuZ3Mgd2hlbiB0aGUgc2VtYXBob3JlIGlzIHNldCAoYnVnemlsbGEgIzc3MDIxKS4KPiAgCSAq Lwo+IC0JaWYgKHBkZXYtPnZlbmRvciA9PSAweDgwODYgJiYgKHBkZXYtPmRldmljZSA9PSAweDI4 M2EgfHwKPiAtCQkJcGRldi0+ZGV2aWNlID09IDB4MjdjYykpIHsKPiArCWlmIChwZGV2LT52ZW5k b3IgPT0gUENJX1ZFTkRPUl9JRF9JTlRFTCAmJgo+ICsJICAgIChwZGV2LT5kZXZpY2UgPT0gMHgy ODNhIHx8IHBkZXYtPmRldmljZSA9PSAweDI3Y2MpKSB7Cj4gIAkJaWYgKGRtaV9jaGVja19zeXN0 ZW0oZWhjaV9kbWlfbm9oYW5kb2ZmX3RhYmxlKSkKPiAgCQkJdHJ5X2hhbmRvZmYgPSAwOwo+ICAJ fQo+IEBAIC0xMTY4LDkgKzExNjgsOSBAQCBzdGF0aWMgdm9pZCBxdWlya191c2JfaGFuZG9mZl94 aGNpKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ICAJdmFsID0gcmVhZGwoYmFzZSArIGV4dF9jYXBf b2Zmc2V0KTsKPiAgCj4gIAkvKiBBdXRvIGhhbmRvZmYgbmV2ZXIgd29ya2VkIGZvciB0aGVzZSBk ZXZpY2VzLiBGb3JjZSBpdCBhbmQgY29udGludWUgKi8KPiAtCWlmICgocGRldi0+dmVuZG9yID09 IFBDSV9WRU5ET1JfSURfVEkgJiYgcGRldi0+ZGV2aWNlID09IDB4ODI0MSkgfHwKPiAtCQkJKHBk ZXYtPnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1JFTkVTQVMKPiAtCQkJICYmIHBkZXYtPmRldmlj ZSA9PSAweDAwMTQpKSB7Cj4gKwlpZiAoKHBkZXYtPnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1RJ ICYmCj4gKwkgICAgIHBkZXYtPmRldmljZSA9PSBQQ0lfREVWSUNFX0lEX1RJX1RVU0I3M1gwKSB8 fAo+ICsJICAgIChwZGV2LT52ZW5kb3IgPT0gUENJX1ZFTkRPUl9JRF9SRU5FU0FTICYmIHBkZXYt PmRldmljZSA9PSAweDAwMTQpKSB7Cj4gIAkJdmFsID0gKHZhbCB8IFhIQ0lfSENfT1NfT1dORUQp ICYgflhIQ0lfSENfQklPU19PV05FRDsKPiAgCQl3cml0ZWwodmFsLCBiYXNlICsgZXh0X2NhcF9v ZmZzZXQpOwo+ICAJfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMg Yi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMKPiBpbmRleCA1MjYyZmE1NzFhNWQuLmE1YmZk ODkwMTkwYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMKPiArKysg Yi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMKPiBAQCAtMjEzLDcgKzIxMyw4IEBAIHN0YXRp YyB2b2lkIHhoY2lfcGNpX3F1aXJrcyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCB4aGNpX2hj ZCAqeGhjaSkKPiAgCQlwZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9BU01FRElBXzEwNDJB X1hIQ0kpCj4gIAkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfQVNNRURJQV9NT0RJRllfRkxPV0NPTlRS T0w7Cj4gIAo+IC0JaWYgKHBkZXYtPnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1RJICYmIHBkZXYt PmRldmljZSA9PSAweDgyNDEpCj4gKwlpZiAocGRldi0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURf VEkgJiYKPiArCSAgICBwZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9USV9UVVNCNzNYMCkK PiAgCQl4aGNpLT5xdWlya3MgfD0gWEhDSV9MSU1JVF9FTkRQT0lOVF9JTlRFUlZBTF83Owo+ICAK PiAgCWlmICh4aGNpLT5xdWlya3MgJiBYSENJX1JFU0VUX09OX1JFU1VNRSkKPiBkaWZmIC0tZ2l0 IGEvaW5jbHVkZS9saW51eC9wY2lfaWRzLmggYi9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaAo+IGlu ZGV4IGE2YjMwNjY3YTMzMS4uZThkMWFmODJhNjg4IDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvbGlu dXgvcGNpX2lkcy5oCj4gKysrIGIvaW5jbHVkZS9saW51eC9wY2lfaWRzLmgKPiBAQCAtODM4LDYg KzgzOCw3IEBACj4gICNkZWZpbmUgUENJX0RFVklDRV9JRF9USV9YWDEyCQkweDgwMzkKPiAgI2Rl ZmluZSBQQ0lfREVWSUNFX0lEX1RJX1hYMTJfRk0JMHg4MDNiCj4gICNkZWZpbmUgUENJX0RFVklD RV9JRF9USV9YSU8yMDAwQQkweDgyMzEKPiArI2RlZmluZSBQQ0lfREVWSUNFX0lEX1RJX1RVU0I3 M1gwCTB4ODI0MQoKWW91IHNoYXJlZCBhIFRJIGRldmljZSBpZC4KClBsZWFzZSBicmVhayB0aGlz IHVwIGludG8gMiBwYXRjaGVzLgoKdGhhbmtzLAoKZ3JlZyBrLWgKLS0tClRvIHVuc3Vic2NyaWJl IGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2IiIGlu CnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUg bWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8u aHRtbAo=