Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754102AbcDNLc3 (ORCPT ); Thu, 14 Apr 2016 07:32:29 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:38965 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752790AbcDNLc0 (ORCPT ); Thu, 14 Apr 2016 07:32:26 -0400 Subject: Re: [PATCH v6 07/12] usb: otg: add OTG/dual-role core To: Yoshihiro Shimoda , "stern@rowland.harvard.edu" , "balbi@kernel.org" , "gregkh@linuxfoundation.org" , "peter.chen@freescale.com" References: <1459865117-7032-1-git-send-email-rogerq@ti.com> <1459865117-7032-8-git-send-email-rogerq@ti.com> <57064850.3060405@ti.com> <570B8268.6090700@ti.com> <570F7827.8050707@ti.com> CC: "dan.j.williams@intel.com" , "jun.li@freescale.com" , "mathias.nyman@linux.intel.com" , "tony@atomide.com" , "Joao.Pinto@synopsys.com" , "abrestic@chromium.org" , "r.baldyga@samsung.com" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" From: Roger Quadros Message-ID: <570F7FB3.2040807@ti.com> Date: Thu, 14 Apr 2016 14:32:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3706 Lines: 114 On 14/04/16 14:15, Yoshihiro Shimoda wrote: > Hi, > >> From: Roger Quadros >> Sent: Thursday, April 14, 2016 8:00 PM >> >> On 14/04/16 11:36, Yoshihiro Shimoda wrote: >>> Hi, >>> > < snip > >>> diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c >>> index e3d0161..8b74715 100644 >>> --- a/drivers/usb/common/common.c >>> +++ b/drivers/usb/common/common.c >>> @@ -233,6 +233,8 @@ int of_usb_update_otg_caps(struct device_node *np, >>> if (of_find_property(np, "adp-disable", NULL) || >>> (otg_caps->otg_rev < 0x0200)) >>> otg_caps->adp_support = false; >>> + if (of_find_property(np, "hcd-needs-companion", NULL)) >>> + otg_caps->needs_companion = true; >> >> I'm not sure if otg_caps structure is a right place for this. Maybe Peter can confirm >> if this is OK or not. >> >> I was thinking more about adding this bit in the otg_config structure. > > I see. I also think the otg_config is more suitable. > >>> >>> return 0; >>> } >>> diff --git a/drivers/usb/common/usb-otg.c b/drivers/usb/common/usb-otg.c >>> index 41e762a..e0df839 100644 >>> --- a/drivers/usb/common/usb-otg.c >>> +++ b/drivers/usb/common/usb-otg.c >>> @@ -823,13 +823,15 @@ int usb_otg_register_hcd(struct usb_hcd *hcd, unsigned int irqnum, >>> /* HCD will be started by OTG fsm when needed */ >>> mutex_lock(&otg->fsm.lock); >>> if (otg->primary_hcd.hcd) { >>> - /* probably a shared HCD ? */ >>> - if (usb_otg_hcd_is_primary_hcd(hcd)) { >>> + /* probably a shared HCD or a companion OHCI HCD ? */ >>> + if (!otg->caps->needs_companion && >>> + usb_otg_hcd_is_primary_hcd(hcd)) { >>> dev_err(otg_dev, "otg: primary host already registered\n"); >>> goto err; >>> } >>> >>> - if (hcd->shared_hcd == otg->primary_hcd.hcd) { >>> + if (otg->caps->needs_companion || >>> + (hcd->shared_hcd == otg->primary_hcd.hcd)) { >>> if (otg->shared_hcd.hcd) { >>> dev_err(otg_dev, "otg: shared host already registered\n"); >>> goto err; >>> @@ -865,7 +867,8 @@ int usb_otg_register_hcd(struct usb_hcd *hcd, unsigned int irqnum, >>> * we're ready only if we have shared HCD >>> * or we don't need shared HCD. >>> */ >>> - if (otg->shared_hcd.hcd || !otg->primary_hcd.hcd->shared_hcd) { >>> + if (otg->shared_hcd.hcd || (!otg->caps->needs_companion && >>> + !otg->primary_hcd.hcd->shared_hcd)) { >>> otg->host = hcd_to_bus(hcd); >>> /* FIXME: set bus->otg_port if this is true OTG port with HNP */ >>> >> >> These changes look good to me. Thanks. > > Thank you for the comment. > If we change the "needs_companion" place to the otg_config, > do we need to add a flag into the otg, instead of otg->caps? Yes we can add a flag in struct usb_otg. cheers, -roger > >>> diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h >>> index b094352..64a7db8 100644 >>> --- a/include/linux/usb/otg.h >>> +++ b/include/linux/usb/otg.h >>> @@ -112,12 +112,14 @@ struct usb_otg { >>> * @hnp_support: Indicates if the device supports HNP. >>> * @srp_support: Indicates if the device supports SRP. >>> * @adp_support: Indicates if the device supports ADP. >>> + * @needs_companion: Indicates if the device needs a companion controller. >> >> Description is not exact. How about this. >> "Indicates if host controller needs a companion controller" >> >> Is hcd_needs_companion is better than just needs_companion? > > I agree with you. > > So, I will modify my local patch and test it tomorrow. > > Best regards, > Yoshihiro Shimoda > >> >>> */ >>> struct usb_otg_caps { >>> u16 otg_rev; >>> bool hnp_support; >>> bool srp_support; >>> bool adp_support; >>> + bool needs_companion; >>> }; >>> >>> /** >>> >> >> cheers, >> -roger