Patch "usb: host: xhci: plat: check hcc_params after add hcd" has been added to the 4.4-stable tree
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 the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-host-xhci-plat-check-hcc_params-after-add-hcd.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
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
From: William wu <[email protected]>
commit 5de4e1ea9a731cad195ce5152705c21daef3bbba upstream.
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
@@ -162,9 +162,6 @@ static int xhci_plat_probe(struct platfo (pdata && pdata->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);
@@ -181,6 +178,9 @@ static int xhci_plat_probe(struct platfoif (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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/usb-host-xhci-plat-check-hcc_params-after-add-hcd.patch