usb: dwc2: Enable LPM Transaction Received interrupt

Enable "LPM Transaction Received" interrupt for receive an
interrupt when host will send LPM token.

Signed-off-by: Sevak Arakelyan <sevaka@synopsys.com>
Signed-off-by: Grigor Tovmasyan <tovmasya@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index 5ad3c9df85f50bba9328aeb116f7c0c64b87a514..23599e798e24acb540a21e5eccfb1a901dc2c0c9 100644 (file)
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -560,7 +560,7 @@ static void dwc2_handle_lpm_intr(struct dwc2_hsotg *hsotg)
        hird_thres = (glpmcfg & GLPMCFG_HIRD_THRES_MASK &
                        ~GLPMCFG_HIRD_THRES_EN) >> GLPMCFG_HIRD_THRES_SHIFT;
        hird_thres_en = glpmcfg & GLPMCFG_HIRD_THRES_EN;
-       enslpm = glpmcfg & GLPMCFG_SNDLPM;
+       enslpm = glpmcfg & GLPMCFG_ENBLSLPM;
 
        if (dwc2_is_device_mode(hsotg)) {
                dev_dbg(hsotg->dev, "HIRD_THRES_EN = %d\n", hird_thres_en);
@@ -595,7 +595,8 @@ static void dwc2_handle_lpm_intr(struct dwc2_hsotg *hsotg)
 #define GINTMSK_COMMON (GINTSTS_WKUPINT | GINTSTS_SESSREQINT |         \
                         GINTSTS_CONIDSTSCHNG | GINTSTS_OTGINT |        \
                         GINTSTS_MODEMIS | GINTSTS_DISCONNINT |         \
-                        GINTSTS_USBSUSP | GINTSTS_PRTINT)
+                        GINTSTS_USBSUSP | GINTSTS_PRTINT |             \
+                        GINTSTS_LPMTRANRCVD)
 
 /*
  * This function returns the Core Interrupt register

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 47b098380f10c9c9227d74747e7285de030309bb..ddfe6a94a12ab4e0c0ccf79804be79ea55ac634b 100644 (file)
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3266,7 +3266,8 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
                GINTSTS_GOUTNAKEFF | GINTSTS_GINNAKEFF |
                GINTSTS_USBRST | GINTSTS_RESETDET |
                GINTSTS_ENUMDONE | GINTSTS_OTGINT |
-               GINTSTS_USBSUSP | GINTSTS_WKUPINT;
+               GINTSTS_USBSUSP | GINTSTS_WKUPINT |
+               GINTSTS_LPMTRANRCVD;
 
        if (!using_desc_dma(hsotg))
                intmsk |= GINTSTS_INCOMPL_SOIN | GINTSTS_INCOMPL_SOOUT;

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index edcc9058274a3c86c859033cf2dc715b439b09a4..bbd3185a736492703fdf4c8a8db3770a8d4a7139 100644 (file)
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -91,6 +91,9 @@ static void dwc2_enable_common_interrupts(struct dwc2_hsotg *hsotg)
        intmsk |= GINTSTS_WKUPINT | GINTSTS_USBSUSP |
                  GINTSTS_SESSREQINT;
 
+       if (dwc2_is_device_mode(hsotg) && hsotg->params.lpm)
+               intmsk |= GINTSTS_LPMTRANRCVD;
+
        dwc2_writel(intmsk, hsotg->regs + GINTMSK);
 }