Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1325379
| From | Robert Baldyga <r.baldyga@samsung.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v4 09/43] usb: gadget: composite: handle function bind |
| Date | 2016-02-03 14:00 +0100 |
| Message-ID | <qY5cm-24p-5@gated-at.bofh.it> (permalink) |
| References | <qY52F-212-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
As now USB function supplies entity descriptors to composite in
prep_descs() callback, we can perform bind inside composite framework
without involving bind() callback (which now is unused and will be
removed after converting all functions in kernel to new API).
For now we bind each configuration when it's added, because we have
to support functions based on old API, but after completing conversion
of functions, we will be able to do bind after adding all configurations.
Also more sophisticated autoconfig solver will be provided to improve
utilization of available hardware endpoints.
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
drivers/usb/gadget/composite.c | 162 +++++++++++++++++++++++++++++++++++++++++
include/linux/usb/composite.h | 3 +
2 files changed, 165 insertions(+)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 3f9cad8..f196bb6 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -327,6 +327,21 @@ int usb_function_activate(struct usb_function *function)
EXPORT_SYMBOL_GPL(usb_function_activate);
/**
+ * usb_function_is_new_api - checks if USB function uses new API
+ * @f: USB function
+ *
+ * This function is added temporarily to allow both old and new function API
+ * to coexist. It function will be removed after converting all USB functions
+ * in kernel to new API.
+ *
+ * Returns true if function uses new API.
+ */
+static inline bool usb_function_is_new_api(struct usb_function *f)
+{
+ return !!f->prep_descs;
+}
+
+/**
* usb_function_set_descs - assing descriptors to USB function
* @f: USB function
* @descs: USB descriptors to be assigned to function
@@ -1108,6 +1123,12 @@ int usb_add_config(struct usb_composite_dev *cdev,
goto done;
status = bind(config);
+ if (status < 0)
+ goto out;
+
+ status = usb_config_do_bind(config);
+
+out:
if (status < 0) {
while (!list_empty(&config->functions)) {
struct usb_function *f;
@@ -2403,6 +2424,147 @@ void composite_dev_cleanup(struct usb_composite_dev *cdev)
device_remove_file(&cdev->gadget->dev, &dev_attr_suspended);
}
+/**
+ * usb_cmp_ep_descs - compare descriptors of two endpoints
+ *
+ * As currently during autoconfig procedure we take into consideration only
+ * FullSpeed and SuperSpeed Companion descriptors, we need to compare only
+ * these descriptors. It they are the same, endpoints are identical from
+ * autoconfig point of view.
+ */
+static int usb_cmp_ep_descs(struct usb_composite_ep *ep1,
+ struct usb_composite_ep *ep2)
+{
+ if (ep1->fs.desc->bLength != ep2->fs.desc->bLength)
+ return 0;
+ if (usb_endpoint_dir_in(ep1->fs.desc) ^
+ usb_endpoint_dir_in(ep2->fs.desc))
+ return 0;
+ if (ep1->fs.desc->bmAttributes != ep2->fs.desc->bmAttributes)
+ return 0;
+ if (ep1->fs.desc->wMaxPacketSize != ep2->fs.desc->wMaxPacketSize)
+ return 0;
+ if (ep1->fs.desc->bInterval != ep2->fs.desc->bInterval)
+ return 0;
+
+ if (ep1->fs.desc->bLength != USB_DT_ENDPOINT_AUDIO_SIZE)
+ goto ss_comp;
+
+ if (ep1->fs.desc->bRefresh != ep2->fs.desc->bRefresh)
+ return 0;
+ if (ep1->fs.desc->bSynchAddress != ep2->fs.desc->bSynchAddress)
+ return 0;
+
+ss_comp:
+ if (!ep1->ss_comp.desc ^ !ep2->ss_comp.desc)
+ return 0;
+ if (!ep1->ss_comp.desc)
+ return 1;
+
+ if (ep1->ss_comp.desc->bMaxBurst != ep2->ss_comp.desc->bMaxBurst)
+ return 0;
+ if (ep1->ss_comp.desc->bmAttributes != ep2->ss_comp.desc->bmAttributes)
+ return 0;
+ if (ep1->ss_comp.desc->wBytesPerInterval !=
+ ep2->ss_comp.desc->wBytesPerInterval)
+ return 0;
+
+ return 1;
+}
+
+/**
+ * ep_update_address() - update endpoint address in descriptors
+ * @ep: composite endpoint with assigned hardware ep
+ *
+ * This function should be called after setting ep->ep to endpoint obtained
+ * from usb_ep_autoconfig_ss(), to update endpoint address in descriptors for
+ * all supported speeds.
+ */
+static inline void ep_update_address(struct usb_composite_ep *ep)
+{
+ if (ep->fs.desc)
+ ep->hs.desc->bEndpointAddress = ep->ep->address;
+ if (ep->hs.desc)
+ ep->hs.desc->bEndpointAddress = ep->ep->address;
+ if (ep->ss.desc)
+ ep->ss.desc->bEndpointAddress = ep->ep->address;
+}
+
+/**
+ * interface_do_bind() - bind interface to UDC
+ * @c: USB configuration
+ * @f: USB function in configuration c
+ * @intf: USB interface in function f
+ *
+ * For now we use only simple interface-level ep aucoconfig solver.
+ * We share endpoints between altsettings where it's possible.
+ */
+static int interface_do_bind(struct usb_configuration *c,
+ struct usb_function *f, struct usb_composite_intf *intf)
+{
+ struct usb_composite_altset *alt, *altx;
+ struct usb_composite_ep *ep, *epx;
+ int a, e, ax, ex;
+
+ intf->id = usb_interface_id(c, f);
+ intf->cur_altset = -1;
+
+ for (a = 0; a < intf->altsets_num; ++a) {
+ alt = intf->altsets[a];
+ alt->alt.desc->bInterfaceNumber = intf->id;
+ for (e = 0; e < alt->eps_num; ++e) {
+ ep = alt->eps[e];
+ if (ep->ep)
+ continue;
+ ep->ep = usb_ep_autoconfig_ss(c->cdev->gadget,
+ ep->fs.desc, ep->ss_comp.desc);
+ if (!ep->ep)
+ return -ENODEV;
+ ep_update_address(ep);
+ /* Try endpoint for other altsets */
+ for (ax = a + 1; ax < intf->altsets_num; ++ax) {
+ altx = intf->altsets[ax];
+ for (ex = 0; ex < altx->eps_num; ++ex) {
+ epx = altx->eps[ex];
+ if (usb_cmp_ep_descs(ep, epx)) {
+ epx->ep = ep->ep;
+ ep_update_address(epx);
+ }
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * config_do_bind() - bind configuration to UDC
+ * @c: USB configuration
+ *
+ * Bind the all functions in configuration to UDC.
+ */
+int usb_config_do_bind(struct usb_configuration *c)
+{
+ struct usb_function *f;
+ struct usb_composite_intf *intf;
+ int i, ret;
+
+ list_for_each_entry(f, &c->functions, list) {
+ if (!usb_function_is_new_api(f))
+ continue;
+ for (i = 0; i < f->descs->intfs_num; ++i) {
+ intf = f->descs->intfs[i];
+ ret = interface_do_bind(c, f, intf);
+ if (ret)
+ return ret;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(usb_config_do_bind);
+
static int composite_bind(struct usb_gadget *gadget,
struct usb_gadget_driver *gdriver)
{
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 7ede101..0a0ff4c 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -420,6 +420,7 @@ int usb_altset_add_vendor_desc(struct usb_function *f, int i, int a,
int usb_ep_add_vendor_desc(struct usb_function *f, int i, int a, int e,
const struct usb_descriptor_header *desc);
+
int usb_interface_id(struct usb_configuration *, struct usb_function *);
int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
@@ -510,6 +511,8 @@ int usb_add_config(struct usb_composite_dev *,
void usb_remove_config(struct usb_composite_dev *,
struct usb_configuration *);
+int usb_config_do_bind(struct usb_configuration *c);
+
/* predefined index for usb_composite_driver */
enum {
USB_GADGET_MANUFACTURER_IDX = 0,
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v4 00/43] usb: gadget: composite: introduce new function API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 10/43] usb: gadget: composite: handle vendor descs Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 16/43] usb: gadget: composite: add usb_function_get_ep() function Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 24/43] usb: gadget: f_rndis: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 18/43] usb: gadget: composite: usb_get_endpoint_address() function Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 06/43] usb: gadget: composite: introduce new descriptors format Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
Re: [PATCH v4 06/43] usb: gadget: composite: introduce new descriptors format kbuild test robot <lkp@intel.com> - 2016-02-04 06:20 +0100
[PATCH v4 15/43] usb: gadget: composite: handle get_alt() automatically Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 04/43] usb: gadget: configfs: fix error path Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 37/43] usb: gadget: f_mass_storage: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 23/43] usb: gadget: f_ecm: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 02/43] usb: gadget: f_sourcesink: free requests in sourcesink_disable() Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 13/43] usb: gadget: composite: enable eps before calling set_alt() callback Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 32/43] usb: gadget: f_obex: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 20/43] usb: gadget: configfs: add new composite API support Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 27/43] usb: gadget: f_acm: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 26/43] usb: gadget: f_hid: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 30/43] usb: gadget: f_printer: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 08/43] usb: gadget: composite: introduce new USB function ops Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 35/43] usb: gadget: f_uac1: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 31/43] usb: gadget: f_serial: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 42/43] Documentation: update uvc configfs interface description Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 43/43] usb: gadget: f_uvc: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 25/43] usb: gadget: f_hid: handle requests lifetime properly Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 03/43] usb: gadget: f_loopback: free requests in loopback_disable() Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 38/43] usb: gadget: u_serial: remove usb_ep_enable()/usb_ep_disable() Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 34/43] usb: gadget: f_subset: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 29/43] usb: gadget: f_ncm: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 22/43] usb: gadget: f_sourcesink: convert to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 39/43] usb: gadget: u_ether: remove usb_ep_enable()/usb_ep_disable() Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 40/43] usb: gadget: uvc: fix typo in UVCG_OPTS_ATTR() macro Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 36/43] usb: gadget: f_uac2: conversion to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 41/43] usb: gadget: uvc: simplify descriptors generation Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 13:50 +0100
[PATCH v4 09/43] usb: gadget: composite: handle function bind Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
Re: [PATCH v4 09/43] usb: gadget: composite: handle function bind kbuild test robot <lkp@intel.com> - 2016-02-04 06:50 +0100
[PATCH v4 01/43] usb: gadget: f_sourcesink: make ISO altset user-selectable Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 12/43] usb: gadget: composite: disable eps before calling disable() callback Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 17/43] usb: gadget: composite: add usb_get_interface_id() function Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 19/43] usb: gadget: composite: enable adding USB functions using new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 05/43] usb: gadget: composite: fix recursive spinlock locking Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 21/43] usb: gadget: f_loopback: convert to new API Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 14/43] usb: gadget: composite: introduce clear_alt() operation Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 11/43] usb: gadget: composite: generate old descs for compatibility Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
[PATCH v4 07/43] usb: gadget: composite: add functions for descriptors handling Robert Baldyga <r.baldyga@samsung.com> - 2016-02-03 14:00 +0100
csiph-web