* [PATCH v2] usb: host: xhci: plat: check hcc_params after add hcd
@ 2017-01-17 7:32 William Wu
2017-01-17 9:05 ` Roger Quadros
0 siblings, 1 reply; 2+ messages in thread
From: William Wu @ 2017-01-17 7:32 UTC (permalink / raw)
To: gregkh
Cc: heiko, linux-kernel, linux-usb, linux-rockchip, frank.wang,
huangtao, dianders, groeck, william.wu, rogerq, stern, stable
From: William wu <william.wu@rock-chips.com>
The commit 4ac53087d6d4 ("usb: xhci: plat: Create both
HCDs before adding them") move add hcd to the end of
probe, this cause hcc_params uninitiated, because xHCI
driver sets hcc_params in xhci_gen_setup() called from
usb_add_hcd().
This patch checks the Maximum Primary Stream Array Size
in the hcc_params register after add primary hcd.
Signed-off-by: William wu <william.wu@rock-chips.com>
---
drivers/usb/host/xhci-plat.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ddfab30..f96caeb 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -232,9 +232,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable"))
xhci->quirks |= XHCI_LPM_SUPPORT;
- if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
- xhci->shared_hcd->can_do_streams = 1;
-
hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy);
@@ -251,6 +248,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (ret)
goto disable_usb_phy;
+ if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
+ xhci->shared_hcd->can_do_streams = 1;
+
ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
if (ret)
goto dealloc_usb2_hcd;
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v2] usb: host: xhci: plat: check hcc_params after add hcd
2017-01-17 7:32 [PATCH v2] usb: host: xhci: plat: check hcc_params after add hcd William Wu
@ 2017-01-17 9:05 ` Roger Quadros
0 siblings, 0 replies; 2+ messages in thread
From: Roger Quadros @ 2017-01-17 9:05 UTC (permalink / raw)
To: William Wu, gregkh
Cc: heiko, linux-kernel, linux-usb, linux-rockchip, frank.wang,
huangtao, dianders, groeck, stern, stable
On 17/01/17 09:32, William Wu wrote:
> From: William wu <william.wu@rock-chips.com>
>
> The commit 4ac53087d6d4 ("usb: xhci: plat: Create both
> HCDs before adding them") move add hcd to the end of
> probe, this cause hcc_params uninitiated, because xHCI
> driver sets hcc_params in xhci_gen_setup() called from
> usb_add_hcd().
>
> This patch checks the Maximum Primary Stream Array Size
> in the hcc_params register after add primary hcd.
>
> Signed-off-by: William wu <william.wu@rock-chips.com>
Acked-by: Roger Quadros <rogerq@ti.com>
> ---
> drivers/usb/host/xhci-plat.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index ddfab30..f96caeb 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -232,9 +232,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
> if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable"))
> xhci->quirks |= XHCI_LPM_SUPPORT;
>
> - if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
> - xhci->shared_hcd->can_do_streams = 1;
> -
> hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
> if (IS_ERR(hcd->usb_phy)) {
> ret = PTR_ERR(hcd->usb_phy);
> @@ -251,6 +248,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
> if (ret)
> goto disable_usb_phy;
>
> + if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
> + xhci->shared_hcd->can_do_streams = 1;
> +
> ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
> if (ret)
> goto dealloc_usb2_hcd;
>
--
cheers,
-roger
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-17 9:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-17 7:32 [PATCH v2] usb: host: xhci: plat: check hcc_params after add hcd William Wu
2017-01-17 9:05 ` Roger Quadros
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®