These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / renesas_usbhs / mod_gadget.c

diff --git a/kernel/drivers/usb/renesas_usbhs/mod_gadget.c b/kernel/drivers/usb/renesas_usbhs/mod_gadget.c
index dc2aa32..8f7a78e 100644 (file)
--- a/kernel/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/kernel/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/otg.h>
 #include "common.h"
 
 /*
@@ -50,6 +51,8 @@ struct usbhsg_gpriv {
        int                      uep_size;
 
        struct usb_gadget_driver        *driver;
+       struct usb_phy          *transceiver;
+       bool                     vbus_active;
 
        u32     status;
 #define USBHSG_STATUS_STARTED          (1 << 0)
@@ -128,7 +131,8 @@ static void __usbhsg_queue_pop(struct usbhsg_uep *uep,
        struct device *dev = usbhsg_gpriv_to_dev(gpriv);
        struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
 
-       dev_dbg(dev, "pipe %d : queue pop\n", usbhs_pipe_number(pipe));
+       if (pipe)
+               dev_dbg(dev, "pipe %d : queue pop\n", usbhs_pipe_number(pipe));
 
        ureq->req.status = status;
        spin_unlock(usbhs_priv_to_lock(priv));
@@ -682,7 +686,13 @@ static int usbhsg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
        struct usbhsg_request *ureq = usbhsg_req_to_ureq(req);
        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
 
-       usbhs_pkt_pop(pipe, usbhsg_ureq_to_pkt(ureq));
+       if (pipe)
+               usbhs_pkt_pop(pipe, usbhsg_ureq_to_pkt(ureq));
+
+       /*
+        * To dequeue a request, this driver should call the usbhsg_queue_pop()
+        * even if the pipe is NULL.
+        */
        usbhsg_queue_pop(uep, ureq, -ECONNRESET);
 
        return 0;
@@ -872,6 +882,27 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
        return 0;
 }
 
+/*
+ * VBUS provided by the PHY
+ */
+static int usbhsm_phy_get_vbus(struct platform_device *pdev)
+{
+       struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+       struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
+
+       return  gpriv->vbus_active;
+}
+
+static void usbhs_mod_phy_mode(struct usbhs_priv *priv)
+{
+       struct usbhs_mod_info *info = &priv->mod_info;
+
+       info->irq_vbus          = NULL;
+       priv->pfunc.get_vbus    = usbhsm_phy_get_vbus;
+
+       usbhs_irq_callback_update(priv, NULL);
+}
+
 /*
  *
  *             linux usb function
@@ -882,12 +913,28 @@ static int usbhsg_gadget_start(struct usb_gadget *gadget,
 {
        struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
        struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
+       struct device *dev = usbhs_priv_to_dev(priv);
+       int ret;
 
        if (!driver             ||
            !driver->setup      ||
            driver->max_speed < USB_SPEED_FULL)
                return -EINVAL;
 
+       /* connect to bus through transceiver */
+       if (!IS_ERR_OR_NULL(gpriv->transceiver)) {
+               ret = otg_set_peripheral(gpriv->transceiver->otg,
+                                       &gpriv->gadget);
+               if (ret) {
+                       dev_err(dev, "%s: can't bind to transceiver\n",
+                               gpriv->gadget.name);
+                       return ret;
+               }
+
+               /* get vbus using phy versions */
+               usbhs_mod_phy_mode(priv);
+       }
+
        /* first hook up the driver ... */
        gpriv->driver = driver;
 
@@ -900,6 +947,10 @@ static int usbhsg_gadget_stop(struct usb_gadget *gadget)
        struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
 
        usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
+
+       if (!IS_ERR_OR_NULL(gpriv->transceiver))
+               otg_set_peripheral(gpriv->transceiver->otg, NULL);
+
        gpriv->driver = NULL;
 
        return 0;
@@ -947,12 +998,26 @@ static int usbhsg_set_selfpowered(struct usb_gadget *gadget, int is_self)
        return 0;
 }
 
+static int usbhsg_vbus_session(struct usb_gadget *gadget, int is_active)
+{
+       struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
+       struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
+       struct platform_device *pdev = usbhs_priv_to_pdev(priv);
+
+       gpriv->vbus_active = !!is_active;
+
+       renesas_usbhs_call_notify_hotplug(pdev);
+
+       return 0;
+}
+
 static const struct usb_gadget_ops usbhsg_gadget_ops = {
        .get_frame              = usbhsg_get_frame,
        .set_selfpowered        = usbhsg_set_selfpowered,
        .udc_start              = usbhsg_gadget_start,
        .udc_stop               = usbhsg_gadget_stop,
        .pullup                 = usbhsg_pullup,
+       .vbus_session           = usbhsg_vbus_session,
 };
 
 static int usbhsg_start(struct usbhs_priv *priv)
@@ -994,6 +1059,10 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
                goto usbhs_mod_gadget_probe_err_gpriv;
        }
 
+       gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED);
+       dev_info(dev, "%stransceiver found\n",
+                gpriv->transceiver ? "" : "no ");
+
        /*
         * CAUTION
         *
@@ -1041,12 +1110,18 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
                if (usbhsg_is_dcp(uep)) {
                        gpriv->gadget.ep0 = &uep->ep;
                        usb_ep_set_maxpacket_limit(&uep->ep, 64);
+                       uep->ep.caps.type_control = true;
                }
                /* init normal pipe */
                else {
                        usb_ep_set_maxpacket_limit(&uep->ep, 512);
+                       uep->ep.caps.type_iso = true;
+                       uep->ep.caps.type_bulk = true;
+                       uep->ep.caps.type_int = true;
                        list_add_tail(&uep->ep.ep_list, &gpriv->gadget.ep_list);
                }
+               uep->ep.caps.dir_in = true;
+               uep->ep.caps.dir_out = true;
        }
 
        ret = usb_add_gadget_udc(dev, &gpriv->gadget);