usb: dwc3: fix gadget mode suspend interrupt handler issue
[ Upstream commit4e8ef34e36
] 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:799e9dc829
("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>
This commit is contained in:
Родитель
7919af1dcb
Коммит
f191711553
|
@ -1085,6 +1085,7 @@ struct dwc3_scratchpad_array {
|
||||||
* 3 - Reserved
|
* 3 - Reserved
|
||||||
* @dis_metastability_quirk: set to disable metastability quirk.
|
* @dis_metastability_quirk: set to disable metastability quirk.
|
||||||
* @dis_split_quirk: set to disable split boundary.
|
* @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
|
* @imod_interval: set the interrupt moderation interval in 250ns
|
||||||
* increments or 0 to disable.
|
* increments or 0 to disable.
|
||||||
* @max_cfg_eps: current max number of IN eps used across all USB configs.
|
* @max_cfg_eps: current max number of IN eps used across all USB configs.
|
||||||
|
@ -1298,6 +1299,7 @@ struct dwc3 {
|
||||||
|
|
||||||
unsigned dis_split_quirk:1;
|
unsigned dis_split_quirk:1;
|
||||||
unsigned async_callbacks:1;
|
unsigned async_callbacks:1;
|
||||||
|
unsigned suspended:1;
|
||||||
|
|
||||||
u16 imod_interval;
|
u16 imod_interval;
|
||||||
|
|
||||||
|
|
|
@ -3694,6 +3694,8 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)
|
||||||
{
|
{
|
||||||
int reg;
|
int reg;
|
||||||
|
|
||||||
|
dwc->suspended = false;
|
||||||
|
|
||||||
dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RX_DET);
|
dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RX_DET);
|
||||||
|
|
||||||
reg = dwc3_readl(dwc->regs, DWC3_DCTL);
|
reg = dwc3_readl(dwc->regs, DWC3_DCTL);
|
||||||
|
@ -3714,6 +3716,8 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
|
||||||
{
|
{
|
||||||
u32 reg;
|
u32 reg;
|
||||||
|
|
||||||
|
dwc->suspended = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ideally, dwc3_reset_gadget() would trigger the function
|
* Ideally, dwc3_reset_gadget() would trigger the function
|
||||||
* drivers to stop any active transfers through ep disable.
|
* drivers to stop any active transfers through ep disable.
|
||||||
|
@ -3919,6 +3923,8 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
|
||||||
|
|
||||||
static void dwc3_gadget_wakeup_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
|
* TODO take core out of low power mode when that's
|
||||||
* implemented.
|
* implemented.
|
||||||
|
@ -4034,8 +4040,10 @@ static void dwc3_gadget_suspend_interrupt(struct dwc3 *dwc,
|
||||||
{
|
{
|
||||||
enum dwc3_link_state next = evtinfo & DWC3_LINK_STATE_MASK;
|
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);
|
dwc3_suspend_gadget(dwc);
|
||||||
|
}
|
||||||
|
|
||||||
dwc->link_state = next;
|
dwc->link_state = next;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче