1 files changed, 37 insertions, 11 deletions

diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
index 39bd7ec8bf75..a048b08b9d4d 100644
--- a/drivers/usb/chipidea/otg.c
+++ b/drivers/usb/chipidea/otg.c
@@ -11,8 +11,8 @@
  */
 
 /*
- * This file mainly handles otgsc register, it may include OTG operation
- * in the future.
+ * This file mainly handles otgsc register, OTG fsm operations for HNP and SRP
+ * are also included.
  */
 
 #include <linux/usb/otg.h>
@@ -22,6 +22,26 @@
 #include "ci.h"
 #include "bits.h"
 #include "otg.h"
+#include "otg_fsm.h"
+
+/**
+ * hw_read_otgsc returns otgsc register bits value.
+ * @mask: bitfield mask
+ */
+u32 hw_read_otgsc(struct ci_hdrc *ci, u32 mask)
+{
+        return hw_read(ci, OP_OTGSC, mask);
+}
+
+/**
+ * hw_write_otgsc updates target bits of OTGSC register.
+ * @mask: bitfield mask
+ * @data: to be written
+ */
+void hw_write_otgsc(struct ci_hdrc *ci, u32 mask, u32 data)
+{
+        hw_write(ci, OP_OTGSC, mask | OTGSC_INT_STATUS_BITS, data);
+}
 
 /**
  * ci_otg_role - pick role based on ID pin state
@@ -29,8 +49,7 @@
  */
 enum ci_role ci_otg_role(struct ci_hdrc *ci)
 {
-        u32 sts = hw_read(ci, OP_OTGSC, ~0);
-        enum ci_role role = sts & OTGSC_ID
+        enum ci_role role = hw_read_otgsc(ci, OTGSC_ID)
                 ? CI_ROLE_GADGET
                 : CI_ROLE_HOST;
 
@@ -39,14 +58,10 @@ enum ci_role ci_otg_role(struct ci_hdrc *ci)
 
 void ci_handle_vbus_change(struct ci_hdrc *ci)
 {
-        u32 otgsc;
-
         if (!ci->is_otg)
                 return;
 
-        otgsc = hw_read(ci, OP_OTGSC, ~0);
-
-        if (otgsc & OTGSC_BSV)
+        if (hw_read_otgsc(ci, OTGSC_BSV))
                 usb_gadget_vbus_connect(&ci->gadget);
         else
                 usb_gadget_vbus_disconnect(&ci->gadget);
@@ -76,6 +91,11 @@ static void ci_otg_work(struct work_struct *work)
 {
         struct ci_hdrc *ci = container_of(work, struct ci_hdrc, work);
 
+        if (ci_otg_is_fsm_mode(ci) && !ci_otg_fsm_work(ci)) {
+                enable_irq(ci->irq);
+                return;
+        }
+
         if (ci->id_event) {
                 ci->id_event = false;
                 ci_handle_id_switch(ci);
@@ -102,6 +122,9 @@ int ci_hdrc_otg_init(struct ci_hdrc *ci)
                 return -ENODEV;
         }
 
+        if (ci_otg_is_fsm_mode(ci))
+                return ci_hdrc_otg_fsm_init(ci);
+
         return 0;
 }
 
@@ -115,6 +138,9 @@ void ci_hdrc_otg_destroy(struct ci_hdrc *ci)
                 flush_workqueue(ci->wq);
                 destroy_workqueue(ci->wq);
         }
-        ci_disable_otg_interrupt(ci, OTGSC_INT_EN_BITS);
-        ci_clear_otg_interrupt(ci, OTGSC_INT_STATUS_BITS);
+        /* Disable all OTG irq and clear status */
+        hw_write_otgsc(ci, OTGSC_INT_EN_BITS | OTGSC_INT_STATUS_BITS,
+                                                OTGSC_INT_STATUS_BITS);
+        if (ci_otg_is_fsm_mode(ci))
+                ci_hdrc_otg_fsm_remove(ci);
 }