Skip to content

Commit

Permalink
usb: dwc2: gadget: Fix exiting from clock gating
Browse files Browse the repository at this point in the history 
Added exiting from the clock gating mode on USB Reset Detect interrupt
if core in the clock gating mode.
Added new condition to check core in clock gating mode or no.

Fixes: 9b4965d ("usb: dwc2: Add exit clock gating from session request interrupt")
Fixes: 5d240ef ("usb: dwc2: Add exit clock gating from wakeup interrupt")
Fixes: 16c729f ("usb: dwc2: Allow exit clock gating in urb enqueue")
Fixes: 401411b ("usb: dwc2: Add exit clock gating before removing driver")
CC: stable@vger.kernel.org
Signed-off-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Link: https://lore.kernel.org/r/cbcc2ccd37e89e339130797ed68ae4597db773ac.1708938774.git.Minas.Harutyunyan@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Minas Harutyunyan authored and Greg Kroah-Hartman committed Mar 26, 2024
1 parent b258e42 commit 31f42da
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
9 changes: 6 additions & 3 deletions drivers/usb/dwc2/core_intr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg)

/* Exit gadget mode clock gating. */
if (hsotg->params.power_down ==
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended)
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended &&
!hsotg->params.no_clock_gating)
dwc2_gadget_exit_clock_gating(hsotg, 0);
}

Expand Down Expand Up @@ -408,7 +409,8 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)

/* Exit gadget mode clock gating. */
if (hsotg->params.power_down ==
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended)
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended &&
!hsotg->params.no_clock_gating)
dwc2_gadget_exit_clock_gating(hsotg, 0);
} else {
/* Change to L0 state */
Expand All @@ -425,7 +427,8 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg)
}

if (hsotg->params.power_down ==
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended)
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended &&
!hsotg->params.no_clock_gating)
dwc2_host_exit_clock_gating(hsotg, 1);

/*
Expand Down
6 changes: 6 additions & 0 deletions drivers/usb/dwc2/gadget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3727,6 +3727,12 @@ static irqreturn_t dwc2_hsotg_irq(int irq, void *pw)
if (hsotg->in_ppd && hsotg->lx_state == DWC2_L2)
dwc2_exit_partial_power_down(hsotg, 0, true);

/* Exit gadget mode clock gating. */
if (hsotg->params.power_down ==
DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended &&
!hsotg->params.no_clock_gating)
dwc2_gadget_exit_clock_gating(hsotg, 0);

hsotg->lx_state = DWC2_L0;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/dwc2/hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4657,7 +4657,7 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
}

if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE &&
hsotg->bus_suspended) {
hsotg->bus_suspended && !hsotg->params.no_clock_gating) {
if (dwc2_is_device_mode(hsotg))
dwc2_gadget_exit_clock_gating(hsotg, 0);
else
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/dwc2/platform.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static void dwc2_driver_remove(struct platform_device *dev)

/* Exit clock gating when driver is removed. */
if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE &&
hsotg->bus_suspended) {
hsotg->bus_suspended && !hsotg->params.no_clock_gating) {
if (dwc2_is_device_mode(hsotg))
dwc2_gadget_exit_clock_gating(hsotg, 0);
else
Expand Down

0 comments on commit 31f42da

Please sign in to comment.