From: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com> To: Mathias Nyman <mathias.nyman@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com> Subject: [PATCH] usb: host: xhci-plat: Iterate over parent nodes for finding quirks Date: Tue, 5 Jun 2018 20:50:56 +0530 [thread overview] Message-ID: <1528212056-28390-1-git-send-email-anurag.kumar.vulisha@xilinx.com> (raw) 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 <anurag.kumar.vulisha@xilinx.com> --- 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) { - 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; - 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)) { -- 2.1.1
WARNING: multiple messages have this Message-ID (diff)
From: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com> To: Mathias Nyman <mathias.nyman@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com> Subject: usb: host: xhci-plat: Iterate over parent nodes for finding quirks Date: Tue, 5 Jun 2018 20:50:56 +0530 [thread overview] Message-ID: <1528212056-28390-1-git-send-email-anurag.kumar.vulisha@xilinx.com> (raw) 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 <anurag.kumar.vulisha@xilinx.com> --- 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) { - 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; - 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)) {
next reply other threads:[~2018-06-05 15:21 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-05 15:20 Anurag Kumar Vulisha [this message] 2018-06-05 15:20 ` usb: host: xhci-plat: Iterate over parent nodes for finding quirks Anurag Kumar Vulisha 2018-06-05 15:25 ` [PATCH] " Greg Kroah-Hartman 2018-06-05 15:25 ` Greg Kroah-Hartman 2018-06-05 18:41 ` [PATCH] " Anurag Kumar Vulisha 2018-06-05 18:41 ` Anurag Kumar Vulisha 2018-06-12 7:03 ` [PATCH] " Anurag Kumar Vulisha 2018-06-12 7:03 ` Anurag Kumar Vulisha 2018-06-12 8:02 ` [PATCH] " Greg Kroah-Hartman 2018-06-12 8:02 ` Greg Kroah-Hartman 2018-07-14 15:37 ` [PATCH] " Anurag Kumar Vulisha 2018-07-14 15:37 ` Anurag Kumar Vulisha 2018-07-15 8:02 ` [PATCH] " Greg Kroah-Hartman 2018-07-15 8:02 ` Greg Kroah-Hartman 2018-07-15 8:11 ` [PATCH] " Greg Kroah-Hartman 2018-07-15 8:11 ` Greg Kroah-Hartman 2018-07-20 14:53 ` [PATCH] " Mathias Nyman 2018-07-20 14:53 ` Mathias Nyman 2018-08-06 7:58 ` [PATCH] " Anurag Kumar Vulisha 2018-08-06 7:58 ` Anurag Kumar Vulisha 2018-08-06 11:11 ` [PATCH] " Mathias Nyman 2018-08-06 11:11 ` Mathias Nyman 2018-08-06 11:41 ` [PATCH] " Anurag Kumar Vulisha 2018-08-06 11:41 ` Anurag Kumar Vulisha 2018-07-20 14:42 ` [PATCH] " Mathias Nyman 2018-07-20 14:42 ` Mathias Nyman 2018-07-20 15:39 ` [PATCH] " Anurag Kumar Vulisha 2018-07-20 15:39 ` Anurag Kumar Vulisha 2018-08-06 10:50 ` [PATCH] " Mathias Nyman 2018-08-06 10:50 ` Mathias Nyman 2018-08-06 11:14 ` [PATCH] " Anurag Kumar Vulisha 2018-08-06 11:14 ` Anurag Kumar Vulisha
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1528212056-28390-1-git-send-email-anurag.kumar.vulisha@xilinx.com \ --to=anurag.kumar.vulisha@xilinx.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.