usb: dwc2: Fix session request interrupt handler

Artur Petrosyan · gregkh · commit 42b32b164ace · 2021-04-09T15:16:38.000+02:00
According to programming guide in host mode, port power must be turned on in session request interrupt handlers. Fixes: 21795c8 ("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>
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
@@ -307,6 +307,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);
@@ -328,6 +329,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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,7 @@ static void dwc2_handle_conn_id_status_change_intr(struct dwc2_hsotg *hsotg)`
`307`	`307`	`static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)`
`308`	`308`	`{`
`309`	`309`	`int ret;`
	`310`	`+ u32 hprt0;`
`310`	`311`
`311`	`312`	`/* Clear interrupt */`
`312`	`313`	`dwc2_writel(hsotg, GINTSTS_SESSREQINT, GINTSTS);`
`@@ -328,6 +329,13 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)`
`328`	`329`	`* established`
`329`	`330`	`*/`
`330`	`331`	`dwc2_hsotg_disconnect(hsotg);`
	`332`	`+ } else {`
	`333`	`+ /* Turn on the port power bit. */`
	`334`	`+ hprt0 = dwc2_read_hprt0(hsotg);`
	`335`	`+ hprt0 \|= HPRT0_PWR;`
	`336`	`+ dwc2_writel(hsotg, hprt0, HPRT0);`
	`337`	`+ /* Connect hcd after port power is set. */`
	`338`	`+ dwc2_hcd_connect(hsotg);`
`331`	`339`	`}`
`332`	`340`	`}`
`333`	`341`