From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757501AbaHZKmy (ORCPT ); Tue, 26 Aug 2014 06:42:54 -0400 Received: from mail-bn1blp0190.outbound.protection.outlook.com ([207.46.163.190]:23384 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754340AbaHZKmx (ORCPT ); Tue, 26 Aug 2014 06:42:53 -0400 Date: Tue, 26 Aug 2014 18:42:42 +0800 From: Peter Chen To: Antoine =?iso-8859-1?Q?T=E9nart?= CC: , , , , , , , , , , , Subject: Re: [PATCH v3 9/9] usb: chipidea: add support to the generic PHY framework in ChipIdea Message-ID: <20140826104241.GE16758@peterchendt> References: <1408722621-3635-1-git-send-email-antoine.tenart@free-electrons.com> <1408722621-3635-10-git-send-email-antoine.tenart@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1408722621-3635-10-git-send-email-antoine.tenart@free-electrons.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:CAL;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(6009001)(199003)(189002)(24454002)(51704005)(64706001)(47776003)(83322001)(69596002)(19580405001)(99396002)(31966008)(74662001)(74502001)(19580395003)(6806004)(44976005)(97736001)(110136001)(80022001)(50466002)(84676001)(90102001)(20776003)(4396001)(104016003)(85306004)(107046002)(86362001)(68736004)(46102001)(92726001)(26826002)(92566001)(87936001)(105606002)(23756003)(106466001)(81156004)(77982001)(50986999)(33656002)(76482001)(76176999)(79102001)(33716001)(54356999)(57986006)(102836001)(81542001)(83072002)(83506001)(95666004)(81342001)(21056001)(85852003)(41533002);DIR:OUT;SFP:;SCL:1;SRVR:BY2PR03MB569;H:az84smr01.freescale.net;FPR:;MLV:ovrnspm;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 03152A99FF Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Peter.Chen@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 22, 2014 at 05:50:20PM +0200, Antoine Ténart wrote: > This patch adds support of the PHY framework for ChipIdea drivers. > Changes are done in both the ChipIdea common code and in the drivers > accessing the PHY. This is done by adding a new PHY member in > ChipIdea's structures and by taking care of it in the code. > > Signed-off-by: Antoine Ténart > --- > drivers/usb/chipidea/ci.h | 5 ++- > drivers/usb/chipidea/core.c | 71 ++++++++++++++++++++++++++++++++++-------- > drivers/usb/chipidea/debug.c | 4 ++- > drivers/usb/chipidea/host.c | 5 ++- > drivers/usb/chipidea/otg_fsm.c | 6 +++- > include/linux/usb/chipidea.h | 2 ++ > 6 files changed, 76 insertions(+), 17 deletions(-) > > diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h > index dac5ab6adfa2..7e9e8223672a 100644 > --- a/drivers/usb/chipidea/ci.h > +++ b/drivers/usb/chipidea/ci.h > @@ -161,7 +161,8 @@ struct hw_bank { > * @test_mode: the selected test mode > * @platdata: platform specific information supplied by parent device > * @vbus_active: is VBUS active > - * @usb_phy: pointer to USB PHY, if any > + * @phy: pointer to PHY, if any > + * @usb_phy: pointer to USB PHY, if any and if using the USB PHY framework > * @hcd: pointer to usb_hcd for ehci host driver > * @debugfs: root dentry for this controller in debugfs > * @id_event: indicates there is an id event, and handled at ci_otg_work > @@ -202,6 +203,8 @@ struct ci_hdrc { > > struct ci_hdrc_platform_data *platdata; > int vbus_active; > + struct phy *phy; > + /* old usb_phy interface */ > struct usb_phy *usb_phy; > struct usb_hcd *hcd; > struct dentry *debugfs; > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index a8cd35fd8175..0041f5b5eafc 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -47,6 +47,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -293,6 +294,46 @@ static void hw_phymode_configure(struct ci_hdrc *ci) > } > > /** > + * _ci_usb_phy_init: initialize phy taking in account both phy and usb_phy > + * interfaces > + * @ci: the controller > + * > + * This function returns an error code if the phy failed to init > + */ > +static int _ci_usb_phy_init(struct ci_hdrc *ci) > +{ > + int ret; > + > + if (ci->phy) { > + ret = phy_init(ci->phy); > + if (ret) { > + phy_exit(ci->phy); > + return ret; > + } > + ret = phy_power_on(ci->phy); phy_exit is needed to call after phy_power_on failed > + } else { > + ret = usb_phy_init(ci->usb_phy); > + } > + > + return ret; > +} > + > +/** > + * _ci_usb_phy_exit: deinitialize phy taking in account both phy and usb_phy > + * interfaces > + * @ci: the controller > + */ > +static void ci_usb_phy_exit(struct ci_hdrc *ci) > +{ > + if (ci->phy) { > + phy_power_off(ci->phy); > + phy_exit(ci->phy); > + } else { > + usb_phy_shutdown(ci->usb_phy); > + } > +} > + > +/** > * ci_usb_phy_init: initialize phy according to different phy type > * @ci: the controller > * > @@ -306,7 +347,7 @@ static int ci_usb_phy_init(struct ci_hdrc *ci) > case USBPHY_INTERFACE_MODE_UTMI: > case USBPHY_INTERFACE_MODE_UTMIW: > case USBPHY_INTERFACE_MODE_HSIC: > - ret = usb_phy_init(ci->usb_phy); > + ret = _ci_usb_phy_init(ci); > if (ret) > return ret; > hw_phymode_configure(ci); > @@ -314,12 +355,12 @@ static int ci_usb_phy_init(struct ci_hdrc *ci) > case USBPHY_INTERFACE_MODE_ULPI: > case USBPHY_INTERFACE_MODE_SERIAL: > hw_phymode_configure(ci); > - ret = usb_phy_init(ci->usb_phy); > + ret = _ci_usb_phy_init(ci); > if (ret) > return ret; > break; > default: > - ret = usb_phy_init(ci->usb_phy); > + ret = _ci_usb_phy_init(ci); > } > > return ret; > @@ -595,23 +636,27 @@ static int ci_hdrc_probe(struct platform_device *pdev) > return -ENODEV; > } > > - if (ci->platdata->usb_phy) > + if (ci->platdata->phy) > + ci->phy = ci->platdata->phy; > + else if (ci->platdata->usb_phy) > ci->usb_phy = ci->platdata->usb_phy; > else > - ci->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > + ci->phy = devm_phy_get(dev, "usb-phy"); > > - if (IS_ERR(ci->usb_phy)) { > - ret = PTR_ERR(ci->usb_phy); > + if (IS_ERR(ci->phy)) { > /* > * if -ENXIO is returned, it means PHY layer wasn't > * enabled, so it makes no sense to return -EPROBE_DEFER > * in that case, since no PHY driver will ever probe. > */ > - if (ret == -ENXIO) > - return ret; > + if (PTR_ERR(ci->phy) == -ENXIO) > + return -ENXIO; > > - dev_err(dev, "no usb2 phy configured\n"); > - return -EPROBE_DEFER; > + ci->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > + if (IS_ERR(ci->usb_phy)) { > + dev_err(dev, "no usb2 phy configured\n"); > + return -EPROBE_DEFER; > + } > } I am a little puzzled of your above change, if ci->phy == NULL, any chances for devm_usb_get_phy(dev, USB_PHY_TYPE_USB2) is invoded? > > ret = ci_usb_phy_init(ci); > @@ -718,7 +763,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) > stop: > ci_role_destroy(ci); > deinit_phy: > - usb_phy_shutdown(ci->usb_phy); > + ci_usb_phy_exit(ci); > > return ret; > } > @@ -731,7 +776,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) > free_irq(ci->irq, ci); > ci_role_destroy(ci); > ci_hdrc_enter_lpm(ci, true); > - usb_phy_shutdown(ci->usb_phy); > + ci_usb_phy_exit(ci); > kfree(ci->hw_bank.regmap); > > return 0; > diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c > index 5a7ea93011dd..9e9da190a144 100644 > --- a/drivers/usb/chipidea/debug.c > +++ b/drivers/usb/chipidea/debug.c > @@ -219,7 +219,9 @@ static int ci_otg_show(struct seq_file *s, void *unused) > fsm = &ci->fsm; > > /* ------ State ----- */ > - usb_otg_state_string(ci->usb_phy->otg.state)); > + if (ci->usb_phy) > + seq_printf(s, "OTG state: %s\n\n", Why above line is added? Did you delete wrongly before? > + usb_otg_state_string(ci->usb_phy->otg->state)); > > /* ------ State Machine Variables ----- */ > seq_printf(s, "a_bus_drop: %d\n", fsm->a_bus_drop); > diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c > index 0952d4adfa4c..0465578bf805 100644 > --- a/drivers/usb/chipidea/host.c > +++ b/drivers/usb/chipidea/host.c > @@ -59,7 +59,10 @@ static int host_start(struct ci_hdrc *ci) > hcd->has_tt = 1; > > hcd->power_budget = ci->platdata->power_budget; > - hcd->usb_phy = ci->usb_phy; > + if (ci->phy) > + hcd->phy = ci->phy; > + else > + hcd->usb_phy = ci->usb_phy; > > ehci = hcd_to_ehci(hcd); > ehci->caps = ci->hw_bank.cap; > diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c > index 7eb86863fb3c..164cd2fff39b 100644 > --- a/drivers/usb/chipidea/otg_fsm.c > +++ b/drivers/usb/chipidea/otg_fsm.c > @@ -779,7 +779,11 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) > { > int retval = 0; > > - ci->otg.usb_phy = ci->usb_phy; > + if (ci->phy) > + ci->otg.phy = ci->phy; > + else > + ci->otg.usb_phy = ci->usb_phy; > + > ci->fsm.otg = &ci->otg; > ci->fsm.power_up = 1; > ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0; > diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h > index 57d757a1aa83..a0285623b9c1 100644 > --- a/include/linux/usb/chipidea.h > +++ b/include/linux/usb/chipidea.h > @@ -13,6 +13,8 @@ struct ci_hdrc_platform_data { > /* offset of the capability registers */ > uintptr_t capoffset; > unsigned power_budget; > + struct phy *phy; > + /* old usb_phy interface */ > struct usb_phy *usb_phy; > enum usb_phy_interface phy_mode; > unsigned long flags; > -- > 1.9.1 > -- Best Regards, Peter Chen