From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39006 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751289AbeCNKt1 (ORCPT ); Wed, 14 Mar 2018 06:49:27 -0400 Date: Wed, 14 Mar 2018 11:49:25 +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 3/3] usb: host: pci: replace hardcoded renesas PCI IDs Message-ID: <20180314104925.GC32615@kroah.com> References: <20180314102933.21367-1-dev@g0hl1n.net> <20180314102933.21367-4-dev@g0hl1n.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20180314102933.21367-4-dev@g0hl1n.net> Sender: linux-pci-owner@vger.kernel.org List-ID: On Wed, Mar 14, 2018 at 11:29:33AM +0100, Richard Leitner wrote: > 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 Now this patch was fine :) Care to redo this series? 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: [3/3] usb: host: pci: replace hardcoded renesas PCI IDs From: Greg Kroah-Hartman Message-Id: <20180314104925.GC32615@kroah.com> Date: Wed, 14 Mar 2018 11:49:25 +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: T24gV2VkLCBNYXIgMTQsIDIwMTggYXQgMTE6Mjk6MzNBTSArMDEwMCwgUmljaGFyZCBMZWl0bmVy IHdyb3RlOgo+IEZyb206IFJpY2hhcmQgTGVpdG5lciA8cmljaGFyZC5sZWl0bmVyQHNraWRhdGEu Y29tPgo+IAo+IEludHJvZHVjZSBSZW5lc2FzIHVQRDcyMDIwezEsMn0gUENJIGRldmljZSBJRHMg aW4gcGNpX2lkcy5oIGFuZCByZXBsYWNlCj4gdGhlIGhhcmNvZGVkIHZhbHVlcyB3aXRoIHRoZW0u Cj4gCj4gU2lnbmVkLW9mZi1ieTogUmljaGFyZCBMZWl0bmVyIDxyaWNoYXJkLmxlaXRuZXJAc2tp ZGF0YS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvdXNiL2hvc3QvcGNpLXF1aXJrcy5jIHwgNiArKysr LS0KPiAgZHJpdmVycy91c2IvaG9zdC94aGNpLXBjaS5jICAgfCA0ICsrLS0KPiAgaW5jbHVkZS9s aW51eC9wY2lfaWRzLmggICAgICAgfCAyICsrCj4gIDMgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRp b25zKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0 L3BjaS1xdWlya3MuYyBiL2RyaXZlcnMvdXNiL2hvc3QvcGNpLXF1aXJrcy5jCj4gaW5kZXggMzlk MTYzNzI5Yjg5Li41ZTFhZDUyMzYyMmUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvaG9zdC9w Y2ktcXVpcmtzLmMKPiArKysgYi9kcml2ZXJzL3VzYi9ob3N0L3BjaS1xdWlya3MuYwo+IEBAIC0x MTcwLDcgKzExNzAsOCBAQCBzdGF0aWMgdm9pZCBxdWlya191c2JfaGFuZG9mZl94aGNpKHN0cnVj dCBwY2lfZGV2ICpwZGV2KQo+ICAJLyogQXV0byBoYW5kb2ZmIG5ldmVyIHdvcmtlZCBmb3IgdGhl c2UgZGV2aWNlcy4gRm9yY2UgaXQgYW5kIGNvbnRpbnVlICovCj4gIAlpZiAoKHBkZXYtPnZlbmRv ciA9PSBQQ0lfVkVORE9SX0lEX1RJICYmCj4gIAkgICAgIHBkZXYtPmRldmljZSA9PSBQQ0lfREVW SUNFX0lEX1RJX1RVU0I3M1gwKSB8fAo+IC0JICAgIChwZGV2LT52ZW5kb3IgPT0gUENJX1ZFTkRP Ul9JRF9SRU5FU0FTICYmIHBkZXYtPmRldmljZSA9PSAweDAwMTQpKSB7Cj4gKwkgICAgKHBkZXYt PnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1JFTkVTQVMgJiYKPiArCSAgICAgcGRldi0+ZGV2aWNl ID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3MjAyMDEpKSB7Cj4gIAkJdmFsID0gKHZhbCB8 IFhIQ0lfSENfT1NfT1dORUQpICYgflhIQ0lfSENfQklPU19PV05FRDsKPiAgCQl3cml0ZWwodmFs LCBiYXNlICsgZXh0X2NhcF9vZmZzZXQpOwo+ICAJfQo+IEBAIC0xMjgyLDcgKzEyODMsOCBAQCBi b29sIHVzYl94aGNpX25lZWRzX3BjaV9yZXNldChzdHJ1Y3QgcGNpX2RldiAqcGRldikKPiAgCSAq IHF1aXJrLCBvciB0aGUgc3lzdGVtIHdpbGwgYmUgaW4gYSByYXRoZXIgYmFkIHN0YXRlLgo+ICAJ ICovCj4gIAlpZiAocGRldi0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURfUkVORVNBUyAmJgo+IC0J ICAgIChwZGV2LT5kZXZpY2UgPT0gMHgwMDE0IHx8IHBkZXYtPmRldmljZSA9PSAweDAwMTUpKQo+ ICsJICAgIChwZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQRDcyMDIwMSB8 fAo+ICsJICAgICBwZGV2LT5kZXZpY2UgPT0gUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQRDcyMDIw MikpCj4gIAkJcmV0dXJuIHRydWU7Cj4gIAo+ICAJcmV0dXJuIGZhbHNlOwo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMgYi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNp LmMKPiBpbmRleCBhNWJmZDg5MDE5MGMuLmE0NTNlNGMzNWFjNyAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMKPiArKysgYi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNp LmMKPiBAQCAtMTg5LDEwICsxODksMTAgQEAgc3RhdGljIHZvaWQgeGhjaV9wY2lfcXVpcmtzKHN0 cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IHhoY2lfaGNkICp4aGNpKQo+ICAJCXhoY2ktPnF1aXJr cyB8PSBYSENJX0JST0tFTl9TVFJFQU1TOwo+ICAJfQo+ICAJaWYgKHBkZXYtPnZlbmRvciA9PSBQ Q0lfVkVORE9SX0lEX1JFTkVTQVMgJiYKPiAtCQkJcGRldi0+ZGV2aWNlID09IDB4MDAxNCkKPiAr CQkJcGRldi0+ZGV2aWNlID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3MjAyMDEpCj4gIAkJ eGhjaS0+cXVpcmtzIHw9IFhIQ0lfVFJVU1RfVFhfTEVOR1RIOwo+ICAJaWYgKHBkZXYtPnZlbmRv ciA9PSBQQ0lfVkVORE9SX0lEX1JFTkVTQVMgJiYKPiAtCQkJcGRldi0+ZGV2aWNlID09IDB4MDAx NSkKPiArCQkJcGRldi0+ZGV2aWNlID09IFBDSV9ERVZJQ0VfSURfUkVORVNBU19VUEQ3MjAyMDIp Cj4gIAkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfUkVTRVRfT05fUkVTVU1FOwo+ICAJaWYgKHBkZXYt PnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX1ZJQSkKPiAgCQl4aGNpLT5xdWlya3MgfD0gWEhDSV9S RVNFVF9PTl9SRVNVTUU7Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvcGNpX2lkcy5oIGIv aW5jbHVkZS9saW51eC9wY2lfaWRzLmgKPiBpbmRleCBkMjNhOTc4NjhkZWUuLmViNTJmMGU5YjY1 MSAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaAo+ICsrKyBiL2luY2x1ZGUv bGludXgvcGNpX2lkcy5oCj4gQEAgLTI0MjcsNiArMjQyNyw4IEBACj4gICNkZWZpbmUgUENJX0RF VklDRV9JRF9SRU5FU0FTX1NINzc2MwkweDAwMDQKPiAgI2RlZmluZSBQQ0lfREVWSUNFX0lEX1JF TkVTQVNfU0g3Nzg1CTB4MDAwNwo+ICAjZGVmaW5lIFBDSV9ERVZJQ0VfSURfUkVORVNBU19TSDc3 ODYJMHgwMDEwCj4gKyNkZWZpbmUgUENJX0RFVklDRV9JRF9SRU5FU0FTX1VQRDcyMDIwMQkweDAw MTQKPiArI2RlZmluZSBQQ0lfREVWSUNFX0lEX1JFTkVTQVNfVVBENzIwMjAyCTB4MDAxNQoKTm93 IHRoaXMgcGF0Y2ggd2FzIGZpbmUgOikKCkNhcmUgdG8gcmVkbyB0aGlzIHNlcmllcz8KCnRoYW5r cywKCmdyZWcgay1oCi0tLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUg bGluZSAidW5zdWJzY3JpYmUgbGludXgtdXNiIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8g bWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8v dmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwK