From: Roger Quadros <rogerq@ti.com>
To: Peter Chen <hzpeterchen@gmail.com>
Cc: <peter.chen@freescale.com>, <stern@rowland.harvard.edu>,
<balbi@kernel.org>, <gregkh@linuxfoundation.org>,
<dan.j.williams@intel.com>, <jun.li@freescale.com>,
<mathias.nyman@linux.intel.com>, <tony@atomide.com>,
<Joao.Pinto@synopsys.com>, <abrestic@chromium.org>,
<yoshihiro.shimoda.uh@renesas.com>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<devicetree@vger.kernel.org>
Subject: Re: [PATCH v7 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops
Date: Wed, 11 May 2016 14:02:21 +0300 [thread overview]
Message-ID: <5733113D.2030009@ti.com> (raw)
In-Reply-To: <20160511061001.GA16910@shlinux2.ap.freescale.net>
On 11/05/16 09:10, Peter Chen wrote:
> On Mon, May 02, 2016 at 03:18:48PM +0300, Roger Quadros wrote:
>> This is to prevent missing symbol build error if OTG is
>> enabled (built-in) and HCD core (CONFIG_USB) is module.
>>
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> Acked-by: Peter Chen <peter.chen@nxp.com>
>> ---
>> drivers/usb/chipidea/otg_fsm.c | 7 +++++++
>> drivers/usb/common/usb-otg-fsm.c | 15 +++++++++++----
>> drivers/usb/phy/phy-fsl-usb.c | 7 +++++++
>> include/linux/usb/otg.h | 2 ++
>> 4 files changed, 27 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
>> index 1c0c750..2d8d659 100644
>> --- a/drivers/usb/chipidea/otg_fsm.c
>> +++ b/drivers/usb/chipidea/otg_fsm.c
>> @@ -582,6 +582,12 @@ static struct otg_fsm_ops ci_otg_ops = {
>> .start_gadget = ci_otg_start_gadget,
>> };
>>
>> +static struct otg_hcd_ops ci_hcd_ops = {
>> + .usb_bus_start_enum = usb_bus_start_enum,
>> + .usb_control_msg = usb_control_msg,
>> + .usb_hub_find_child = usb_hub_find_child,
>> +};
>> +
>
> Is it possible have default otg_hcd_ops during OTG register to
> avoid define it at every dual-role driver?
Yes, I'll do that.
cheers,
-roger
>> int ci_otg_fsm_work(struct ci_hdrc *ci)
>> {
>> /*
>> @@ -804,6 +810,7 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
>> ci->otg.fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
>> ci->otg.state = OTG_STATE_UNDEFINED;
>> ci->otg.fsm.ops = &ci_otg_ops;
>> + ci->otg.hcd_ops = &ci_hcd_ops;
>> ci->gadget.hnp_polling_support = 1;
>> ci->otg.fsm.host_req_flag = devm_kzalloc(ci->dev, 1, GFP_KERNEL);
>> if (!ci->otg.fsm.host_req_flag)
>> diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
>> index 4bfc6a5..2986b66 100644
>> --- a/drivers/usb/common/usb-otg-fsm.c
>> +++ b/drivers/usb/common/usb-otg-fsm.c
>> @@ -141,11 +141,16 @@ static void otg_hnp_polling_work(struct work_struct *work)
>> enum usb_otg_state state = otg->state;
>> u8 flag;
>> int retval;
>> + struct otg_hcd_ops *hcd_ops = otg->hcd_ops;
>>
>> if (state != OTG_STATE_A_HOST && state != OTG_STATE_B_HOST)
>> return;
>>
>> - udev = usb_hub_find_child(otg->host->root_hub, 1);
>> + if (!hcd_ops || !hcd_ops->usb_control_msg ||
>> + !hcd_ops->usb_hub_find_child)
>> + return;
>> +
>> + udev = hcd_ops->usb_hub_find_child(otg->host->root_hub, 1);
>> if (!udev) {
>> dev_err(otg->host->controller,
>> "no usb dev connected, can't start HNP polling\n");
>> @@ -154,7 +159,7 @@ static void otg_hnp_polling_work(struct work_struct *work)
>>
>> *fsm->host_req_flag = 0;
>> /* Get host request flag from connected USB device */
>> - retval = usb_control_msg(udev,
>> + retval = hcd_ops->usb_control_msg(udev,
>> usb_rcvctrlpipe(udev, 0),
>> USB_REQ_GET_STATUS,
>> USB_DIR_IN | USB_RECIP_DEVICE,
>> @@ -183,7 +188,7 @@ static void otg_hnp_polling_work(struct work_struct *work)
>> if (state == OTG_STATE_A_HOST) {
>> /* Set b_hnp_enable */
>> if (!otg->host->b_hnp_enable) {
>> - retval = usb_control_msg(udev,
>> + retval = hcd_ops->usb_control_msg(udev,
>> usb_sndctrlpipe(udev, 0),
>> USB_REQ_SET_FEATURE, 0,
>> USB_DEVICE_B_HNP_ENABLE,
>> @@ -262,7 +267,9 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
>> otg_loc_conn(otg, 0);
>> otg_loc_sof(otg, 1);
>> otg_set_protocol(fsm, PROTO_HOST);
>> - usb_bus_start_enum(otg->host, otg->host->otg_port);
>> + if (otg->hcd_ops && otg->hcd_ops->usb_bus_start_enum)
>> + otg->hcd_ops->usb_bus_start_enum(otg->host,
>> + otg->host->otg_port);
>> otg_start_hnp_polling(fsm);
>> break;
>> case OTG_STATE_A_IDLE:
>> diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
>> index 587a187..9dbd9f0 100644
>> --- a/drivers/usb/phy/phy-fsl-usb.c
>> +++ b/drivers/usb/phy/phy-fsl-usb.c
>> @@ -792,6 +792,12 @@ static struct otg_fsm_ops fsl_otg_ops = {
>> .start_gadget = fsl_otg_start_gadget,
>> };
>>
>> +static struct otg_hcd_ops fsl_hcd_ops = {
>> + .usb_bus_start_enum = usb_bus_start_enum,
>> + .usb_control_msg = usb_control_msg,
>> + .usb_hub_find_child = usb_hub_find_child,
>> +};
>> +
>> /* Initialize the global variable fsl_otg_dev and request IRQ for OTG */
>> static int fsl_otg_conf(struct platform_device *pdev)
>> {
>> @@ -820,6 +826,7 @@ static int fsl_otg_conf(struct platform_device *pdev)
>>
>> /* Set OTG state machine operations */
>> fsl_otg_tc->otg.fsm.ops = &fsl_otg_ops;
>> + fsl_otg_tc->otg.hcd_ops = &fsl_hcd_ops;
>>
>> /* initialize the otg structure */
>> fsl_otg_tc->phy.label = DRIVER_DESC;
>> diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
>> index e8a14dc..85b8fb5 100644
>> --- a/include/linux/usb/otg.h
>> +++ b/include/linux/usb/otg.h
>> @@ -12,6 +12,7 @@
>> #include <linux/phy/phy.h>
>> #include <linux/usb/phy.h>
>> #include <linux/usb/otg-fsm.h>
>> +#include <linux/usb/hcd.h>
>>
>> struct usb_otg {
>> u8 default_a;
>> @@ -24,6 +25,7 @@ struct usb_otg {
>>
>> enum usb_otg_state state;
>> struct otg_fsm fsm;
>> + struct otg_hcd_ops *hcd_ops;
>>
>> /* bind/unbind the host controller */
>> int (*set_host)(struct usb_otg *otg, struct usb_bus *host);
>> --
>> 2.7.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2016-05-11 11:02 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 12:18 [PATCH v7 00/14] USB OTG/dual-role framework Roger Quadros
2016-05-02 12:18 ` [PATCH v7 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros
2016-05-06 9:05 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros
2016-05-11 8:17 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros
2016-05-06 9:41 ` Peter Chen
2016-05-09 9:45 ` Roger Quadros
2016-05-10 3:14 ` Peter Chen
2016-05-10 7:34 ` Roger Quadros
2016-05-10 8:03 ` Jun Li
2016-05-10 9:20 ` Roger Quadros
2016-05-11 6:19 ` Peter Chen
2016-05-10 8:12 ` Felipe Balbi
2016-05-10 9:12 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros
2016-05-02 12:18 ` [PATCH v7 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros
2016-05-11 6:10 ` Peter Chen
2016-05-11 11:02 ` Roger Quadros [this message]
2016-05-11 12:32 ` Roger Quadros
2016-05-12 8:18 ` Peter Chen
2016-05-12 8:29 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros
2016-05-02 12:18 ` [PATCH v7 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros
2016-05-11 8:21 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 08/14] usb: otg: add OTG/dual-role core Roger Quadros
2016-05-11 8:34 ` Peter Chen
2016-05-11 11:03 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros
2016-05-04 13:15 ` Rob Herring
2016-05-11 8:40 ` Peter Chen
2016-05-11 11:04 ` Roger Quadros
2016-05-02 12:18 ` [PATCH v7 10/14] usb: otg: add hcd companion support Roger Quadros
2016-05-04 13:17 ` Rob Herring
2016-05-04 13:47 ` Roger Quadros
2016-05-11 13:54 ` Rob Herring
2016-05-11 14:13 ` Roger Quadros
2016-05-11 14:47 ` Alan Stern
2016-05-12 4:00 ` Yoshihiro Shimoda
2016-05-12 8:34 ` Roger Quadros
2016-05-12 9:31 ` Roger Quadros
2016-05-12 10:31 ` Yoshihiro Shimoda
2016-05-12 12:13 ` Roger Quadros
2016-05-16 2:13 ` Peter Chen
2016-05-16 8:01 ` Roger Quadros
2016-05-16 8:13 ` Peter Chen
2016-05-16 8:35 ` Roger Quadros
2016-05-12 18:16 ` Alan Stern
2016-05-11 8:43 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 11/14] usb: otg: use dev_dbg() instead of VDBG() Roger Quadros
2016-05-06 9:04 ` Peter Chen
2016-05-09 9:48 ` Roger Quadros
2016-05-11 8:43 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 12/14] usb: hcd: Adapt to OTG core Roger Quadros
2016-05-11 8:57 ` Peter Chen
2016-05-02 12:18 ` [PATCH v7 13/14] usb: gadget: udc: adapt " Roger Quadros
2016-05-02 12:18 ` [PATCH v7 14/14] usb: host: xhci-plat: Add otg device to platform data Roger Quadros
2016-05-11 9:00 ` Peter Chen
2016-05-11 8:36 ` [PATCH v7 00/14] USB OTG/dual-role framework Peter Chen
2016-05-11 11:05 ` Roger Quadros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5733113D.2030009@ti.com \
--to=rogerq@ti.com \
--cc=Joao.Pinto@synopsys.com \
--cc=abrestic@chromium.org \
--cc=balbi@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hzpeterchen@gmail.com \
--cc=jun.li@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=peter.chen@freescale.com \
--cc=stern@rowland.harvard.edu \
--cc=tony@atomide.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).