usb: renesas_usbhs: fifo became independent from pipe.

Current renesas_usbhs has PIO data transfer mode which controls CFIFO.
And it was implemented in pipe.c.
But, fifo control method needs more flexible implementation
to support DMAEngine.
This patch create fifo.c, and it became independent from pipe.c.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

7 files changed, 290 insertions, 251 deletions

diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile
index b8798ad16278..ce08345fa15a 100644
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -4,6 +4,6 @@
 
 obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs.o
 
-renesas_usbhs-y                 := common.o mod.o pipe.o
+renesas_usbhs-y                 := common.o mod.o pipe.o fifo.o
 
 renesas_usbhs-$(CONFIG_USB_RENESAS_USBHS_UDC)   += mod_gadget.o
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 0aadcb402764..24f756024bed 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -24,6 +24,7 @@ struct usbhs_priv;
 
 #include "./mod.h"
 #include "./pipe.h"
+#include "./fifo.h"
 
 /*
  *
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
new file mode 100644
index 000000000000..3fd3adf90541
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -0,0 +1,211 @@
+/*
+ * Renesas USB driver
+ *
+ * Copyright (C) 2011 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+#include <linux/delay.h>
+#include <linux/io.h>
+#include "./common.h"
+#include "./pipe.h"
+
+/*
+ *              FIFO ctrl
+ */
+static void usbhsf_send_terminator(struct usbhs_pipe *pipe)
+{
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+
+        usbhs_bset(priv, CFIFOCTR, BVAL, BVAL);
+}
+
+static int usbhsf_fifo_barrier(struct usbhs_priv *priv)
+{
+        int timeout = 1024;
+
+        do {
+                /* The FIFO port is accessible */
+                if (usbhs_read(priv, CFIFOCTR) & FRDY)
+                        return 0;
+
+                udelay(10);
+        } while (timeout--);
+
+        return -EBUSY;
+}
+
+static void usbhsf_fifo_clear(struct usbhs_pipe *pipe)
+{
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+
+        if (!usbhs_pipe_is_dcp(pipe))
+                usbhsf_fifo_barrier(priv);
+
+        usbhs_write(priv, CFIFOCTR, BCLR);
+}
+
+static int usbhsf_fifo_rcv_len(struct usbhs_priv *priv)
+{
+        return usbhs_read(priv, CFIFOCTR) & DTLN_MASK;
+}
+
+static int usbhsf_fifo_select(struct usbhs_pipe *pipe, int write)
+{
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+        struct device *dev = usbhs_priv_to_dev(priv);
+        int timeout = 1024;
+        u16 mask = ((1 << 5) | 0xF);            /* mask of ISEL | CURPIPE */
+        u16 base = usbhs_pipe_number(pipe);     /* CURPIPE */
+
+        if (usbhs_pipe_is_dcp(pipe))
+                base |= (1 == write) << 5;      /* ISEL */
+
+        /* "base" will be used below  */
+        usbhs_write(priv, CFIFOSEL, base | MBW_32);
+
+        /* check ISEL and CURPIPE value */
+        while (timeout--) {
+                if (base == (mask & usbhs_read(priv, CFIFOSEL)))
+                        return 0;
+                udelay(10);
+        }
+
+        dev_err(dev, "fifo select error\n");
+
+        return -EIO;
+}
+
+/*
+ *              PIO fifo functions
+ */
+int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe)
+{
+        return usbhsf_fifo_select(pipe, 1);
+}
+
+int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len)
+{
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+        void __iomem *addr = priv->base + CFIFO;
+        int maxp = usbhs_pipe_get_maxpacket(pipe);
+        int total_len;
+        int i, ret;
+
+        ret = usbhs_pipe_is_accessible(pipe);
+        if (ret < 0)
+                return ret;
+
+        ret = usbhsf_fifo_select(pipe, 1);
+        if (ret < 0)
+                return ret;
+
+        ret = usbhsf_fifo_barrier(priv);
+        if (ret < 0)
+                return ret;
+
+        len = min(len, maxp);
+        total_len = len;
+
+        /*
+         * FIXME
+         *
+         * 32-bit access only
+         */
+        if (len >= 4 &&
+            !((unsigned long)buf & 0x03)) {
+                iowrite32_rep(addr, buf, len / 4);
+                len %= 4;
+                buf += total_len - len;
+        }
+
+        /* the rest operation */
+        for (i = 0; i < len; i++)
+                iowrite8(buf[i], addr + (0x03 - (i & 0x03)));
+
+        if (total_len < maxp)
+                usbhsf_send_terminator(pipe);
+
+        return total_len;
+}
+
+int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe)
+{
+        int ret;
+
+        /*
+         * select pipe and enable it to prepare packet receive
+         */
+        ret = usbhsf_fifo_select(pipe, 0);
+        if (ret < 0)
+                return ret;
+
+        usbhs_pipe_enable(pipe);
+
+        return ret;
+}
+
+int usbhs_fifo_read(struct usbhs_pipe *pipe, u8 *buf, int len)
+{
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+        void __iomem *addr = priv->base + CFIFO;
+        int rcv_len;
+        int i, ret;
+        int total_len;
+        u32 data = 0;
+
+        ret = usbhsf_fifo_select(pipe, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = usbhsf_fifo_barrier(priv);
+        if (ret < 0)
+                return ret;
+
+        rcv_len = usbhsf_fifo_rcv_len(priv);
+
+        /*
+         * Buffer clear if Zero-Length packet
+         *
+         * see
+         * "Operation" - "FIFO Buffer Memory" - "FIFO Port Function"
+         */
+        if (0 == rcv_len) {
+                usbhsf_fifo_clear(pipe);
+                return 0;
+        }
+
+        len = min(rcv_len, len);
+        total_len = len;
+
+        /*
+         * FIXME
+         *
+         * 32-bit access only
+         */
+        if (len >= 4 &&
+            !((unsigned long)buf & 0x03)) {
+                ioread32_rep(addr, buf, len / 4);
+                len %= 4;
+                buf += rcv_len - len;
+        }
+
+        /* the rest operation */
+        for (i = 0; i < len; i++) {
+                if (!(i & 0x03))
+                        data = ioread32(addr);
+
+                buf[i] = (data >> ((i & 0x03) * 8)) & 0xff;
+        }
+
+        return total_len;
+}
diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h
new file mode 100644
index 000000000000..75a7c1577ad3
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/fifo.h
@@ -0,0 +1,30 @@
+/*
+ * Renesas USB driver
+ *
+ * Copyright (C) 2011 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+#ifndef RENESAS_USB_FIFO_H
+#define RENESAS_USB_FIFO_H
+
+#include "common.h"
+
+/*
+ * fifo
+ */
+int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len);
+int usbhs_fifo_read(struct usbhs_pipe *pipe, u8 *buf, int len);
+int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe);
+int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe);
+
+#endif /* RENESAS_USB_FIFO_H */
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 206cfabc9286..128c8da8db85 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -376,7 +376,7 @@ static int usbhsg_try_run_send_packet(struct usbhsg_uep *uep,
          *  - after callback_update,
          *  - before queue_pop / stage_end
          */
-        usbhs_fifo_enable(pipe);
+        usbhs_pipe_enable(pipe);
 
         /*
          * all data were sent ?
@@ -454,7 +454,7 @@ static int usbhsg_try_run_receive_packet(struct usbhsg_uep *uep,
                 int disable = 0;
 
                 uep->handler->irq_mask(uep, disable);
-                usbhs_fifo_disable(pipe);
+                usbhs_pipe_disable(pipe);
                 usbhsg_queue_pop(uep, ureq, 0);
         }
 
@@ -546,9 +546,9 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv,
         struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
 
         if (!usbhsg_status_has(gpriv, USBHSG_STATUS_WEDGE)) {
-                usbhs_fifo_disable(pipe);
+                usbhs_pipe_disable(pipe);
                 usbhs_pipe_clear_sequence(pipe);
-                usbhs_fifo_enable(pipe);
+                usbhs_pipe_enable(pipe);
         }
 
         usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
@@ -695,7 +695,7 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
                 ret = gpriv->driver->setup(&gpriv->gadget, &ctrl);
 
         if (ret < 0)
-                usbhs_fifo_stall(pipe);
+                usbhs_pipe_stall(pipe);
 
         return ret;
 }
@@ -803,7 +803,7 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
          *********  assume under spin lock  *********
          */
 
-        usbhs_fifo_disable(pipe);
+        usbhs_pipe_disable(pipe);
 
         /*
          * disable pipe irq
@@ -1016,9 +1016,9 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge)
                         halt, usbhs_pipe_number(pipe));
 
                 if (halt)
-                        usbhs_fifo_stall(pipe);
+                        usbhs_pipe_stall(pipe);
                 else
-                        usbhs_fifo_disable(pipe);
+                        usbhs_pipe_disable(pipe);
 
                 if (halt && wedge)
                         usbhsg_status_set(gpriv, USBHSG_STATUS_WEDGE);
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index 80fc4add6af2..75e9e3cbc0e5 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -15,7 +15,6 @@
  *
  */
 #include <linux/delay.h>
-#include <linux/io.h>
 #include <linux/slab.h>
 #include "./common.h"
 #include "./pipe.h"
@@ -23,13 +22,8 @@
 /*
  *              macros
  */
-#define usbhsp_priv_to_pipeinfo(pr)     (&(pr)->pipe_info)
-#define usbhsp_pipe_to_priv(p)          ((p)->priv)
-
 #define usbhsp_addr_offset(p)   ((usbhs_pipe_number(p) - 1) * 2)
 
-#define usbhsp_is_dcp(p)        ((p)->priv->pipe_info.pipe == (p))
-
 #define usbhsp_flags_set(p, f)  ((p)->flags |=  USBHS_PIPE_FLAGS_##f)
 #define usbhsp_flags_clr(p, f)  ((p)->flags &= ~USBHS_PIPE_FLAGS_##f)
 #define usbhsp_flags_has(p, f)  ((p)->flags &   USBHS_PIPE_FLAGS_##f)
@@ -77,10 +71,10 @@ void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req)
  */
 static void usbhsp_pipectrl_set(struct usbhs_pipe *pipe, u16 mask, u16 val)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
         int offset = usbhsp_addr_offset(pipe);
 
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 usbhs_bset(priv, DCPCTR, mask, val);
         else
                 usbhs_bset(priv, PIPEnCTR + offset, mask, val);
