From: Roger Quadros <rogerq@ti.com>
To: Peter Chen <hzpeterchen@gmail.com>
Cc: Peter Chen <peter.chen@freescale.com>, <balbi@kernel.org>,
<tony@atomide.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<dan.j.williams@intel.com>, <mathias.nyman@linux.intel.com>,
<Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>,
<jun.li@freescale.com>, <grygorii.strashko@ti.com>,
<yoshihiro.shimoda.uh@renesas.com>, <robh@kernel.org>,
<nsekhar@ti.com>, <b-liu@ti.com>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
<linux-omap@vger.kernel.org>, lkml <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>
Subject: Re: [PATCH v8 08/14] usb: otg: add OTG/dual-role core
Date: Fri, 20 May 2016 11:31:48 +0300 [thread overview]
Message-ID: <573ECB74.8060502@ti.com> (raw)
In-Reply-To: <573C674A.7080302@ti.com>
On 18/05/16 15:59, Roger Quadros wrote:
> Hi Peter,
>
> On 18/05/16 10:45, Peter Chen wrote:
>>
>>
>> On Mon, May 16, 2016 at 5:00 PM, Roger Quadros <rogerq@ti.com <mailto:rogerq@ti.com>> wrote:
>>
>> On 13/05/16 13:03, Roger Quadros wrote:
>> > It provides APIs for the following tasks
>> >
>> > - Registering an OTG/dual-role capable controller
>> > - Registering Host and Gadget controllers to OTG core
>> > - Providing inputs to and kicking the OTG state machine
>> >
>> > Provide a dual-role device (DRD) state machine.
>> > DRD mode is a reduced functionality OTG mode. In this mode
>> > we don't support SRP, HNP and dynamic role-swap.
>> >
>> > In DRD operation, the controller mode (Host or Peripheral)
>> > is decided based on the ID pin status. Once a cable plug (Type-A
>> > or Type-B) is attached the controller selects the state
>> > and doesn't change till the cable in unplugged and a different
>> > cable type is inserted.
>> >
>> > As we don't need most of the complex OTG states and OTG timers
>> > we implement a lean DRD state machine in usb-otg.c.
>> > The DRD state machine is only interested in 2 hardware inputs
>> > 'id' and 'b_sess_vld'.
>> >
>> > Signed-off-by: Roger Quadros <rogerq@ti.com <mailto:rogerq@ti.com>>
>> > ---
>> > drivers/usb/common/Makefile | 2 +-
>> > drivers/usb/common/usb-otg.c | 1042 ++++++++++++++++++++++++++++++++++++++++++
>> > drivers/usb/core/Kconfig | 4 +-
>> > include/linux/usb/gadget.h | 2 +
>> > include/linux/usb/hcd.h | 1 +
>> > include/linux/usb/otg-fsm.h | 7 +
>> > include/linux/usb/otg.h | 154 ++++++-
>> > 7 files changed, 1206 insertions(+), 6 deletions(-)
>> > create mode 100644 drivers/usb/common/usb-otg.c
>>
>>
>> This patch causes the following build issues when CONFIG_USB_GADGET=m, CONFIG_USB=m,
>> CONFIG_USB_COMMON=m and CONFIG_USB_OTG=y
>>
>> ERROR: "usb_otg_register_gadget" [drivers/usb/gadget/udc/udc-core.ko] undefined!
>> ERROR: "usb_otg_unregister_gadget" [drivers/usb/gadget/udc/udc-core.ko] undefined!
>> ERROR: "usb_otg_register_hcd" [drivers/usb/core/usbcore.ko] undefined!
>> ERROR: "usb_otg_unregister_hcd" [drivers/usb/core/usbcore.ko] undefined!
>> ERROR: "otg_statemachine" [drivers/usb/chipidea/ci_hdrc.ko] undefined!
>> scripts/Makefile.modpost:91: recipe for target '__modpost' failed
>> make[1]: *** [__modpost] Error 1
>> Makefile:1141: recipe for target 'modules' failed
>> make: *** [modules] Error 2
>> make: *** Waiting for unfinished jobs....
>>
>> drivers/built-in.o: In function `drd_set_state':
>> usb-otg.c:(.text+0x2b4242): undefined reference to `usb_otg_state_string'
>> drivers/built-in.o: In function `drd_statemachine':
>> (.text+0x2b4b4c): undefined reference to `usb_otg_state_string'
>> Makefile:937: recipe for target 'vmlinux' failed
>>
>> I'll fix it up with the following diff.
>>
>> diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
>> index dca7856..16a5b55 100644
>> --- a/drivers/usb/Makefile
>> +++ b/drivers/usb/Makefile
>> @@ -59,5 +59,6 @@ obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/
>> obj-$(CONFIG_USB_GADGET) += gadget/
>>
>> obj-$(CONFIG_USB_COMMON) += common/
>> +obj-$(CONFIG_USB_OTG) += common/
>>
>> obj-$(CONFIG_USBIP_CORE) += usbip/
>> diff --git a/drivers/usb/common/usb-otg.c b/drivers/usb/common/usb-otg.c
>> index 77048aa..17e449e 100644
>> --- a/drivers/usb/common/usb-otg.c
>> +++ b/drivers/usb/common/usb-otg.c
>> @@ -56,6 +56,30 @@ static int usb_otg_hcd_is_primary_hcd(struct usb_hcd *hcd)
>> return hcd == hcd->primary_hcd;
>> }
>>
>> +static const char *otg_state_string(enum usb_otg_state state)
>> +{
>> + static const char *const names[] = {
>> + [OTG_STATE_A_IDLE] = "a_idle",
>> + [OTG_STATE_A_WAIT_VRISE] = "a_wait_vrise",
>> + [OTG_STATE_A_WAIT_BCON] = "a_wait_bcon",
>> + [OTG_STATE_A_HOST] = "a_host",
>> + [OTG_STATE_A_SUSPEND] = "a_suspend",
>> + [OTG_STATE_A_PERIPHERAL] = "a_peripheral",
>> + [OTG_STATE_A_WAIT_VFALL] = "a_wait_vfall",
>> + [OTG_STATE_A_VBUS_ERR] = "a_vbus_err",
>> + [OTG_STATE_B_IDLE] = "b_idle",
>> + [OTG_STATE_B_SRP_INIT] = "b_srp_init",
>> + [OTG_STATE_B_PERIPHERAL] = "b_peripheral",
>> + [OTG_STATE_B_WAIT_ACON] = "b_wait_acon",
>> + [OTG_STATE_B_HOST] = "b_host",
>> + };
>> +
>> + if (state < 0 || state >= ARRAY_SIZE(names))
>> + return "UNDEFINED";
>> +
>> + return names[state];
>> +}
>> +
>>
>>
>>
>> From my point, make another copy for otg stuff is not a good way,
>> could we make folder under usb/ named otg for dedicated otg stuffs,
>> in that case, build otg stuffs can not depend on USB_COMMON.
>
> OK. I can try that. I'll delete otg_state_string from usb-common.c and
> move it into usb/otg/usb-otg.c
>
> I'll also move usb-otg-fsm.c to usb/otg/.
But we can't delete usb_otg_state_string() from usb-common.c. That is used at a
number of places whether OTG is enabled or not.
One option is to make usb-common built in when otg is enabled. What do you say?
cheers,
-roger
>> /**
>> * Check if the OTG device is in our wait list and return
>> * otg_wait_data, else NULL.
>> @@ -433,7 +457,7 @@ static void drd_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
>>
>> fsm->state_changed = 1;
>> dev_dbg(otg->dev, "otg: set state: %s\n",
>> - usb_otg_state_string(new_state));
>> + otg_state_string(new_state));
>> switch (new_state) {
>> case OTG_STATE_B_IDLE:
>> drd_set_protocol(fsm, PROTO_UNDEF);
>> @@ -449,7 +473,7 @@ static void drd_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state)
>> break;
>> default:
>> dev_warn(otg->dev, "%s: otg: invalid state: %s\n",
>> - __func__, usb_otg_state_string(new_state));
>> + __func__, otg_state_string(new_state));
>> break;
>> }
>>
>> @@ -507,7 +531,7 @@ int drd_statemachine(struct usb_otg *otg)
>>
>> default:
>> dev_err(otg->dev, "%s: otg: invalid usb-drd state: %s\n",
>> - __func__, usb_otg_state_string(state));
>> + __func__, otg_state_string(state));
>> break;
>> }
>>
>> --
>> cheers,
>> -roger
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>> the body of a message to majordomo@vger.kernel.org <mailto:majordomo@vger.kernel.org>
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>>
>>
>> --
>> BR,
>> Peter Chen
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" 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-20 8:32 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-13 10:03 [PATCH v8 00/14] USB OTG/dual-role framework Roger Quadros
2016-05-13 10:03 ` [PATCH v8 01/14] usb: hcd: Initialize hcd->flags to 0 Roger Quadros
2016-05-13 10:03 ` [PATCH v8 02/14] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros
2016-05-13 10:03 ` [PATCH v8 03/14] usb: hcd.h: Add OTG to HCD interface Roger Quadros
2016-05-13 10:03 ` [PATCH v8 04/14] usb: otg-fsm: use usb_otg wherever possible Roger Quadros
2016-05-13 10:03 ` [PATCH v8 05/14] usb: otg-fsm: move host controller operations into usb_otg->hcd_ops Roger Quadros
2016-05-13 10:03 ` [PATCH v8 06/14] usb: gadget.h: Add OTG to gadget interface Roger Quadros
2016-05-13 10:03 ` [PATCH v8 07/14] usb: otg: get rid of CONFIG_USB_OTG_FSM in favour of CONFIG_USB_OTG Roger Quadros
2016-05-13 10:03 ` [PATCH v8 08/14] usb: otg: add OTG/dual-role core Roger Quadros
2016-05-16 9:00 ` Roger Quadros
[not found] ` <CAL411-qb0dHQrn+AarSApCq6L=toKPRerLKDcx_H+5WDWu_VDg@mail.gmail.com>
2016-05-18 12:59 ` Roger Quadros
2016-05-20 8:31 ` Roger Quadros [this message]
2016-05-20 9:19 ` Roger Quadros
2016-05-20 9:53 ` Peter Chen
2016-05-23 10:06 ` Roger Quadros
2016-05-24 9:45 ` Roger Quadros
2016-05-25 2:44 ` Peter Chen
2016-05-25 3:19 ` Jun Li
2016-05-25 12:26 ` Roger Quadros
2016-05-25 12:21 ` Roger Quadros
2016-05-25 14:44 ` Jun Li
2016-05-13 10:03 ` [PATCH v8 09/14] usb: of: add an API to get OTG device from USB controller node Roger Quadros
2016-05-20 9:29 ` [PATCH v9 " Roger Quadros
2016-05-23 21:06 ` Rob Herring
2016-05-13 10:03 ` [PATCH v8 10/14] usb: otg: add hcd companion support Roger Quadros
2016-05-13 18:13 ` Rob Herring
2016-05-16 8:12 ` Roger Quadros
2016-05-20 9:32 ` [PATCH v9 " Roger Quadros
2016-05-23 21:07 ` Rob Herring
2016-05-13 10:03 ` [PATCH v8 11/14] usb: otg: use dev_dbg() instead of VDBG() Roger Quadros
2016-05-13 10:03 ` [PATCH v8 12/14] usb: hcd: Adapt to OTG core Roger Quadros
2016-05-13 10:03 ` [PATCH v8 13/14] usb: gadget: udc: adapt " Roger Quadros
2016-05-16 7:02 ` Peter Chen
2016-05-16 8:26 ` Roger Quadros
2016-05-16 9:23 ` Peter Chen
2016-05-16 9:51 ` Roger Quadros
2016-05-17 7:38 ` Jun Li
2016-05-17 8:08 ` Roger Quadros
2016-05-17 8:28 ` Jun Li
2016-05-18 12:42 ` Roger Quadros
2016-05-18 13:12 ` Jun Li
2016-05-18 13:43 ` Roger Quadros
2016-05-18 14:46 ` Jun Li
2016-05-19 7:32 ` Roger Quadros
2016-05-21 2:29 ` Peter Chen
2016-05-23 3:21 ` Peter Chen
2016-05-23 10:11 ` Roger Quadros
2016-05-23 10:34 ` Jun Li
2016-05-23 10:36 ` Roger Quadros
2016-05-24 2:53 ` Peter Chen
2016-06-08 7:32 ` Roger Quadros
2016-06-08 9:05 ` Peter Chen
2016-05-18 3:18 ` Peter Chen
2016-05-18 12:45 ` Roger Quadros
2016-05-20 1:39 ` Peter Chen
2016-05-20 7:26 ` Roger Quadros
2016-05-21 2:44 ` Peter Chen
2016-06-01 7:38 ` Peter Chen
2016-06-02 11:07 ` Roger Quadros
2016-05-13 10:03 ` [PATCH v8 14/14] usb: host: xhci-plat: Add otg device to platform data Roger Quadros
2016-05-30 9:29 ` [PATCH v8 00/14] USB OTG/dual-role framework Peter Chen
2016-05-30 14:04 ` 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=573ECB74.8060502@ti.com \
--to=rogerq@ti.com \
--cc=Joao.Pinto@synopsys.com \
--cc=b-liu@ti.com \
--cc=balbi@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=grygorii.strashko@ti.com \
--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=nsekhar@ti.com \
--cc=peter.chen@freescale.com \
--cc=robh@kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--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).