From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535AbbLDOSm (ORCPT ); Fri, 4 Dec 2015 09:18:42 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:61509 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbbLDOS1 (ORCPT ); Fri, 4 Dec 2015 09:18:27 -0500 Date: Fri, 4 Dec 2015 22:14:14 +0800 From: Jisheng Zhang To: , CC: , , Subject: Re: [PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Message-ID: <20151204221414.6de6a291@xhacker> In-Reply-To: <1449238252-5630-3-git-send-email-jszhang@marvell.com> References: <1449238252-5630-1-git-send-email-jszhang@marvell.com> <1449238252-5630-3-git-send-email-jszhang@marvell.com> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-12-04_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=inbound_notspam policy=inbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1512040239 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cc linux-usb@vger.kernel.org On Fri, 4 Dec 2015 22:10:47 +0800 Jisheng Zhang wrote: > Commit 7b8ef22ea547 ("usb: xhci: plat: Add USB phy support") adds the > usb_phy for usb3, but it attached the usb_phy to incorrect hcd. The > xhci->shared_hcd is the hcd for usb3, this patch fixes this issue > by attach the usb_phy to the xhci->shared_hcd. > > Signed-off-by: Jisheng Zhang > --- > drivers/usb/host/xhci-plat.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index b566304..a8c465a 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -82,6 +82,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > struct resource *res; > struct usb_hcd *hcd; > struct clk *clk; > + struct usb_phy *usb_phy; > int ret; > int irq; > > @@ -162,17 +163,18 @@ static int xhci_plat_probe(struct platform_device *pdev) > 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); > + usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); > + if (IS_ERR(usb_phy)) { > + ret = PTR_ERR(usb_phy); > if (ret == -EPROBE_DEFER) > goto put_usb3_hcd; > - hcd->usb_phy = NULL; > + usb_phy = NULL; > } else { > - ret = usb_phy_init(hcd->usb_phy); > + ret = usb_phy_init(usb_phy); > if (ret) > goto put_usb3_hcd; > } > + xhci->shared_hcd->usb_phy = usb_phy; > > ret = usb_add_hcd(hcd, irq, IRQF_SHARED); > if (ret) > @@ -189,7 +191,7 @@ dealloc_usb2_hcd: > usb_remove_hcd(hcd); > > disable_usb_phy: > - usb_phy_shutdown(hcd->usb_phy); > + usb_phy_shutdown(usb_phy); > > put_usb3_hcd: > usb_put_hcd(xhci->shared_hcd); > @@ -211,7 +213,7 @@ static int xhci_plat_remove(struct platform_device *dev) > struct clk *clk = xhci->clk; > > usb_remove_hcd(xhci->shared_hcd); > - usb_phy_shutdown(hcd->usb_phy); > + usb_phy_shutdown(xhci->shared_hcd->usb_phy); > > usb_remove_hcd(hcd); > usb_put_hcd(xhci->shared_hcd);