@@ -88,10 +82,10 @@ static void usbhsp_pipectrl_set(struct usbhs_pipe *pipe, u16 mask, u16 val)
 
 static u16 usbhsp_pipectrl_get(struct usbhs_pipe *pipe)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
         int offset = usbhsp_addr_offset(pipe);
 
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 return usbhs_read(priv, DCPCTR);
         else
                 return usbhs_read(priv, PIPEnCTR + offset);
@@ -104,9 +98,9 @@ static void __usbhsp_pipe_xxx_set(struct usbhs_pipe *pipe,
                                   u16 dcp_reg, u16 pipe_reg,
                                   u16 mask, u16 val)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
 
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 usbhs_bset(priv, dcp_reg, mask, val);
         else
                 usbhs_bset(priv, pipe_reg, mask, val);
@@ -115,9 +109,9 @@ static void __usbhsp_pipe_xxx_set(struct usbhs_pipe *pipe,
 static u16 __usbhsp_pipe_xxx_get(struct usbhs_pipe *pipe,
                                  u16 dcp_reg, u16 pipe_reg)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
 
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 return usbhs_read(priv, dcp_reg);
         else
                 return usbhs_read(priv, pipe_reg);
@@ -136,7 +130,7 @@ static void usbhsp_pipe_cfg_set(struct usbhs_pipe *pipe, u16 mask, u16 val)
  */
 static void usbhsp_pipe_buf_set(struct usbhs_pipe *pipe, u16 mask, u16 val)
 {
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 return;
 
         __usbhsp_pipe_xxx_set(pipe, 0, PIPEBUF, mask, val);
@@ -160,7 +154,7 @@ static u16 usbhsp_pipe_maxp_get(struct usbhs_pipe *pipe)
  */
 static void usbhsp_pipe_select(struct usbhs_pipe *pipe)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
 
         /*
          * On pipe, this is necessary before
@@ -182,7 +176,7 @@ static void usbhsp_pipe_select(struct usbhs_pipe *pipe)
 
 static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
         int timeout = 1024;
         u16 val;
 
@@ -205,7 +199,7 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
          *   - "Pipe Control Registers Switching Procedure"
          */
         usbhs_write(priv, CFIFOSEL, 0);
-        usbhs_fifo_disable(pipe);
+        usbhs_pipe_disable(pipe);
 
         do {
                 val  = usbhsp_pipectrl_get(pipe);
@@ -220,7 +214,7 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe)
         return -EBUSY;
 }
 
-static int usbhsp_pipe_is_accessible(struct usbhs_pipe *pipe)
+int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe)
 {
         u16 val;
 
@@ -253,7 +247,7 @@ static void __usbhsp_pid_try_nak_if_stall(struct usbhs_pipe *pipe)
         }
 }
 
