1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index 4fee200795a5..f8bd1d57e795 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -16,6 +16,8 @@
 #include <linux/platform_device.h>
 
 #include "mtu3.h"
+#include "mtu3_debug.h"
+#include "mtu3_trace.h"
 
 static int ep_fifo_alloc(struct mtu3_ep *mep, u32 seg_size)
 {
@@ -299,6 +301,7 @@ int mtu3_config_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
                         int interval, int burst, int mult)
 {
         void __iomem *mbase = mtu->mac_base;
+        bool gen2cp = mtu->gen2cp;
         int epnum = mep->epnum;
         u32 csr0, csr1, csr2;
         int fifo_sgsz, fifo_addr;
@@ -319,7 +322,7 @@ int mtu3_config_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
 
                 num_pkts = (burst + 1) * (mult + 1) - 1;
                 csr1 = TX_SS_BURST(burst) | TX_SLOT(mep->slot);
-                csr1 |= TX_MAX_PKT(num_pkts) | TX_MULT(mult);
+                csr1 |= TX_MAX_PKT(gen2cp, num_pkts) | TX_MULT(gen2cp, mult);
 
                 csr2 = TX_FIFOADDR(fifo_addr >> 4);
                 csr2 |= TX_FIFOSEGSIZE(fifo_sgsz);
@@ -355,7 +358,7 @@ int mtu3_config_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
 
                 num_pkts = (burst + 1) * (mult + 1) - 1;
                 csr1 = RX_SS_BURST(burst) | RX_SLOT(mep->slot);
-                csr1 |= RX_MAX_PKT(num_pkts) | RX_MULT(mult);
+                csr1 |= RX_MAX_PKT(gen2cp, num_pkts) | RX_MULT(gen2cp, mult);
 
                 csr2 = RX_FIFOADDR(fifo_addr >> 4);
                 csr2 |= RX_FIFOSEGSIZE(fifo_sgsz);
@@ -600,6 +603,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)
         mtu3_clrbits(mbase, U3D_MISC_CTRL, VBUS_FRC_EN | VBUS_ON);
         /* enable automatical HWRW from L1 */
         mtu3_setbits(mbase, U3D_POWER_MANAGEMENT, LPM_HRWE);
+
+        /* use new QMU format when HW version >= 0x1003 */
+        if (mtu->gen2cp)
+                mtu3_writel(mbase, U3D_QFCR, ~0x0);
 }
 
 static irqreturn_t mtu3_link_isr(struct mtu3 *mtu)
@@ -650,6 +657,8 @@ static irqreturn_t mtu3_link_isr(struct mtu3 *mtu)
                 break;
         }
         dev_dbg(mtu->dev, "%s: %s\n", __func__, usb_speed_string(udev_speed));
+        mtu3_dbg_trace(mtu->dev, "link speed %s",
+                       usb_speed_string(udev_speed));
 
         mtu->g.speed = udev_speed;
         mtu->g.ep0->maxpacket = maxpkt;
@@ -672,6 +681,7 @@ static irqreturn_t mtu3_u3_ltssm_isr(struct mtu3 *mtu)
         ltssm &= mtu3_readl(mbase, U3D_LTSSM_INTR_ENABLE);
         mtu3_writel(mbase, U3D_LTSSM_INTR, ltssm); /* W1C */
         dev_dbg(mtu->dev, "=== LTSSM[%x] ===\n", ltssm);
+        trace_mtu3_u3_ltssm_isr(ltssm);
 
         if (ltssm & (HOT_RST_INTR | WARM_RST_INTR))
                 mtu3_gadget_reset(mtu);
@@ -702,6 +712,7 @@ static irqreturn_t mtu3_u2_common_isr(struct mtu3 *mtu)
         u2comm &= mtu3_readl(mbase, U3D_COMMON_USB_INTR_ENABLE);
         mtu3_writel(mbase, U3D_COMMON_USB_INTR, u2comm); /* W1C */
         dev_dbg(mtu->dev, "=== U2COMM[%x] ===\n", u2comm);
+        trace_mtu3_u2_common_isr(u2comm);
 
         if (u2comm & SUSPEND_INTR)
                 mtu3_gadget_suspend(mtu);
@@ -749,13 +760,15 @@ static irqreturn_t mtu3_irq(int irq, void *data)
 
 static int mtu3_hw_init(struct mtu3 *mtu)
 {
-        u32 cap_dev;
+        u32 value;
         int ret;
 
-        mtu->hw_version = mtu3_readl(mtu->ippc_base, U3D_SSUSB_HW_ID);
+        value = mtu3_readl(mtu->ippc_base, U3D_SSUSB_IP_TRUNK_VERS);
+        mtu->hw_version = IP_TRUNK_VERS(value);
+        mtu->gen2cp = !!(mtu->hw_version >= MTU3_TRUNK_VERS_1003);
 
-        cap_dev = mtu3_readl(mtu->ippc_base, U3D_SSUSB_IP_DEV_CAP);
-        mtu->is_u3_ip = !!SSUSB_IP_DEV_U3_PORT_NUM(cap_dev);
+        value = mtu3_readl(mtu->ippc_base, U3D_SSUSB_IP_DEV_CAP);
+        mtu->is_u3_ip = !!SSUSB_IP_DEV_U3_PORT_NUM(value);
 
         dev_info(mtu->dev, "IP version 0x%x(%s IP)\n", mtu->hw_version,
                 mtu->is_u3_ip ? "U3" : "U2");
@@ -893,6 +906,8 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
         if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG)
                 mtu3_stop(mtu);
 
+        ssusb_dev_debugfs_init(ssusb);
+
         dev_dbg(dev, " %s() done...\n", __func__);
 
         return 0;