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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 E7D5EECDFBB for ; Fri, 20 Jul 2018 14:39:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB01D206B7 for ; Fri, 20 Jul 2018 14:39:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB01D206B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com 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 S1731941AbeGTP2O (ORCPT ); Fri, 20 Jul 2018 11:28:14 -0400 Received: from mga14.intel.com ([192.55.52.115]:11707 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731244AbeGTP2N (ORCPT ); Fri, 20 Jul 2018 11:28:13 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2018 07:39:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,379,1526367600"; d="scan'208";a="217655388" Received: from mattu-haswell.fi.intel.com (HELO [10.237.72.164]) ([10.237.72.164]) by orsmga004.jf.intel.com with ESMTP; 20 Jul 2018 07:39:36 -0700 Subject: Re: [PATCH] usb: host: xhci-plat: Iterate over parent nodes for finding quirks To: Anurag Kumar Vulisha , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org References: <1528212056-28390-1-git-send-email-anurag.kumar.vulisha@xilinx.com> From: Mathias Nyman Message-ID: Date: Fri, 20 Jul 2018 17:42:30 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1528212056-28390-1-git-send-email-anurag.kumar.vulisha@xilinx.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sorry about the delay with this patch, I have a couple comments inline. On 05.06.2018 18:20, Anurag Kumar Vulisha wrote: > In xhci_plat_probe() both sysdev and pdev->dev are being used > for finding quirks. There are some drivers(like dwc3 host.c) > which adds quirks(like usb3-lpm-capable) into pdev and the logic > present in xhci_plat_probe() checks for quirks in either sysdev > or pdev for finding the quirks. Because of this logic, some of > the quirks are getting missed(usb3-lpm-capable quirk added by dwc3 > host.c driver is getting missed).This patch fixes this by iterating > over all the available parents for finding the quirks. In this way > all the quirks which are present in child or parent are correctly > updated. > > Signed-off-by: Anurag Kumar Vulisha > --- > drivers/usb/host/xhci-plat.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index c1b22fc..0cd0489 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -152,7 +152,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > { > const struct xhci_plat_priv *priv_match; > const struct hc_driver *driver; > - struct device *sysdev; > + struct device *sysdev, *tmpdev; > struct xhci_hcd *xhci; > struct resource *res; > struct usb_hcd *hcd; > @@ -272,19 +272,26 @@ static int xhci_plat_probe(struct platform_device *pdev) > goto disable_clk; > } > > - if (device_property_read_bool(sysdev, "usb2-lpm-disable")) > - xhci->quirks |= XHCI_HW_LPM_DISABLE; > + /* Iterate over all parent nodes for finding quirks */ > + for (tmpdev = &pdev->dev; tmpdev; tmpdev = tmpdev->parent) { Isn't sysdev at this point the topmost device that can have any of those device properties set? We could loop from &pdev->dev up to and including sysdev. It doesn't matter much but maybe avoid walking some extra parents. > > - if (device_property_read_bool(sysdev, "usb3-lpm-capable")) > - xhci->quirks |= XHCI_LPM_SUPPORT; > + if (device_property_read_bool(tmpdev, "usb2-lpm-disable")) > + xhci->quirks |= XHCI_HW_LPM_DISABLE; > > - if (device_property_read_bool(&pdev->dev, "quirk-broken-port-ped")) > - xhci->quirks |= XHCI_BROKEN_PORT_PED; > + if (device_property_read_bool(tmpdev, "usb3-lpm-capable")) > + xhci->quirks |= XHCI_LPM_SUPPORT; > > - /* imod_interval is the interrupt moderation value in nanoseconds. */ > - xhci->imod_interval = 40000; Setting the default imod_interval could be moved before the for() loop > - device_property_read_u32(sysdev, "imod-interval-ns", > - &xhci->imod_interval); > + if (device_property_read_bool(tmpdev, "quirk-broken-port-ped")) > + xhci->quirks |= XHCI_BROKEN_PORT_PED; > + > + /* > + * imod_interval is the interrupt moderation > + * value in nanoseconds. > + */ > + xhci->imod_interval = 40000; > + device_property_read_u32(tmpdev, "imod-interval-ns", > + &xhci->imod_interval); > + } > > hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 0); > if (IS_ERR(hcd->usb_phy)) { > Otherwise everything looks fine. I will unfortunately be away again for another two weeks. -Mathias 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: xhci-plat: Iterate over parent nodes for finding quirks From: Mathias Nyman Message-Id: Date: Fri, 20 Jul 2018 17:42:30 +0300 To: Anurag Kumar Vulisha , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: SGkKClNvcnJ5IGFib3V0IHRoZSBkZWxheSB3aXRoIHRoaXMgcGF0Y2gsCkkgaGF2ZSBhIGNvdXBs ZSBjb21tZW50cyBpbmxpbmUuCgpPbiAwNS4wNi4yMDE4IDE4OjIwLCBBbnVyYWcgS3VtYXIgVnVs aXNoYSB3cm90ZToKPiBJbiB4aGNpX3BsYXRfcHJvYmUoKSBib3RoIHN5c2RldiBhbmQgcGRldi0+ ZGV2IGFyZSBiZWluZyB1c2VkCj4gZm9yIGZpbmRpbmcgcXVpcmtzLiBUaGVyZSBhcmUgc29tZSBk cml2ZXJzKGxpa2UgZHdjMyBob3N0LmMpCj4gd2hpY2ggYWRkcyBxdWlya3MobGlrZSB1c2IzLWxw bS1jYXBhYmxlKSBpbnRvIHBkZXYgYW5kIHRoZSBsb2dpYwo+IHByZXNlbnQgaW4geGhjaV9wbGF0 X3Byb2JlKCkgY2hlY2tzIGZvciBxdWlya3MgaW4gZWl0aGVyIHN5c2Rldgo+IG9yIHBkZXYgZm9y IGZpbmRpbmcgdGhlIHF1aXJrcy4gQmVjYXVzZSBvZiB0aGlzIGxvZ2ljLCBzb21lIG9mCj4gdGhl IHF1aXJrcyBhcmUgZ2V0dGluZyBtaXNzZWQodXNiMy1scG0tY2FwYWJsZSBxdWlyayBhZGRlZCBi eSBkd2MzCj4gaG9zdC5jIGRyaXZlciBpcyBnZXR0aW5nIG1pc3NlZCkuVGhpcyBwYXRjaCBmaXhl cyB0aGlzIGJ5IGl0ZXJhdGluZwo+IG92ZXIgYWxsIHRoZSBhdmFpbGFibGUgcGFyZW50cyBmb3Ig ZmluZGluZyB0aGUgcXVpcmtzLiBJbiB0aGlzIHdheQo+IGFsbCB0aGUgcXVpcmtzIHdoaWNoIGFy ZSBwcmVzZW50IGluIGNoaWxkIG9yIHBhcmVudCBhcmUgY29ycmVjdGx5Cj4gdXBkYXRlZC4KPiAK PiBTaWduZWQtb2ZmLWJ5OiBBbnVyYWcgS3VtYXIgVnVsaXNoYSA8YW51cmFnLmt1bWFyLnZ1bGlz aGFAeGlsaW54LmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMgfCAy OSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDE4IGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Vz Yi9ob3N0L3hoY2ktcGxhdC5jIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLXBsYXQuYwo+IGluZGV4 IGMxYjIyZmMuLjBjZDA0ODkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvaG9zdC94aGNpLXBs YXQuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMKPiBAQCAtMTUyLDcgKzE1 Miw3IEBAIHN0YXRpYyBpbnQgeGhjaV9wbGF0X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCj4gICB7Cj4gICAJY29uc3Qgc3RydWN0IHhoY2lfcGxhdF9wcml2ICpwcml2X21hdGNo Owo+ICAgCWNvbnN0IHN0cnVjdCBoY19kcml2ZXIJKmRyaXZlcjsKPiAtCXN0cnVjdCBkZXZpY2UJ CSpzeXNkZXY7Cj4gKwlzdHJ1Y3QgZGV2aWNlCQkqc3lzZGV2LCAqdG1wZGV2Owo+ICAgCXN0cnVj dCB4aGNpX2hjZAkJKnhoY2k7Cj4gICAJc3RydWN0IHJlc291cmNlICAgICAgICAgKnJlczsKPiAg IAlzdHJ1Y3QgdXNiX2hjZAkJKmhjZDsKPiBAQCAtMjcyLDE5ICsyNzIsMjYgQEAgc3RhdGljIGlu dCB4aGNpX3BsYXRfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiAgIAkJZ290 byBkaXNhYmxlX2NsazsKPiAgIAl9Cj4gICAKPiAtCWlmIChkZXZpY2VfcHJvcGVydHlfcmVhZF9i b29sKHN5c2RldiwgInVzYjItbHBtLWRpc2FibGUiKSkKPiAtCQl4aGNpLT5xdWlya3MgfD0gWEhD SV9IV19MUE1fRElTQUJMRTsKPiArCS8qIEl0ZXJhdGUgb3ZlciBhbGwgcGFyZW50IG5vZGVzIGZv ciBmaW5kaW5nIHF1aXJrcyAqLwo+ICsJZm9yICh0bXBkZXYgPSAmcGRldi0+ZGV2OyB0bXBkZXY7 IHRtcGRldiA9IHRtcGRldi0+cGFyZW50KSB7CgpJc24ndCBzeXNkZXYgYXQgdGhpcyBwb2ludCB0 aGUgdG9wbW9zdCBkZXZpY2UgdGhhdCBjYW4gaGF2ZSBhbnkgb2YgdGhvc2UKZGV2aWNlIHByb3Bl cnRpZXMgc2V0PwpXZSBjb3VsZCBsb29wIGZyb20gJnBkZXYtPmRldiB1cCB0byBhbmQgaW5jbHVk aW5nIHN5c2Rldi4KCkl0IGRvZXNuJ3QgbWF0dGVyIG11Y2ggYnV0IG1heWJlIGF2b2lkIHdhbGtp bmcgc29tZSBleHRyYSBwYXJlbnRzLgogICAKPiAgIAo+IC0JaWYgKGRldmljZV9wcm9wZXJ0eV9y ZWFkX2Jvb2woc3lzZGV2LCAidXNiMy1scG0tY2FwYWJsZSIpKQo+IC0JCXhoY2ktPnF1aXJrcyB8 PSBYSENJX0xQTV9TVVBQT1JUOwo+ICsJCWlmIChkZXZpY2VfcHJvcGVydHlfcmVhZF9ib29sKHRt cGRldiwgInVzYjItbHBtLWRpc2FibGUiKSkKPiArCQkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfSFdf TFBNX0RJU0FCTEU7Cj4gICAKPiAtCWlmIChkZXZpY2VfcHJvcGVydHlfcmVhZF9ib29sKCZwZGV2 LT5kZXYsICJxdWlyay1icm9rZW4tcG9ydC1wZWQiKSkKPiAtCQl4aGNpLT5xdWlya3MgfD0gWEhD SV9CUk9LRU5fUE9SVF9QRUQ7Cj4gKwkJaWYgKGRldmljZV9wcm9wZXJ0eV9yZWFkX2Jvb2wodG1w ZGV2LCAidXNiMy1scG0tY2FwYWJsZSIpKQo+ICsJCQl4aGNpLT5xdWlya3MgfD0gWEhDSV9MUE1f U1VQUE9SVDsKPiAgIAo+IC0JLyogaW1vZF9pbnRlcnZhbCBpcyB0aGUgaW50ZXJydXB0IG1vZGVy YXRpb24gdmFsdWUgaW4gbmFub3NlY29uZHMuICovCj4gLQl4aGNpLT5pbW9kX2ludGVydmFsID0g NDAwMDA7CgpTZXR0aW5nIHRoZSBkZWZhdWx0IGltb2RfaW50ZXJ2YWwgY291bGQgYmUgbW92ZWQg YmVmb3JlIHRoZSBmb3IoKSBsb29wCgo+IC0JZGV2aWNlX3Byb3BlcnR5X3JlYWRfdTMyKHN5c2Rl diwgImltb2QtaW50ZXJ2YWwtbnMiLAo+IC0JCQkJICZ4aGNpLT5pbW9kX2ludGVydmFsKTsKPiAr CQlpZiAoZGV2aWNlX3Byb3BlcnR5X3JlYWRfYm9vbCh0bXBkZXYsICJxdWlyay1icm9rZW4tcG9y dC1wZWQiKSkKPiArCQkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfQlJPS0VOX1BPUlRfUEVEOwo+ICsK PiArCQkvKgo+ICsJCSAqIGltb2RfaW50ZXJ2YWwgaXMgdGhlIGludGVycnVwdCBtb2RlcmF0aW9u Cj4gKwkJICogdmFsdWUgaW4gbmFub3NlY29uZHMuCj4gKwkJICovCj4gKwkJeGhjaS0+aW1vZF9p bnRlcnZhbCA9IDQwMDAwOwo+ICsJCWRldmljZV9wcm9wZXJ0eV9yZWFkX3UzMih0bXBkZXYsICJp bW9kLWludGVydmFsLW5zIiwKPiArCQkJCQkgJnhoY2ktPmltb2RfaW50ZXJ2YWwpOwo+ICsJfQo+ ICAgCj4gICAJaGNkLT51c2JfcGh5ID0gZGV2bV91c2JfZ2V0X3BoeV9ieV9waGFuZGxlKHN5c2Rl diwgInVzYi1waHkiLCAwKTsKPiAgIAlpZiAoSVNfRVJSKGhjZC0+dXNiX3BoeSkpIHsKPiAKCk90 aGVyd2lzZSBldmVyeXRoaW5nIGxvb2tzIGZpbmUuCkkgd2lsbCB1bmZvcnR1bmF0ZWx5IGJlIGF3 YXkgYWdhaW4gZm9yIGFub3RoZXIgdHdvIHdlZWtzLgoKLU1hdGhpYXMKLS0tClRvIHVuc3Vic2Ny aWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC11c2Ii IGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1v cmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWlu Zm8uaHRtbAo=