-void usbhs_fifo_disable(struct usbhs_pipe *pipe)
+void usbhs_pipe_disable(struct usbhs_pipe *pipe)
 {
         int timeout = 1024;
         u16 val;
@@ -273,7 +267,7 @@ void usbhs_fifo_disable(struct usbhs_pipe *pipe)
         } while (timeout--);
 }
 
-void usbhs_fifo_enable(struct usbhs_pipe *pipe)
+void usbhs_pipe_enable(struct usbhs_pipe *pipe)
 {
         /* see "Pipe n Control Register" - "PID" */
         __usbhsp_pid_try_nak_if_stall(pipe);
@@ -281,7 +275,7 @@ void usbhs_fifo_enable(struct usbhs_pipe *pipe)
         usbhsp_pipectrl_set(pipe, PID_MASK, PID_BUF);
 }
 
-void usbhs_fifo_stall(struct usbhs_pipe *pipe)
+void usbhs_pipe_stall(struct usbhs_pipe *pipe)
 {
         u16 pid = usbhsp_pipectrl_get(pipe);
 
@@ -302,191 +296,6 @@ void usbhs_fifo_stall(struct usbhs_pipe *pipe)
 }
 
 /*
- *              CFIFO ctrl
- */
-void usbhs_fifo_send_terminator(struct usbhs_pipe *pipe)
-{
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-
-        usbhs_bset(priv, CFIFOCTR, BVAL, BVAL);
-}
-
-static void usbhsp_fifo_clear(struct usbhs_pipe *pipe)
-{
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-
-        usbhs_write(priv, CFIFOCTR, BCLR);
-}
-
-static int usbhsp_fifo_barrier(struct usbhs_priv *priv)
-{
-        int timeout = 1024;
-
-        do {
-                /* The FIFO port is accessible */
-                if (usbhs_read(priv, CFIFOCTR) & FRDY)
-                        return 0;
-
-                udelay(10);
-        } while (timeout--);
-
-        return -EBUSY;
-}
-
-static int usbhsp_fifo_rcv_len(struct usbhs_priv *priv)
-{
-        return usbhs_read(priv, CFIFOCTR) & DTLN_MASK;
-}
-
-static int usbhsp_fifo_select(struct usbhs_pipe *pipe, int write)
-{
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-        struct device *dev = usbhs_priv_to_dev(priv);
-        int timeout = 1024;
-        u16 mask = ((1 << 5) | 0xF);            /* mask of ISEL | CURPIPE */
-        u16 base = usbhs_pipe_number(pipe);     /* CURPIPE */
-
-        if (usbhsp_is_dcp(pipe))
-                base |= (1 == write) << 5;      /* ISEL */
-
-        /* "base" will be used below  */
-        usbhs_write(priv, CFIFOSEL, base | MBW_32);
-
-        /* check ISEL and CURPIPE value */
-        while (timeout--) {
-                if (base == (mask & usbhs_read(priv, CFIFOSEL)))
-                        return 0;
-                udelay(10);
-        }
-
-        dev_err(dev, "fifo select error\n");
-
-        return -EIO;
-}
-
-int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe)
-{
-        return usbhsp_fifo_select(pipe, 1);
-}
-
-int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len)
-{
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-        void __iomem *addr = priv->base + CFIFO;
-        int maxp = usbhs_pipe_get_maxpacket(pipe);
-        int total_len;
-        int i, ret;
-
-        ret = usbhsp_pipe_is_accessible(pipe);
-        if (ret < 0)
-                return ret;
-
-        ret = usbhsp_fifo_select(pipe, 1);
-        if (ret < 0)
-                return ret;
-
-        ret = usbhsp_fifo_barrier(priv);
-        if (ret < 0)
-                return ret;
-
-        len = min(len, maxp);
-        total_len = len;
-
-        /*
-         * FIXME
-         *
-         * 32-bit access only
-         */
-        if (len >= 4 &&
-            !((unsigned long)buf & 0x03)) {
-                iowrite32_rep(addr, buf, len / 4);
-                len %= 4;
-                buf += total_len - len;
-        }
-
-        /* the rest operation */
-        for (i = 0; i < len; i++)
-                iowrite8(buf[i], addr + (0x03 - (i & 0x03)));
-
-        if (total_len < maxp)
-                usbhs_fifo_send_terminator(pipe);
-
-        return total_len;
-}
-
-int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe)
-{
-        int ret;
-
-        /*
-         * select pipe and enable it to prepare packet receive
-         */
-        ret = usbhsp_fifo_select(pipe, 0);
-        if (ret < 0)
-                return ret;
-
-        usbhs_fifo_enable(pipe);
-
-        return ret;
-}
-
-int usbhs_fifo_read(struct usbhs_pipe *pipe, u8 *buf, int len)
-{
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-        void __iomem *addr = priv->base + CFIFO;
-        int rcv_len;
-        int i, ret;
-        int total_len;
-        u32 data = 0;
-
-        ret = usbhsp_fifo_select(pipe, 0);
-        if (ret < 0)
-                return ret;
-
-        ret = usbhsp_fifo_barrier(priv);
-        if (ret < 0)
-                return ret;
-
-        rcv_len = usbhsp_fifo_rcv_len(priv);
-
-        /*
-         * Buffer clear if Zero-Length packet
-         *
-         * see
-         * "Operation" - "FIFO Buffer Memory" - "FIFO Port Function"
-         */
-        if (0 == rcv_len) {
-                usbhsp_fifo_clear(pipe);
-                return 0;
-        }
-
-        len = min(rcv_len, len);
-        total_len = len;
-
-        /*
-         * FIXME
-         *
-         * 32-bit access only
-         */
-        if (len >= 4 &&
-            !((unsigned long)buf & 0x03)) {
-                ioread32_rep(addr, buf, len / 4);
-                len %= 4;
-                buf += rcv_len - len;
-        }
-
-        /* the rest operation */
-        for (i = 0; i < len; i++) {
-                if (!(i & 0x03))
-                        data = ioread32(addr);
-
-                buf[i] = (data >> ((i & 0x03) * 8)) & 0xff;
-        }
-
-        return total_len;
-}
-
-/*
  *              pipe setup
  */
 static int usbhsp_possible_double_buffer(struct usbhs_pipe *pipe)
