patch "usb: host: xhci: plat: check hcc_params after add hcd" added to usb-testing
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: host: xhci: plat: check hcc_params after add hcd
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open.
If you have any questions about this process, please let me know.
Quoted 1 line
From
5de4e1ea9a731cad195ce5152705c21daef3bbbaMon Sep 17 00:00:00 2001
From: William wu <[email protected]>
Date: Tue, 17 Jan 2017 15:32:07 +0800
Subject: usb: host: xhci: plat: check hcc_params after add hcd
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.
--- drivers/usb/host/xhci-plat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-plat.c +3 -3
@@ -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;
Signature · 1 line
2.11.0