usb: gadget: cdc2: convert to new interface of f_ecm

f_ecm has been converted to new configfs infrastructure,
fixing cdc2 gadget driver.

[ balbi@ti.com : fixed a bunch of errors when adding ECM function ]

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6f1afd7553e04b446734a41301ba6549d55cca9c..fcc3bfb619359299d11467d888e1cebe8bf33ca9 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -838,6 +838,7 @@ config USB_CDC_COMPOSITE
        select USB_U_SERIAL
        select USB_U_ETHER
        select USB_F_ACM
+       select USB_F_ECM
        help
          This driver provides two functions in one configuration:
          a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.

diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index ceedaf7cabc665a1ad3eac4fdda2a3919a5f874a..5a5acf22c694514f5b3ebede7903f9912e4138b5 100644 (file)
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -15,6 +15,7 @@
 
 #include "u_ether.h"
 #include "u_serial.h"
+#include "u_ecm.h"
 
 
 #define DRIVER_DESC            "CDC Composite Gadget"
@@ -32,21 +33,10 @@
 #define CDC_VENDOR_NUM         0x0525  /* NetChip */
 #define CDC_PRODUCT_NUM                0xa4aa  /* CDC Composite: ECM + ACM */
 
-/*-------------------------------------------------------------------------*/
 USB_GADGET_COMPOSITE_OPTIONS();
 
 USB_ETHERNET_MODULE_PARAMETERS();
 
-/*
- * Kbuild is not very cooperative with respect to linking separately
- * compiled library objects into one module.  So for now we won't use
- * separate compilation ... ensuring init/exit sections work to shrink
- * the runtime footprint, and giving us at least some parts of what
- * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
- */
-#define USBF_ECM_INCLUDED
-#include "f_ecm.c"
-
 /*-------------------------------------------------------------------------*/
 
 static struct usb_device_descriptor device_desc = {
@@ -104,12 +94,13 @@ static struct usb_gadget_strings *dev_strings[] = {
        NULL,
 };
 
-static u8 host_mac[ETH_ALEN];
-static struct eth_dev *the_dev;
 /*-------------------------------------------------------------------------*/
 static struct usb_function *f_acm;
 static struct usb_function_instance *fi_serial;
 
+static struct usb_function *f_ecm;
+static struct usb_function_instance *fi_ecm;
+
 /*
  * We _always_ have both CDC ECM and CDC ACM functions.
  */
@@ -122,13 +113,27 @@ static int __init cdc_do_config(struct usb_configuration *c)
                c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
        }
 
-       status = ecm_bind_config(c, host_mac, the_dev);
-       if (status < 0)
-               return status;
+       fi_ecm = usb_get_function_instance("ecm");
+       if (IS_ERR(fi_ecm)) {
+               status = PTR_ERR(fi_ecm);
+               goto err_func_ecm;
+       }
+
+       f_ecm = usb_get_function(fi_ecm);
+       if (IS_ERR(f_ecm)) {
+               status = PTR_ERR(f_ecm);
+               goto err_get_ecm;
+       }
+
+       status = usb_add_function(c, f_ecm);
+       if (status)
+               goto err_add_ecm;
 
        fi_serial = usb_get_function_instance("acm");
-       if (IS_ERR(fi_serial))
-               return PTR_ERR(fi_serial);
+       if (IS_ERR(fi_serial)) {
+               status = PTR_ERR(fi_serial);
+               goto err_get_acm;
+       }
 
        f_acm = usb_get_function(fi_serial);
        if (IS_ERR(f_acm)) {
@@ -138,12 +143,21 @@ static int __init cdc_do_config(struct usb_configuration *c)
 
        status = usb_add_function(c, f_acm);
        if (status)
-               goto err_conf;
+               goto err_add_acm;
+
        return 0;
-err_conf:
+
+err_add_acm:
        usb_put_function(f_acm);
 err_func_acm:
        usb_put_function_instance(fi_serial);
+err_get_acm:
+       usb_remove_function(c, f_ecm);
+err_add_ecm:
+       usb_put_function(f_ecm);
+err_get_ecm:
+       usb_put_function_instance(fi_ecm);
+err_func_ecm:
        return status;
 }
 
@@ -159,6 +173,7 @@ static struct usb_configuration cdc_config_driver = {
 static int __init cdc_bind(struct usb_composite_dev *cdev)
 {
        struct usb_gadget       *gadget = cdev->gadget;
+       struct f_ecm_opts       *ecm_opts;
        int                     status;
 
        if (!can_support_ecm(cdev->gadget)) {
@@ -167,11 +182,23 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
                return -EINVAL;
        }
 
-       /* set up network link layer */
-       the_dev = gether_setup(cdev->gadget, dev_addr, host_addr, host_mac,
-                              qmult);
-       if (IS_ERR(the_dev))
-               return PTR_ERR(the_dev);
+       fi_ecm = usb_get_function_instance("ecm");
+       if (IS_ERR(fi_ecm))
+               return PTR_ERR(fi_ecm);
+
+       ecm_opts = container_of(fi_ecm, struct f_ecm_opts, func_inst);
+
+       gether_set_qmult(ecm_opts->net, qmult);
+       if (!gether_set_host_addr(ecm_opts->net, host_addr))
+               pr_info("using host ethernet address: %s", host_addr);
+       if (!gether_set_dev_addr(ecm_opts->net, dev_addr))
+               pr_info("using self ethernet address: %s", dev_addr);
+
+       fi_serial = usb_get_function_instance("acm");
+       if (IS_ERR(fi_serial)) {
+               status = PTR_ERR(fi_serial);
+               goto fail;
+       }
 
        /* Allocate string descriptor numbers ... note that string
         * contents can be overridden by the composite_dev glue.
@@ -195,7 +222,9 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
        return 0;
 
 fail1:
-       gether_cleanup(the_dev);
+       usb_put_function_instance(fi_serial);
+fail:
+       usb_put_function_instance(fi_ecm);
        return status;
 }
 
@@ -203,7 +232,10 @@ static int __exit cdc_unbind(struct usb_composite_dev *cdev)
 {
        usb_put_function(f_acm);
        usb_put_function_instance(fi_serial);
-       gether_cleanup(the_dev);
+       if (!IS_ERR_OR_NULL(f_ecm))
+               usb_put_function(f_ecm);
+       if (!IS_ERR_OR_NULL(fi_ecm))
+               usb_put_function_instance(fi_ecm);
        return 0;
 }