@@ -519,7 +328,7 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
         };
         int is_double = usbhsp_possible_double_buffer(pipe);
 
-        if (usbhsp_is_dcp(pipe))
+        if (usbhs_pipe_is_dcp(pipe))
                 return -EINVAL;
 
         /*
@@ -590,8 +399,8 @@ static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe,
                                  const struct usb_endpoint_descriptor *desc,
                                  int is_host)
 {
-        struct usbhs_priv *priv = usbhsp_pipe_to_priv(pipe);
-        struct usbhs_pipe_info *info = usbhsp_priv_to_pipeinfo(priv);
+        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+        struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
         struct device *dev = usbhs_priv_to_dev(priv);
         int pipe_num = usbhs_pipe_number(pipe);
         int is_double = usbhsp_possible_double_buffer(pipe);
@@ -669,7 +478,7 @@ static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe,
  */
 int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe)
 {
-        u16 mask = usbhsp_is_dcp(pipe) ? DCP_MAXP_MASK : PIPE_MAXP_MASK;
+        u16 mask = usbhs_pipe_is_dcp(pipe) ? DCP_MAXP_MASK : PIPE_MAXP_MASK;
 
         usbhsp_pipe_select(pipe);
 
@@ -724,7 +533,7 @@ static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type)
 
 void usbhs_pipe_init(struct usbhs_priv *priv)
 {
-        struct usbhs_pipe_info *info = usbhsp_priv_to_pipeinfo(priv);
+        struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
         struct usbhs_pipe *pipe;
         int i;
 
@@ -748,7 +557,9 @@ void usbhs_pipe_init(struct usbhs_priv *priv)
                 usbhsp_flags_init(pipe);
                 pipe->mod_private = NULL;
 
-                usbhsp_fifo_clear(pipe);
+                /* pipe force init */
+                usbhsp_pipectrl_set(pipe, ACLRM, ACLRM);
+                usbhsp_pipectrl_set(pipe, ACLRM, 0);
         }
 }
 
