From: Roger Quadros <rogerq@ti.com>
To: <stern@rowland.harvard.edu>, <balbi@ti.com>,
<gregkh@linuxfoundation.org>, <peter.chen@freescale.com>
Cc: <dan.j.williams@intel.com>, <jun.li@freescale.com>,
<mathias.nyman@linux.intel.com>, <tony@atomide.com>,
<Joao.Pinto@synopsys.com>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH v3 08/11] usb: hcd: Adapt to OTG core
Date: Wed, 8 Jul 2015 13:19:34 +0300 [thread overview]
Message-ID: <1436350777-28056-9-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1436350777-28056-1-git-send-email-rogerq@ti.com>
The existing usb_add/remove_hcd() functionality
remains unchanged for non-OTG devices. For OTG
devices they only register the HCD with the OTG core.
Introduce usb_otg_add/remove_hcd() for use by OTG core.
These functions actually add/remove the HCD.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/usb/common/usb-otg.c | 6 ++---
drivers/usb/core/hcd.c | 55 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/common/usb-otg.c b/drivers/usb/common/usb-otg.c
index 0379034..1f19001 100644
--- a/drivers/usb/common/usb-otg.c
+++ b/drivers/usb/common/usb-otg.c
@@ -496,7 +496,7 @@ int usb_otg_kick_fsm(struct device *hcd_gcd_device)
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(hcd_gcd_device->parent);
if (!otgd) {
- dev_err(hcd_gcd_device, "otg: %s: invalid host/gadget device\n",
+ dev_dbg(hcd_gcd_device, "otg: %s: invalid host/gadget device\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -ENODEV;
@@ -678,7 +678,7 @@ int usb_otg_register_gadget(struct usb_gadget *gadget,
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(otg_dev);
if (!otgd) {
- dev_err(otg_dev, "otg: %s: device not registered to otg core\n",
+ dev_dbg(otg_dev, "otg: %s: device not registered to otg core\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -EINVAL;
@@ -724,7 +724,7 @@ int usb_otg_unregister_gadget(struct usb_gadget *gadget)
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(otg_dev);
if (!otgd) {
- dev_err(otg_dev, "otg: %s: device not registered to otg core\n",
+ dev_dbg(otg_dev, "otg: %s: device not registered to otg core\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -EINVAL;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index be5b207..3a19607 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -46,6 +46,7 @@
#include <linux/usb.h>
#include <linux/usb/hcd.h>
#include <linux/usb/phy.h>
+#include <linux/usb/otg.h>
#include "usb.h"
@@ -2622,8 +2623,8 @@ static void usb_put_invalidate_rhdev(struct usb_hcd *hcd)
* buffers of consistent memory, register the bus, request the IRQ line,
* and call the driver's reset() and start() routines.
*/
-int usb_add_hcd(struct usb_hcd *hcd,
- unsigned int irqnum, unsigned long irqflags)
+static int usb_otg_add_hcd(struct usb_hcd *hcd,
+ unsigned int irqnum, unsigned long irqflags)
{
int retval;
struct usb_device *rhdev;
@@ -2828,17 +2829,16 @@ err_phy:
}
return retval;
}
-EXPORT_SYMBOL_GPL(usb_add_hcd);
/**
- * usb_remove_hcd - shutdown processing for generic HCDs
+ * usb_otg_remove_hcd - shutdown processing for generic HCDs
* @hcd: the usb_hcd structure to remove
* Context: !in_interrupt()
*
* Disconnects the root hub, then reverses the effects of usb_add_hcd(),
* invoking the HCD's stop() method.
*/
-void usb_remove_hcd(struct usb_hcd *hcd)
+static void usb_otg_remove_hcd(struct usb_hcd *hcd)
{
struct usb_device *rhdev = hcd->self.root_hub;
@@ -2912,6 +2912,51 @@ void usb_remove_hcd(struct usb_hcd *hcd)
usb_put_invalidate_rhdev(hcd);
}
+
+static struct otg_hcd_ops otg_hcd_intf = {
+ .add = usb_otg_add_hcd,
+ .remove = usb_otg_remove_hcd,
+};
+
+/**
+ * usb_add_hcd - finish generic HCD structure initialization and register
+ * @hcd: the usb_hcd structure to initialize
+ * @irqnum: Interrupt line to allocate
+ * @irqflags: Interrupt type flags
+ *
+ * Finish the remaining parts of generic HCD initialization: allocate the
+ * buffers of consistent memory, register the bus, request the IRQ line,
+ * and call the driver's reset() and start() routines.
+ * If it is an OTG device then it only registers the HCD with OTG core.
+ *
+ */
+int usb_add_hcd(struct usb_hcd *hcd,
+ unsigned int irqnum, unsigned long irqflags)
+{
+ /* If OTG device, OTG core takes care of adding HCD */
+ if (usb_otg_register_hcd(hcd, irqnum, irqflags, &otg_hcd_intf))
+ return usb_otg_add_hcd(hcd, irqnum, irqflags);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(usb_add_hcd);
+
+/**
+ * usb_remove_hcd - shutdown processing for generic HCDs
+ * @hcd: the usb_hcd structure to remove
+ * Context: !in_interrupt()
+ *
+ * Disconnects the root hub, then reverses the effects of usb_add_hcd(),
+ * invoking the HCD's stop() method.
+ * If it is an OTG device then it unregisters the HCD from OTG core
+ * as well.
+ */
+void usb_remove_hcd(struct usb_hcd *hcd)
+{
+ /* If OTG device, OTG core takes care of stopping HCD */
+ if (usb_otg_unregister_hcd(hcd))
+ usb_otg_remove_hcd(hcd);
+}
EXPORT_SYMBOL_GPL(usb_remove_hcd);
void
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com>
To: stern@rowland.harvard.edu, balbi@ti.com,
gregkh@linuxfoundation.org, peter.chen@freescale.com
Cc: dan.j.williams@intel.com, jun.li@freescale.com,
mathias.nyman@linux.intel.com, tony@atomide.com,
Joao.Pinto@synopsys.com, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
Roger Quadros <rogerq@ti.com>
Subject: [PATCH v3 08/11] usb: hcd: Adapt to OTG core
Date: Wed, 8 Jul 2015 13:19:34 +0300 [thread overview]
Message-ID: <1436350777-28056-9-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1436350777-28056-1-git-send-email-rogerq@ti.com>
The existing usb_add/remove_hcd() functionality
remains unchanged for non-OTG devices. For OTG
devices they only register the HCD with the OTG core.
Introduce usb_otg_add/remove_hcd() for use by OTG core.
These functions actually add/remove the HCD.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/usb/common/usb-otg.c | 6 ++---
drivers/usb/core/hcd.c | 55 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/common/usb-otg.c b/drivers/usb/common/usb-otg.c
index 0379034..1f19001 100644
--- a/drivers/usb/common/usb-otg.c
+++ b/drivers/usb/common/usb-otg.c
@@ -496,7 +496,7 @@ int usb_otg_kick_fsm(struct device *hcd_gcd_device)
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(hcd_gcd_device->parent);
if (!otgd) {
- dev_err(hcd_gcd_device, "otg: %s: invalid host/gadget device\n",
+ dev_dbg(hcd_gcd_device, "otg: %s: invalid host/gadget device\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -ENODEV;
@@ -678,7 +678,7 @@ int usb_otg_register_gadget(struct usb_gadget *gadget,
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(otg_dev);
if (!otgd) {
- dev_err(otg_dev, "otg: %s: device not registered to otg core\n",
+ dev_dbg(otg_dev, "otg: %s: device not registered to otg core\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -EINVAL;
@@ -724,7 +724,7 @@ int usb_otg_unregister_gadget(struct usb_gadget *gadget)
mutex_lock(&otg_list_mutex);
otgd = usb_otg_device_get_otgd(otg_dev);
if (!otgd) {
- dev_err(otg_dev, "otg: %s: device not registered to otg core\n",
+ dev_dbg(otg_dev, "otg: %s: device not registered to otg core\n",
__func__);
mutex_unlock(&otg_list_mutex);
return -EINVAL;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index be5b207..3a19607 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -46,6 +46,7 @@
#include <linux/usb.h>
#include <linux/usb/hcd.h>
#include <linux/usb/phy.h>
+#include <linux/usb/otg.h>
#include "usb.h"
@@ -2622,8 +2623,8 @@ static void usb_put_invalidate_rhdev(struct usb_hcd *hcd)
* buffers of consistent memory, register the bus, request the IRQ line,
* and call the driver's reset() and start() routines.
*/
-int usb_add_hcd(struct usb_hcd *hcd,
- unsigned int irqnum, unsigned long irqflags)
+static int usb_otg_add_hcd(struct usb_hcd *hcd,
+ unsigned int irqnum, unsigned long irqflags)
{
int retval;
struct usb_device *rhdev;
@@ -2828,17 +2829,16 @@ err_phy:
}
return retval;
}
-EXPORT_SYMBOL_GPL(usb_add_hcd);
/**
- * usb_remove_hcd - shutdown processing for generic HCDs
+ * usb_otg_remove_hcd - shutdown processing for generic HCDs
* @hcd: the usb_hcd structure to remove
* Context: !in_interrupt()
*
* Disconnects the root hub, then reverses the effects of usb_add_hcd(),
* invoking the HCD's stop() method.
*/
-void usb_remove_hcd(struct usb_hcd *hcd)
+static void usb_otg_remove_hcd(struct usb_hcd *hcd)
{
struct usb_device *rhdev = hcd->self.root_hub;
@@ -2912,6 +2912,51 @@ void usb_remove_hcd(struct usb_hcd *hcd)
usb_put_invalidate_rhdev(hcd);
}
+
+static struct otg_hcd_ops otg_hcd_intf = {
+ .add = usb_otg_add_hcd,
+ .remove = usb_otg_remove_hcd,
+};
+
+/**
+ * usb_add_hcd - finish generic HCD structure initialization and register
+ * @hcd: the usb_hcd structure to initialize
+ * @irqnum: Interrupt line to allocate
+ * @irqflags: Interrupt type flags
+ *
+ * Finish the remaining parts of generic HCD initialization: allocate the
+ * buffers of consistent memory, register the bus, request the IRQ line,
+ * and call the driver's reset() and start() routines.
+ * If it is an OTG device then it only registers the HCD with OTG core.
+ *
+ */
+int usb_add_hcd(struct usb_hcd *hcd,
+ unsigned int irqnum, unsigned long irqflags)
+{
+ /* If OTG device, OTG core takes care of adding HCD */
+ if (usb_otg_register_hcd(hcd, irqnum, irqflags, &otg_hcd_intf))
+ return usb_otg_add_hcd(hcd, irqnum, irqflags);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(usb_add_hcd);
+
+/**
+ * usb_remove_hcd - shutdown processing for generic HCDs
+ * @hcd: the usb_hcd structure to remove
+ * Context: !in_interrupt()
+ *
+ * Disconnects the root hub, then reverses the effects of usb_add_hcd(),
+ * invoking the HCD's stop() method.
+ * If it is an OTG device then it unregisters the HCD from OTG core
+ * as well.
+ */
+void usb_remove_hcd(struct usb_hcd *hcd)
+{
+ /* If OTG device, OTG core takes care of stopping HCD */
+ if (usb_otg_unregister_hcd(hcd))
+ usb_otg_remove_hcd(hcd);
+}
EXPORT_SYMBOL_GPL(usb_remove_hcd);
void
--
2.1.4
next prev parent reply other threads:[~2015-07-08 10:20 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 10:19 [PATCH v3 00/11] USB: OTG/DRD Core functionality Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-08 10:19 ` [PATCH v3 01/11] usb: otg-fsm: Add documentation for struct otg_fsm Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-13 1:21 ` Peter Chen
2015-07-13 1:21 ` Peter Chen
2015-07-13 10:06 ` Roger Quadros
2015-07-13 10:06 ` Roger Quadros
2015-07-08 10:19 ` [PATCH v3 02/11] usb: otg-fsm: support multiple instances Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-10 8:06 ` Li Jun
2015-07-10 8:06 ` Li Jun
2015-07-13 1:39 ` Peter Chen
2015-07-13 1:39 ` Peter Chen
2015-07-17 11:17 ` Roger Quadros
2015-07-17 11:17 ` Roger Quadros
2015-07-08 10:19 ` [PATCH v3 03/11] usb: otg-fsm: Prevent build warning "VDBG" redefined Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-13 1:52 ` Peter Chen
2015-07-13 1:52 ` Peter Chen
2015-07-08 10:19 ` [PATCH v3 04/11] otg-fsm: move usb_bus_start_enum into otg-fsm->ops Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-13 1:58 ` Peter Chen
2015-07-13 1:58 ` Peter Chen
2015-07-13 10:13 ` Roger Quadros
2015-07-13 10:13 ` Roger Quadros
2015-07-14 0:34 ` Peter Chen
2015-07-14 0:34 ` Peter Chen
2015-07-15 13:30 ` Roger Quadros
2015-07-15 13:30 ` Roger Quadros
2015-07-16 0:54 ` Peter Chen
2015-07-16 0:54 ` Peter Chen
2015-07-16 10:40 ` Roger Quadros
2015-07-16 10:40 ` Roger Quadros
2015-07-17 0:28 ` Peter Chen
2015-07-17 0:28 ` Peter Chen
2015-07-08 10:19 ` [PATCH v3 05/11] usb: hcd.h: Add OTG to HCD interface Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-13 2:00 ` Peter Chen
2015-07-13 2:00 ` Peter Chen
2015-07-17 0:30 ` Peter Chen
2015-07-17 0:30 ` Peter Chen
2015-07-08 10:19 ` [PATCH v3 06/11] usb: gadget.h: Add OTG to gadget interface Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-17 0:31 ` Peter Chen
2015-07-17 0:31 ` Peter Chen
2015-07-08 10:19 ` [PATCH v3 07/11] usb: otg: add OTG core Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-13 2:14 ` Peter Chen
2015-07-13 2:14 ` Peter Chen
2015-07-13 10:20 ` Roger Quadros
2015-07-13 10:20 ` Roger Quadros
2015-08-14 9:42 ` Roger Quadros
2015-08-14 9:42 ` Roger Quadros
2015-08-14 8:43 ` Peter Chen
2015-08-14 8:43 ` Peter Chen
2015-07-17 7:48 ` Li Jun
2015-07-17 7:48 ` Li Jun
2015-07-17 12:06 ` Roger Quadros
2015-07-17 12:06 ` Roger Quadros
2015-07-20 1:45 ` Peter Chen
2015-07-20 1:45 ` Peter Chen
2015-07-21 10:52 ` Li Jun
2015-07-21 10:52 ` Li Jun
2015-07-27 10:03 ` Roger Quadros
2015-07-27 10:03 ` Roger Quadros
2015-07-08 10:19 ` Roger Quadros [this message]
2015-07-08 10:19 ` [PATCH v3 08/11] usb: hcd: Adapt to " Roger Quadros
2015-07-08 10:19 ` [PATCH v3 09/11] usb: gadget: udc: adapt " Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-08 10:19 ` [PATCH v3 10/11] usb: otg: Add dual-role device (DRD) support Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-17 8:14 ` Li Jun
2015-07-17 8:14 ` Li Jun
2015-07-17 10:41 ` Roger Quadros
2015-07-17 10:41 ` Roger Quadros
2015-07-17 9:02 ` Li Jun
2015-07-17 9:02 ` Li Jun
2015-07-17 10:47 ` Roger Quadros
2015-07-17 10:47 ` Roger Quadros
2015-07-20 1:23 ` Peter Chen
2015-07-20 1:23 ` Peter Chen
2015-07-27 9:31 ` Roger Quadros
2015-07-27 9:31 ` Roger Quadros
2015-07-08 10:19 ` [PATCH v3 11/11] usb: otg: hub: Notify OTG fsm when A device sets b_hnp_enable Roger Quadros
2015-07-08 10:19 ` Roger Quadros
2015-07-08 10:23 ` [PATCH v3 12/12] usb: chipidea: move from CONFIG_USB_OTG_FSM to CONFIG_USB_OTG Roger Quadros
2015-07-08 10:23 ` Roger Quadros
2015-07-10 7:58 ` [PATCH v3 00/11] USB: OTG/DRD Core functionality Li Jun
2015-07-10 7:58 ` Li Jun
2015-07-13 10:24 ` Roger Quadros
2015-07-13 10:24 ` Roger Quadros
2015-07-13 13:04 ` Li Jun
2015-07-13 13:04 ` Li Jun
2015-07-15 13:07 ` Roger Quadros
2015-07-15 13:07 ` Roger Quadros
2015-07-13 19:14 ` Andrew Bresticker
2015-07-13 19:14 ` Andrew Bresticker
2015-07-14 0:59 ` Peter Chen
2015-07-14 0:59 ` Peter Chen
2015-07-14 18:18 ` Andrew Bresticker
2015-07-15 2:13 ` Peter Chen
2015-07-15 2:13 ` Peter Chen
2015-07-15 13:26 ` Roger Quadros
2015-07-15 13:26 ` Roger Quadros
2015-07-16 18:29 ` Andrew Bresticker
2015-07-16 18:29 ` Andrew Bresticker
2015-07-17 10:34 ` Roger Quadros
2015-07-17 10:34 ` 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=1436350777-28056-9-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=Joao.Pinto@synopsys.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 \
--cc=tony@atomide.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 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.