Merge tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver patches for 5.2-rc1

  There is the usual set of:

   - USB gadget updates

   - PHY driver updates and additions

   - USB serial driver updates and fixes

   - typec updates and new chips supported

   - mtu3 driver updates

   - xhci driver updates

   - other tiny driver updates

  Nothing really interesting, just constant forward progress.

  All of these have been in linux-next for a while with no reported
  issues. The usb-gadget and usb-serial trees were merged a bit "late",
  but both of them had been in linux-next before they got merged here
  last Friday"

* tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (206 commits)
  USB: serial: f81232: implement break control
  USB: serial: f81232: add high baud rate support
  USB: serial: f81232: clear overrun flag
  USB: serial: f81232: fix interrupt worker not stop
  usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA
  usb: dwc3: Fix default lpm_nyet_threshold value
  usb: dwc3: debug: Print GET_STATUS(device) tracepoint
  usb: dwc3: Do core validation early on probe
  usb: dwc3: gadget: Set lpm_capable
  usb: gadget: atmel: tie wake lock to running clock
  usb: gadget: atmel: support USB suspend
  usb: gadget: atmel_usba_udc: simplify setting of interrupt-enabled mask
  dwc2: gadget: Fix completed transfer size calculation in DDMA
  usb: dwc2: Set lpm mode parameters depend on HW configuration
  usb: dwc2: Fix channel disable flow
  usb: dwc2: Set actual frame number for completed ISOC transfer
  usb: gadget: do not use __constant_cpu_to_le16
  usb: dwc2: gadget: Increase descriptors count for ISOC's
  usb: introduce usb_ep_type_string() function
  usb: dwc3: move synchronize_irq() out of the spinlock protected block
  ...

1 files changed, 30 insertions, 126 deletions

diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
index ac60e9c8564e..5fcb71af875a 100644
--- a/drivers/usb/mtu3/mtu3_dr.c
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -7,16 +7,9 @@
  * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
  */
 
-#include <linux/debugfs.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>
-
 #include "mtu3.h"
 #include "mtu3_dr.h"
+#include "mtu3_debug.h"
 
 #define USB2_PORT 2
 #define USB3_PORT 3
@@ -28,6 +21,22 @@ enum mtu3_vbus_id_state {
         MTU3_VBUS_VALID,
 };
 
