Skip to content

Commit

Permalink
usb: dwc3: fix gadget mode suspend interrupt handler issue
Browse files Browse the repository at this point in the history
[ Upstream commit 4e8ef34 ]

When work in gadget mode, currently driver doesn't update software level
link_state correctly as link state change event is not enabled for most
devices, in function dwc3_gadget_suspend_interrupt(), it will only pass
suspend event to UDC core when software level link state changes, so when
interrupt generated in sequences of suspend -> reset -> conndone ->
suspend, link state is not updated during reset and conndone, so second
suspend interrupt event will not pass to UDC core.

Remove link_state compare in dwc3_gadget_suspend_interrupt() and add a
suspended flag to replace the compare function.

Fixes: 799e9dc ("usb: dwc3: gadget: conditionally disable Link State change events")
Cc: stable <stable@kernel.org>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230512004524.31950-1-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Linyu Yuan authored and gregkh committed May 30, 2023
1 parent dc7cfe5 commit 3328fe0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/usb/dwc3/core.h
Expand Up @@ -1110,6 +1110,7 @@ struct dwc3_scratchpad_array {
* 3 - Reserved
* @dis_metastability_quirk: set to disable metastability quirk.
* @dis_split_quirk: set to disable split boundary.
* @suspended: set to track suspend event due to U3/L2.
* @imod_interval: set the interrupt moderation interval in 250ns
* increments or 0 to disable.
* @max_cfg_eps: current max number of IN eps used across all USB configs.
Expand Down Expand Up @@ -1327,6 +1328,7 @@ struct dwc3 {

unsigned dis_split_quirk:1;
unsigned async_callbacks:1;
unsigned suspended:1;

u16 imod_interval;

Expand Down
10 changes: 9 additions & 1 deletion drivers/usb/dwc3/gadget.c
Expand Up @@ -3838,6 +3838,8 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)
{
int reg;

dwc->suspended = false;

dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RX_DET);

reg = dwc3_readl(dwc->regs, DWC3_DCTL);
Expand Down Expand Up @@ -3869,6 +3871,8 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
{
u32 reg;

dwc->suspended = false;

/*
* Ideally, dwc3_reset_gadget() would trigger the function
* drivers to stop any active transfers through ep disable.
Expand Down Expand Up @@ -4098,6 +4102,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)

static void dwc3_gadget_wakeup_interrupt(struct dwc3 *dwc)
{
dwc->suspended = false;

/*
* TODO take core out of low power mode when that's
* implemented.
Expand Down Expand Up @@ -4213,8 +4219,10 @@ static void dwc3_gadget_suspend_interrupt(struct dwc3 *dwc,
{
enum dwc3_link_state next = evtinfo & DWC3_LINK_STATE_MASK;

if (dwc->link_state != next && next == DWC3_LINK_STATE_U3)
if (!dwc->suspended && next == DWC3_LINK_STATE_U3) {
dwc->suspended = true;
dwc3_suspend_gadget(dwc);
}

dwc->link_state = next;
}
Expand Down

0 comments on commit 3328fe0

Please sign in to comment.