Merge tag 'usb-ci-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

Two Chipidea updates

- Forbid dumpping registers when the controller in low power mode
- dp pullup needs to be controlled by fsm when working at otg
fsm mode

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/usb/chipidea/debug.c b/drivers/usb/chipidea/debug.c
index 268e4236e84c..dfb05edcdb96 100644
--- a/drivers/usb/chipidea/debug.c
+++ b/drivers/usb/chipidea/debug.c
@@ -336,8 +336,8 @@ static int ci_registers_show(struct seq_file *s, void *unused)
         struct ci_hdrc *ci = s->private;
         u32 tmp_reg;
 
-        if (!ci)
-                return 0;
+        if (!ci || ci->in_lpm)
+                return -EPERM;
 
         /* ------ Registers ----- */
         tmp_reg = hw_read_intr_enable(ci);
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 41914a55055d..764f668d45a9 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1574,6 +1574,10 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)
 {
         struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
 
+        /* Data+ pullup controlled by OTG state machine in OTG fsm mode */
+        if (ci_otg_is_fsm_mode(ci))
+                return 0;
+
         pm_runtime_get_sync(&ci->gadget.dev);
         if (is_on)
                 hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);