From: Roger Quadros <rogerq@ti.com> To: <gregkh@linuxfoundation.org>, <balbi@ti.com>, <stern@rowland.harvard.edu> Cc: <dan.j.williams@intel.com>, <peter.chen@freescale.com>, <jun.li@freescale.com>, <mathias.nyman@linux.intel.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>, Roger Quadros <rogerq@ti.com> Subject: [RFC][PATCH 6/9] usb: gadget: udc: adapt to OTG Date: Wed, 18 Mar 2015 15:56:00 +0200 [thread overview] Message-ID: <1426686963-11613-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1426686963-11613-1-git-send-email-rogerq@ti.com> Register with OTG core as part of usb_add_gadget_udc_release() and unregister from it in usb_del_gadget_udc(). In the OTG use case we may not yet be in "b_peripheral" state so we shouldn't allow starting the UDC till OTG core says so. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/gadget/udc/udc-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 69b4123..aad5173 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -28,6 +28,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb.h> +#include <linux/usb/usb-otg.h> /** * struct usb_udc - describes one usb device controller @@ -237,6 +238,7 @@ static inline void usb_gadget_udc_stop(struct usb_udc *udc) static int usb_udc_start(struct usb_udc *udc) { int ret; + bool otg_can_start; if (udc->running) { dev_err(&udc->dev, "%s: not starting as already running\n", @@ -244,7 +246,8 @@ static int usb_udc_start(struct usb_udc *udc) return -EBUSY; } - if (udc->driver && udc->softconnect) { + otg_can_start = usb_otg_gadget_can_start(udc->gadget); + if (otg_can_start && udc->driver && udc->softconnect) { ret = usb_gadget_udc_start(udc); if (ret) return ret; @@ -432,6 +435,8 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, mutex_unlock(&udc_lock); + usb_otg_register_gadget(gadget); + return 0; err4: @@ -509,6 +514,7 @@ found: if (udc->driver) usb_gadget_remove_driver(udc); + usb_otg_unregister_gadget(gadget); kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE); flush_work(&gadget->work); device_unregister(&udc->dev); -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: gregkh@linuxfoundation.org, balbi@ti.com, stern@rowland.harvard.edu Cc: dan.j.williams@intel.com, peter.chen@freescale.com, jun.li@freescale.com, mathias.nyman@linux.intel.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Roger Quadros <rogerq@ti.com> Subject: [RFC][PATCH 6/9] usb: gadget: udc: adapt to OTG Date: Wed, 18 Mar 2015 15:56:00 +0200 [thread overview] Message-ID: <1426686963-11613-7-git-send-email-rogerq@ti.com> (raw) In-Reply-To: <1426686963-11613-1-git-send-email-rogerq@ti.com> Register with OTG core as part of usb_add_gadget_udc_release() and unregister from it in usb_del_gadget_udc(). In the OTG use case we may not yet be in "b_peripheral" state so we shouldn't allow starting the UDC till OTG core says so. Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/gadget/udc/udc-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 69b4123..aad5173 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -28,6 +28,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb.h> +#include <linux/usb/usb-otg.h> /** * struct usb_udc - describes one usb device controller @@ -237,6 +238,7 @@ static inline void usb_gadget_udc_stop(struct usb_udc *udc) static int usb_udc_start(struct usb_udc *udc) { int ret; + bool otg_can_start; if (udc->running) { dev_err(&udc->dev, "%s: not starting as already running\n", @@ -244,7 +246,8 @@ static int usb_udc_start(struct usb_udc *udc) return -EBUSY; } - if (udc->driver && udc->softconnect) { + otg_can_start = usb_otg_gadget_can_start(udc->gadget); + if (otg_can_start && udc->driver && udc->softconnect) { ret = usb_gadget_udc_start(udc); if (ret) return ret; @@ -432,6 +435,8 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget, mutex_unlock(&udc_lock); + usb_otg_register_gadget(gadget); + return 0; err4: @@ -509,6 +514,7 @@ found: if (udc->driver) usb_gadget_remove_driver(udc); + usb_otg_unregister_gadget(gadget); kobject_uevent(&udc->dev.kobj, KOBJ_REMOVE); flush_work(&gadget->work); device_unregister(&udc->dev); -- 2.1.0
next prev parent reply other threads:[~2015-03-18 13:57 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-18 13:55 [RFC][PATCH 0/9] USB: OTG Core functionality Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-18 13:55 ` [RFC][PATCH 1/9] usb: hcd: Introduce usb_start/stop_hcd() Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-18 19:49 ` Alan Stern 2015-03-18 19:49 ` Alan Stern 2015-03-18 21:41 ` Tony Lindgren 2015-03-18 21:41 ` Tony Lindgren 2015-03-19 1:51 ` Alan Stern 2015-03-19 1:51 ` Alan Stern 2015-03-19 2:38 ` Tony Lindgren 2015-03-19 2:38 ` Tony Lindgren 2015-03-19 11:38 ` Roger Quadros 2015-03-19 11:38 ` Roger Quadros 2015-03-19 14:17 ` Alan Stern 2015-03-19 14:17 ` Alan Stern 2015-03-20 6:32 ` Peter Chen 2015-03-20 6:32 ` Peter Chen 2015-03-20 9:49 ` Roger Quadros 2015-03-20 9:49 ` Roger Quadros 2015-03-19 1:46 ` Peter Chen 2015-03-19 1:46 ` Peter Chen 2015-03-18 13:55 ` [RFC][PATCH 2/9] usb: gadget: add usb_gadget_start/stop() Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-19 3:30 ` Peter Chen 2015-03-19 3:30 ` Peter Chen 2015-03-19 10:14 ` Roger Quadros 2015-03-19 10:14 ` Roger Quadros 2015-03-19 14:09 ` Li Jun 2015-03-19 14:09 ` Li Jun 2015-03-19 14:50 ` Roger Quadros 2015-03-19 14:50 ` Roger Quadros 2015-03-20 7:18 ` Peter Chen 2015-03-20 7:18 ` Peter Chen 2015-03-20 9:46 ` Roger Quadros 2015-03-20 9:46 ` Roger Quadros 2015-03-20 11:08 ` Roger Quadros 2015-03-20 11:08 ` Roger Quadros 2015-03-21 1:30 ` Peter Chen 2015-03-21 1:30 ` Peter Chen 2015-03-18 13:55 ` [RFC][PATCH 3/9] usb: otg: add OTG core Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-19 3:40 ` Peter Chen 2015-03-19 3:40 ` Peter Chen 2015-03-19 10:18 ` Roger Quadros 2015-03-19 10:18 ` Roger Quadros 2015-03-20 7:45 ` Peter Chen 2015-03-20 7:45 ` Peter Chen 2015-03-20 9:18 ` Roger Quadros 2015-03-20 9:18 ` Roger Quadros 2015-03-20 9:32 ` Peter Chen 2015-03-19 8:26 ` Li Jun 2015-03-19 8:26 ` Li Jun 2015-03-19 10:30 ` Roger Quadros 2015-03-19 10:30 ` Roger Quadros 2015-03-19 14:41 ` Li Jun 2015-03-19 14:41 ` Li Jun 2015-03-19 14:54 ` Roger Quadros 2015-03-19 14:54 ` Roger Quadros 2015-03-18 13:55 ` [RFC][PATCH 4/9] usb: otg: hub: Notify OTG fsm when A device sets b_hnp_enable Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-18 13:55 ` [RFC][PATCH 5/9] usb: hcd: adapt to OTG Roger Quadros 2015-03-18 13:55 ` Roger Quadros 2015-03-18 13:56 ` Roger Quadros [this message] 2015-03-18 13:56 ` [RFC][PATCH 6/9] usb: gadget: udc: " Roger Quadros 2015-03-18 13:56 ` [RFC][PATCH 7/9] usb: dwc3: adapt to OTG core Roger Quadros 2015-03-18 13:56 ` Roger Quadros 2015-03-18 13:56 ` [RFC][PATCH 8/9] usb: otg-fsm: Remove unused members in struct otg_fsm Roger Quadros 2015-03-18 13:56 ` Roger Quadros 2015-03-19 3:46 ` Peter Chen 2015-03-19 3:46 ` Peter Chen 2015-03-19 10:20 ` Roger Quadros 2015-03-19 10:20 ` Roger Quadros 2015-03-18 13:56 ` [RFC][PATCH 9/9] usb: otg-fsm: Add documentation for " Roger Quadros 2015-03-18 13:56 ` Roger Quadros 2015-03-18 17:37 ` [RFC][PATCH 0/9] USB: OTG Core functionality Tony Lindgren 2015-03-19 10:31 ` Roger Quadros 2015-03-19 10:31 ` 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=1426686963-11613-7-git-send-email-rogerq@ti.com \ --to=rogerq@ti.com \ --cc=balbi@ti.com \ --cc=dan.j.williams@intel.com \ --cc=gregkh@linuxfoundation.org \ --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 \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.