+static char *mailbox_state_string(enum mtu3_vbus_id_state state)
+{
+        switch (state) {
+        case MTU3_ID_FLOAT:
+                return "ID_FLOAT";
+        case MTU3_ID_GROUND:
+                return "ID_GROUND";
+        case MTU3_VBUS_OFF:
+                return "VBUS_OFF";
+        case MTU3_VBUS_VALID:
+                return "VBUS_VALID";
+        default:
+                return "UNKNOWN";
+        }
+}
+
 static void toggle_opstate(struct ssusb_mtk *ssusb)
 {
         if (!ssusb->otg_switch.is_u3_drd) {
@@ -147,7 +156,8 @@ static void ssusb_set_mailbox(struct otg_switch_mtk *otg_sx,
                 container_of(otg_sx, struct ssusb_mtk, otg_switch);
         struct mtu3 *mtu = ssusb->u3d;
 
-        dev_dbg(ssusb->dev, "mailbox state(%d)\n", status);
+        dev_dbg(ssusb->dev, "mailbox %s\n", mailbox_state_string(status));
+        mtu3_dbg_trace(ssusb->dev, "mailbox %s", mailbox_state_string(status));
 
         switch (status) {
         case MTU3_ID_GROUND:
@@ -238,14 +248,18 @@ static int ssusb_extcon_register(struct otg_switch_mtk *otg_sx)
         otg_sx->vbus_nb.notifier_call = ssusb_vbus_notifier;
         ret = devm_extcon_register_notifier(ssusb->dev, edev, EXTCON_USB,
                                         &otg_sx->vbus_nb);
-        if (ret < 0)
+        if (ret < 0) {
                 dev_err(ssusb->dev, "failed to register notifier for USB\n");
+                return ret;
+        }
 
         otg_sx->id_nb.notifier_call = ssusb_id_notifier;
         ret = devm_extcon_register_notifier(ssusb->dev, edev, EXTCON_USB_HOST,
                                         &otg_sx->id_nb);
-        if (ret < 0)
+        if (ret < 0) {
                 dev_err(ssusb->dev, "failed to register notifier for USB-HOST\n");
+                return ret;
+        }
 
         dev_dbg(ssusb->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n",
                 extcon_get_state(edev, EXTCON_USB),
@@ -266,7 +280,7 @@ static int ssusb_extcon_register(struct otg_switch_mtk *otg_sx)
  * This is useful in special cases, such as uses TYPE-A receptacle but also
  * wants to support dual-role mode.
  */
-static void ssusb_mode_manual_switch(struct ssusb_mtk *ssusb, int to_host)
+void ssusb_mode_manual_switch(struct ssusb_mtk *ssusb, int to_host)
 {
         struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
 
@@ -281,114 +295,6 @@ static void ssusb_mode_manual_switch(struct ssusb_mtk *ssusb, int to_host)
         }
 }
 
-static int ssusb_mode_show(struct seq_file *sf, void *unused)
-{
-        struct ssusb_mtk *ssusb = sf->private;
-
-        seq_printf(sf, "current mode: %s(%s drd)\n(echo device/host)\n",
-                ssusb->is_host ? "host" : "device",
-                ssusb->otg_switch.manual_drd_enabled ? "manual" : "auto");
-
-        return 0;
-}
-
-static int ssusb_mode_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ssusb_mode_show, inode->i_private);
-}
-
-static ssize_t ssusb_mode_write(struct file *file,
-        const char __user *ubuf, size_t count, loff_t *ppos)
-{
-        struct seq_file *sf = file->private_data;
-        struct ssusb_mtk *ssusb = sf->private;
-        char buf[16];
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-                return -EFAULT;
-
-        if (!strncmp(buf, "host", 4) && !ssusb->is_host) {
-                ssusb_mode_manual_switch(ssusb, 1);
-        } else if (!strncmp(buf, "device", 6) && ssusb->is_host) {
-                ssusb_mode_manual_switch(ssusb, 0);
-        } else {
-                dev_err(ssusb->dev, "wrong or duplicated setting\n");
-                return -EINVAL;
-        }
-
-        return count;
-}
-
-static const struct file_operations ssusb_mode_fops = {
-        .open = ssusb_mode_open,
-        .write = ssusb_mode_write,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int ssusb_vbus_show(struct seq_file *sf, void *unused)
-{
-        struct ssusb_mtk *ssusb = sf->private;
-        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
-
-        seq_printf(sf, "vbus state: %s\n(echo on/off)\n",
-                regulator_is_enabled(otg_sx->vbus) ? "on" : "off");
-
-        return 0;
-}
-
-static int ssusb_vbus_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ssusb_vbus_show, inode->i_private);
-}
-
-static ssize_t ssusb_vbus_write(struct file *file,
-        const char __user *ubuf, size_t count, loff_t *ppos)
-{
-        struct seq_file *sf = file->private_data;
-        struct ssusb_mtk *ssusb = sf->private;
-        struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
-        char buf[16];
-        bool enable;
-
-        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
-                return -EFAULT;
-
-        if (kstrtobool(buf, &enable)) {
-                dev_err(ssusb->dev, "wrong setting\n");
-                return -EINVAL;
-        }
-
-        ssusb_set_vbus(otg_sx, enable);
-
-        return count;
-}
-
-static const struct file_operations ssusb_vbus_fops = {
-        .open = ssusb_vbus_open,
-        .write = ssusb_vbus_write,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static void ssusb_debugfs_init(struct ssusb_mtk *ssusb)
-{
-        struct dentry *root;
-
-        root = debugfs_create_dir(dev_name(ssusb->dev), usb_debug_root);
-        ssusb->dbgfs_root = root;
-
-        debugfs_create_file("mode", 0644, root, ssusb, &ssusb_mode_fops);
-        debugfs_create_file("vbus", 0644, root, ssusb, &ssusb_vbus_fops);
-}
-
-static void ssusb_debugfs_exit(struct ssusb_mtk *ssusb)
-{
-        debugfs_remove_recursive(ssusb->dbgfs_root);
-}
-
 void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
                           enum mtu3_dr_force_mode mode)
 {
@@ -415,25 +321,23 @@ void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
 int ssusb_otg_switch_init(struct ssusb_mtk *ssusb)
 {
         struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
+        int ret = 0;
 
         INIT_WORK(&otg_sx->id_work, ssusb_id_work);
         INIT_WORK(&otg_sx->vbus_work, ssusb_vbus_work);
 
         if (otg_sx->manual_drd_enabled)
-                ssusb_debugfs_init(ssusb);
+                ssusb_dr_debugfs_init(ssusb);
         else
-                ssusb_extcon_register(otg_sx);
+                ret = ssusb_extcon_register(otg_sx);
 
-        return 0;
+        return ret;
 }
 
 void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb)
 {
         struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
 
-        if (otg_sx->manual_drd_enabled)
-                ssusb_debugfs_exit(ssusb);
-
         cancel_work_sync(&otg_sx->id_work);
         cancel_work_sync(&otg_sx->vbus_work);
 }