@@ -769,7 +580,7 @@ struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv,
                 return NULL;
         }
 
-        usbhs_fifo_disable(pipe);
+        usbhs_pipe_disable(pipe);
 
         /* make sure pipe is not busy */
         ret = usbhsp_pipe_barrier(pipe);
@@ -782,11 +593,6 @@ struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv,
         pipebuf  = usbhsp_setup_pipebuff(pipe, desc, is_host);
         pipemaxp = usbhsp_setup_pipemaxp(pipe, desc, is_host);
 
-        /* buffer clear
-         * see PIPECFG :: BFRE */
-        usbhsp_pipectrl_set(pipe, ACLRM, ACLRM);
-        usbhsp_pipectrl_set(pipe, ACLRM, 0);
-
         usbhsp_pipe_select(pipe);
         usbhsp_pipe_cfg_set(pipe, 0xFFFF, pipecfg);
         usbhsp_pipe_buf_set(pipe, 0xFFFF, pipebuf);
@@ -827,9 +633,9 @@ struct usbhs_pipe *usbhs_dcp_malloc(struct usbhs_priv *priv)
 
 void usbhs_dcp_control_transfer_done(struct usbhs_pipe *pipe)
 {
-        WARN_ON(!usbhsp_is_dcp(pipe));
+        WARN_ON(!usbhs_pipe_is_dcp(pipe));
 
-        usbhs_fifo_enable(pipe);
+        usbhs_pipe_enable(pipe);
         usbhsp_pipectrl_set(pipe, CCPL, CCPL);
 }
 
