1 files changed, 69 insertions, 20 deletions

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 66f62563bcf9..4bb9aa696ede 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -166,6 +166,7 @@
 #define DWC3_GCTL_SCALEDOWN(n)          ((n) << 4)
 #define DWC3_GCTL_SCALEDOWN_MASK        DWC3_GCTL_SCALEDOWN(3)
 #define DWC3_GCTL_DISSCRAMBLE           (1 << 3)
+#define DWC3_GCTL_U2EXIT_LFPS           (1 << 2)
 #define DWC3_GCTL_GBLHIBERNATIONEN      (1 << 1)
 #define DWC3_GCTL_DSBLCLKGTNG           (1 << 0)
 
@@ -175,7 +176,17 @@
 
 /* Global USB3 PIPE Control Register */
 #define DWC3_GUSB3PIPECTL_PHYSOFTRST    (1 << 31)
+#define DWC3_GUSB3PIPECTL_U2SSINP3OK    (1 << 29)
+#define DWC3_GUSB3PIPECTL_REQP1P2P3     (1 << 24)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3(n)   ((n) << 19)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3_MASK DWC3_GUSB3PIPECTL_DEP1P2P3(7)
+#define DWC3_GUSB3PIPECTL_DEP1P2P3_EN   DWC3_GUSB3PIPECTL_DEP1P2P3(1)
+#define DWC3_GUSB3PIPECTL_DEPOCHANGE    (1 << 18)
 #define DWC3_GUSB3PIPECTL_SUSPHY        (1 << 17)
+#define DWC3_GUSB3PIPECTL_LFPSFILT      (1 << 9)
+#define DWC3_GUSB3PIPECTL_RX_DETOPOLL   (1 << 8)
+#define DWC3_GUSB3PIPECTL_TX_DEEPH_MASK DWC3_GUSB3PIPECTL_TX_DEEPH(3)
+#define DWC3_GUSB3PIPECTL_TX_DEEPH(n)   ((n) << 1)
 
 /* Global TX Fifo Size Register */
 #define DWC3_GTXFIFOSIZ_TXFDEF(n)       ((n) & 0xffff)
@@ -210,6 +221,9 @@
 #define DWC3_GHWPARAMS4_HIBER_SCRATCHBUFS(n)    (((n) & (0x0f << 13)) >> 13)
 #define DWC3_MAX_HIBER_SCRATCHBUFS              15
 
+/* Global HWPARAMS6 Register */
+#define DWC3_GHWPARAMS6_EN_FPGA                 (1 << 7)
+
 /* Device Configuration Register */
 #define DWC3_DCFG_DEVADDR(addr) ((addr) << 3)
 #define DWC3_DCFG_DEVADDR_MASK  DWC3_DCFG_DEVADDR(0x7f)
@@ -243,16 +257,19 @@
 #define DWC3_DCTL_TRGTULST_SS_INACT     (DWC3_DCTL_TRGTULST(6))
 
 /* These apply for core versions 1.94a and later */
-#define DWC3_DCTL_KEEP_CONNECT  (1 << 19)
-#define DWC3_DCTL_L1_HIBER_EN   (1 << 18)
-#define DWC3_DCTL_CRS           (1 << 17)
-#define DWC3_DCTL_CSS           (1 << 16)
+#define DWC3_DCTL_LPM_ERRATA_MASK       DWC3_DCTL_LPM_ERRATA(0xf)
+#define DWC3_DCTL_LPM_ERRATA(n)         ((n) << 20)
+
+#define DWC3_DCTL_KEEP_CONNECT          (1 << 19)
+#define DWC3_DCTL_L1_HIBER_EN           (1 << 18)
+#define DWC3_DCTL_CRS                   (1 << 17)
+#define DWC3_DCTL_CSS                   (1 << 16)
 
-#define DWC3_DCTL_INITU2ENA     (1 << 12)
-#define DWC3_DCTL_ACCEPTU2ENA   (1 << 11)
-#define DWC3_DCTL_INITU1ENA     (1 << 10)
-#define DWC3_DCTL_ACCEPTU1ENA   (1 << 9)
-#define DWC3_DCTL_TSTCTRL_MASK  (0xf << 1)
+#define DWC3_DCTL_INITU2ENA             (1 << 12)
+#define DWC3_DCTL_ACCEPTU2ENA           (1 << 11)
+#define DWC3_DCTL_INITU1ENA             (1 << 10)
+#define DWC3_DCTL_ACCEPTU1ENA           (1 << 9)
+#define DWC3_DCTL_TSTCTRL_MASK          (0xf << 1)
 
 #define DWC3_DCTL_ULSTCHNGREQ_MASK      (0x0f << 5)
 #define DWC3_DCTL_ULSTCHNGREQ(n) (((n) << 5) & DWC3_DCTL_ULSTCHNGREQ_MASK)
