1 files changed, 39 insertions, 24 deletions

diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c
index 1a7208a50afc..bade761a1e52 100644
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@ -103,7 +103,7 @@ struct usbhsh_hpriv {
 
         u32     port_stat;      /* USB_PORT_STAT_xxx */
 
-        struct completion       *done;
+        struct completion       setup_ack_done;
 
         /* see usbhsh_req_alloc/free */
         struct list_head        ureq_link_active;
@@ -355,6 +355,7 @@ static void usbhsh_device_free(struct usbhsh_hpriv *hpriv,
 struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
                                         struct usbhsh_device *udev,
                                         struct usb_host_endpoint *ep,
+                                        int dir_in_req,
                                         gfp_t mem_flags)
 {
         struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
@@ -364,27 +365,38 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
         struct usbhs_pipe *pipe, *best_pipe;
         struct device *dev = usbhsh_hcd_to_dev(hcd);
         struct usb_endpoint_descriptor *desc = &ep->desc;
-        int type, i;
+        int type, i, dir_in;
         unsigned int min_usr;
 
+        dir_in_req = !!dir_in_req;
+
         uep = kzalloc(sizeof(struct usbhsh_ep), mem_flags);
         if (!uep) {
                 dev_err(dev, "usbhsh_ep alloc fail\n");
                 return NULL;
         }
-        type = usb_endpoint_type(desc);
+
+        if (usb_endpoint_xfer_control(desc)) {
+                best_pipe = usbhsh_hpriv_to_dcp(hpriv);
+                goto usbhsh_endpoint_alloc_find_pipe;
+        }
 
         /*
          * find best pipe for endpoint
          * see
          *      HARDWARE LIMITATION
          */
+        type = usb_endpoint_type(desc);
         min_usr = ~0;
         best_pipe = NULL;
-        usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
+        usbhs_for_each_pipe(pipe, priv, i) {
                 if (!usbhs_pipe_type_is(pipe, type))
                         continue;
 
+                dir_in = !!usbhs_pipe_is_dir_in(pipe);
+                if (0 != (dir_in - dir_in_req))
+                        continue;
+
                 info = usbhsh_pipe_info(pipe);
 
                 if (min_usr > info->usr_cnt) {
@@ -398,7 +410,7 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
                 kfree(uep);
                 return NULL;
         }
-
+usbhsh_endpoint_alloc_find_pipe:
         /*
          * init uep
          */
@@ -423,6 +435,7 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
          * see
          *  DCPMAXP/PIPEMAXP
          */
+        usbhs_pipe_sequence_data0(uep->pipe);
         usbhs_pipe_config_update(uep->pipe,
                                  usbhsh_device_number(hpriv, udev),
                                  usb_endpoint_num(desc),
@@ -430,7 +443,7 @@ struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
 
         dev_dbg(dev, "%s [%d-%s](%p)\n", __func__,
                 usbhsh_device_number(hpriv, udev),
-                usbhs_pipe_name(pipe), uep);
+                usbhs_pipe_name(uep->pipe), uep);
 
         return uep;
 }
@@ -549,8 +562,7 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
          *      usbhsh_irq_setup_ack()
          *      usbhsh_irq_setup_err()
          */
-        DECLARE_COMPLETION(done);
-        hpriv->done = &done;
+        init_completion(&hpriv->setup_ack_done);
 
         /* copy original request */
         memcpy(&req, urb->setup_packet, sizeof(struct usb_ctrlrequest));
@@ -572,8 +584,7 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
         /*
          * wait setup packet ACK
          */
-        wait_for_completion(&done);
-        hpriv->done = NULL;
+        wait_for_completion(&hpriv->setup_ack_done);
 
         dev_dbg(dev, "%s done\n", __func__);
 }
@@ -724,11 +735,11 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
         struct usbhsh_device *udev, *new_udev = NULL;
         struct usbhs_pipe *pipe;
         struct usbhsh_ep *uep;
+        int is_dir_in = usb_pipein(urb->pipe);
 
         int ret;
 
-        dev_dbg(dev, "%s (%s)\n",
-                __func__, usb_pipein(urb->pipe) ? "in" : "out");
+        dev_dbg(dev, "%s (%s)\n", __func__, is_dir_in ? "in" : "out");
 
         ret = usb_hcd_link_urb_to_ep(hcd, urb);
         if (ret)
@@ -751,7 +762,8 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
          */
         uep = usbhsh_ep_to_uep(ep);
         if (!uep) {
-                uep = usbhsh_endpoint_alloc(hpriv, udev, ep, mem_flags);
+                uep = usbhsh_endpoint_alloc(hpriv, udev, ep,
+                                            is_dir_in, mem_flags);
                 if (!uep)
                         goto usbhsh_urb_enqueue_error_free_device;
         }
@@ -1095,10 +1107,7 @@ static int usbhsh_irq_setup_ack(struct usbhs_priv *priv,
 
         dev_dbg(dev, "setup packet OK\n");
 
-        if (unlikely(!hpriv->done))
-                dev_err(dev, "setup ack happen without necessary data\n");
-        else
-                complete(hpriv->done); /* see usbhsh_urb_enqueue() */
+        complete(&hpriv->setup_ack_done); /* see usbhsh_urb_enqueue() */
 
         return 0;
 }
@@ -1111,10 +1120,7 @@ static int usbhsh_irq_setup_err(struct usbhs_priv *priv,
 
         dev_dbg(dev, "setup packet Err\n");
 
-        if (unlikely(!hpriv->done))
-                dev_err(dev, "setup err happen without necessary data\n");
-        else
-                complete(hpriv->done); /* see usbhsh_urb_enqueue() */
+        complete(&hpriv->setup_ack_done); /* see usbhsh_urb_enqueue() */
 
         return 0;
 }
@@ -1221,8 +1227,18 @@ static int usbhsh_stop(struct usbhs_priv *priv)
 {
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
         struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
+        struct usbhs_mod *mod = usbhs_mod_get_current(priv);
         struct device *dev = usbhs_priv_to_dev(priv);
 
+        /*
+         * disable irq callback
+         */
+        mod->irq_attch  = NULL;
+        mod->irq_dtch   = NULL;
+        mod->irq_sack   = NULL;
+        mod->irq_sign   = NULL;
+        usbhs_irq_callback_update(priv, mod);
+
         usb_remove_hcd(hcd);
 
         /* disable sys */
@@ -1235,7 +1251,7 @@ static int usbhsh_stop(struct usbhs_priv *priv)
         return 0;
 }
 
-int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv)
+int usbhs_mod_host_probe(struct usbhs_priv *priv)
 {
         struct usbhsh_hpriv *hpriv;
         struct usb_hcd *hcd;
@@ -1279,7 +1295,6 @@ int __devinit usbhs_mod_host_probe(struct usbhs_priv *priv)
         hpriv->mod.stop         = usbhsh_stop;
         hpriv->pipe_info        = pipe_info;
         hpriv->pipe_size        = pipe_size;
-        hpriv->done             = NULL;
         usbhsh_req_list_init(hpriv);
         usbhsh_port_stat_init(hpriv);
 
@@ -1299,7 +1314,7 @@ usbhs_mod_host_probe_err:
         return -ENOMEM;
 }
 
-int __devexit usbhs_mod_host_remove(struct usbhs_priv *priv)
+int usbhs_mod_host_remove(struct usbhs_priv *priv)
 {
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
         struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);