@@ -839,7 +645,7 @@ void usbhs_dcp_control_transfer_done(struct usbhs_pipe *pipe)
  */
 int usbhs_pipe_probe(struct usbhs_priv *priv)
 {
-        struct usbhs_pipe_info *info = usbhsp_priv_to_pipeinfo(priv);
+        struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
         struct usbhs_pipe *pipe;
         struct device *dev = usbhs_priv_to_dev(priv);
         u32 *pipe_type = usbhs_get_dparam(priv, pipe_type);
@@ -876,7 +682,7 @@ int usbhs_pipe_probe(struct usbhs_priv *priv)
 
 void usbhs_pipe_remove(struct usbhs_priv *priv)
 {
-        struct usbhs_pipe_info *info = usbhsp_priv_to_pipeinfo(priv);
+        struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
 
         kfree(info->pipe);
 }
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h
index c906eb646d24..2fb69df932ed 100644
--- a/drivers/usb/renesas_usbhs/pipe.h
+++ b/drivers/usb/renesas_usbhs/pipe.h
@@ -56,25 +56,9 @@ struct usbhs_pipe_info {
         __usbhs_for_each_pipe(0, pos, &((priv)->pipe_info), i)
 
 /*
- * pipe module probe / remove
+ * data
  */
-int usbhs_pipe_probe(struct usbhs_priv *priv);
-void usbhs_pipe_remove(struct usbhs_priv *priv);
-
-/*
- * cfifo
- */
-int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len);
-int usbhs_fifo_read(struct usbhs_pipe *pipe, u8 *buf, int len);
-int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe);
-int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe);
-
-void usbhs_fifo_enable(struct usbhs_pipe *pipe);
-void usbhs_fifo_disable(struct usbhs_pipe *pipe);
-void usbhs_fifo_stall(struct usbhs_pipe *pipe);
-
-void usbhs_fifo_send_terminator(struct usbhs_pipe *pipe);
-
+#define usbhs_priv_to_pipeinfo(pr)      (&(pr)->pipe_info)
 
 /*
  * usb request
@@ -88,14 +72,21 @@ void usbhs_usbreq_set_val(struct usbhs_priv *priv, struct usb_ctrlrequest *req);
 struct usbhs_pipe
 *usbhs_pipe_malloc(struct usbhs_priv *priv,
                    const struct usb_endpoint_descriptor *desc);
-
+int usbhs_pipe_probe(struct usbhs_priv *priv);
+void usbhs_pipe_remove(struct usbhs_priv *priv);
 int usbhs_pipe_is_dir_in(struct usbhs_pipe *pipe);
 int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe);
 void usbhs_pipe_init(struct usbhs_priv *priv);
 int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
 void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe);
+int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);
+void usbhs_pipe_enable(struct usbhs_pipe *pipe);
+void usbhs_pipe_disable(struct usbhs_pipe *pipe);
+void usbhs_pipe_stall(struct usbhs_pipe *pipe);
 
+#define usbhs_pipe_to_priv(p)   ((p)->priv)
 #define usbhs_pipe_number(p)    (int)((p) - (p)->priv->pipe_info.pipe)
+#define usbhs_pipe_is_dcp(p)    ((p)->priv->pipe_info.pipe == (p))
 
 /*
  * dcp control