]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: dwc2: Fix session request interrupt handler
authorArtur Petrosyan <Arthur.Petrosyan@synopsys.com>
Thu, 8 Apr 2021 09:45:49 +0000 (13:45 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:59:22 +0000 (10:59 +0200)
commit 42b32b164acecd850edef010915a02418345a033 upstream.

According to programming guide in host mode, port
power must be turned on in session request
interrupt handlers.

Fixes: 21795c826a45 ("usb: dwc2: exit hibernation on session request")
Cc: <stable@vger.kernel.org>
Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Signed-off-by: Artur Petrosyan <Arthur.Petrosyan@synopsys.com>
Link: https://lore.kernel.org/r/20210408094550.75484A0094@mailhost.synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc2/core_intr.c

index b23ce535c12e1d83989099aa7fa30e58f43e3810..14efa28e048fc58996af7ebcac4e5b2578fd85e5 100644 (file)
@@ -312,6 +312,7 @@ static void dwc2_handle_conn_id_status_change_intr(struct dwc2_hsotg *hsotg)
 static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)
 {
        int ret;
+       u32 hprt0;
 
        /* Clear interrupt */
        dwc2_writel(hsotg, GINTSTS_SESSREQINT, GINTSTS);
@@ -332,6 +333,13 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)
                 * established
                 */
                dwc2_hsotg_disconnect(hsotg);
+       } else {
+               /* Turn on the port power bit. */
+               hprt0 = dwc2_read_hprt0(hsotg);
+               hprt0 |= HPRT0_PWR;
+               dwc2_writel(hsotg, hprt0, HPRT0);
+               /* Connect hcd after port power is set. */
+               dwc2_hcd_connect(hsotg);
        }
 }