@@ -657,17 +674,41 @@ struct dwc3_scratchpad_array {
  * @regset: debugfs pointer to regdump file
  * @test_mode: true when we're entering a USB test mode
  * @test_mode_nr: test feature selector
+ * @lpm_nyet_threshold: LPM NYET response threshold
+ * @hird_threshold: HIRD threshold
  * @delayed_status: true when gadget driver asks for delayed status
  * @ep0_bounced: true when we used bounce buffer
  * @ep0_expect_in: true when we expect a DATA IN transfer
  * @has_hibernation: true when dwc3 was configured with Hibernation
+ * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that
+ *                      there's now way for software to detect this in runtime.
+ * @is_utmi_l1_suspend: the core asserts output signal
+ *      0       - utmi_sleep_n
+ *      1       - utmi_l1_suspend_n
  * @is_selfpowered: true when we are selfpowered
+ * @is_fpga: true when we are using the FPGA board
  * @needs_fifo_resize: not all users might want fifo resizing, flag it
  * @pullups_connected: true when Run/Stop bit is set
  * @resize_fifos: tells us it's ok to reconfigure our TxFIFO sizes.
  * @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround
  * @start_config_issued: true when StartConfig command has been issued
  * @three_stage_setup: set if we perform a three phase setup
+ * @disable_scramble_quirk: set if we enable the disable scramble quirk
+ * @u2exit_lfps_quirk: set if we enable u2exit lfps quirk
+ * @u2ss_inp3_quirk: set if we enable P3 OK for U2/SS Inactive quirk
+ * @req_p1p2p3_quirk: set if we enable request p1p2p3 quirk
+ * @del_p1p2p3_quirk: set if we enable delay p1p2p3 quirk
+ * @del_phy_power_chg_quirk: set if we enable delay phy power change quirk
+ * @lfps_filter_quirk: set if we enable LFPS filter quirk
+ * @rx_detect_poll_quirk: set if we enable rx_detect to polling lfps quirk
+ * @dis_u3_susphy_quirk: set if we disable usb3 suspend phy
+ * @dis_u2_susphy_quirk: set if we disable usb2 suspend phy
+ * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
+ * @tx_de_emphasis: Tx de-emphasis value
+ *      0       - -6dB de-emphasis
+ *      1       - -3.5dB de-emphasis
+ *      2       - No de-emphasis
+ *      3       - Reserved
  */
 struct dwc3 {
         struct usb_ctrlrequest  *ctrl_req;
@@ -759,18 +800,37 @@ struct dwc3 {
 
         u8                      test_mode;
         u8                      test_mode_nr;
+        u8                      lpm_nyet_threshold;
+        u8                      hird_threshold;
 
         unsigned                delayed_status:1;
         unsigned                ep0_bounced:1;
         unsigned                ep0_expect_in:1;
         unsigned                has_hibernation:1;
+        unsigned                has_lpm_erratum:1;
+        unsigned                is_utmi_l1_suspend:1;
         unsigned                is_selfpowered:1;
+        unsigned                is_fpga:1;
         unsigned                needs_fifo_resize:1;
         unsigned                pullups_connected:1;
         unsigned                resize_fifos:1;
         unsigned                setup_packet_pending:1;
         unsigned                start_config_issued:1;
         unsigned                three_stage_setup:1;
+
+        unsigned                disable_scramble_quirk:1;
+        unsigned                u2exit_lfps_quirk:1;
+        unsigned                u2ss_inp3_quirk:1;
+        unsigned                req_p1p2p3_quirk:1;
+        unsigned                del_p1p2p3_quirk:1;
+        unsigned                del_phy_power_chg_quirk:1;
+        unsigned                lfps_filter_quirk:1;
+        unsigned                rx_detect_poll_quirk:1;
+        unsigned                dis_u3_susphy_quirk:1;
+        unsigned                dis_u2_susphy_quirk:1;
+
+        unsigned                tx_de_emphasis_quirk:1;
+        unsigned                tx_de_emphasis:2;
 };
 
 /* -------------------------------------------------------------------------- */
@@ -964,20 +1024,9 @@ static inline int dwc3_send_gadget_generic_command(struct dwc3 *dwc,
 
 /* power management interface */
 #if !IS_ENABLED(CONFIG_USB_DWC3_HOST)
-int dwc3_gadget_prepare(struct dwc3 *dwc);
-void dwc3_gadget_complete(struct dwc3 *dwc);
 int dwc3_gadget_suspend(struct dwc3 *dwc);
 int dwc3_gadget_resume(struct dwc3 *dwc);
 #else
-static inline int dwc3_gadget_prepare(struct dwc3 *dwc)
-{
-        return 0;
-}
-
-static inline void dwc3_gadget_complete(struct dwc3 *dwc)
-{
-}
-
 static inline int dwc3_gadget_suspend(struct dwc3 *dwc)
 {
         return 0;