On Tue, Sep 03, 2024 at 08:19:17PM +0200, Christian A. Ehrhardt wrote: > If the busy indicator is set, all other fields in CCI should be > clear according to the spec. However, some UCSI implementations do > not follow this rule and report bogus data in CCI along with the > busy indicator. Ignore the contents of CCI if the busy indicator is > set. > > If a command timeout is hit it is possible that the EVENT_PENDING > bit is cleared while connector work is still scheduled which can > cause the EVENT_PENDING bit to go out of sync with scheduled connector > work. Check and set the EVENT_PENDING bit on entry to > ucsi_handle_connector_change() to fix this. > > Reported-by: Anurag Bijea <icaliberdev@xxxxxxxxx> > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219108 > Bisected-by: Christian Heusel <christian@xxxxxxxxx> > Tested-by: Anurag Bijea <icaliberdev@xxxxxxxxx> > Fixes: de52aca4d9d5 ("usb: typec: ucsi: Never send a lone connector change ack") > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Christian A. Ehrhardt <lk@xxxxxxx> > --- > drivers/usb/typec/ucsi/ucsi.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c > index 4039851551c1..540cb1d2822c 100644 > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -38,6 +38,10 @@ > > void ucsi_notify_common(struct ucsi *ucsi, u32 cci) > { > + /* Ignore bogus data in CCI if busy indicator is set. */ > + if (cci & UCSI_CCI_BUSY) > + return; I started testing this and it looks like the commands never get cancelled when the BUSY bit is set. I don't think this patch is the problem, though. I think the BUSY handling broke earlier, probable in 5e9c1662a89b ("usb: typec: ucsi: rework command execution functions"). I need to look at this a bit more carefully, but in the meantime, can you try this: if (cci & UCSI_CCI_BUSY) { complete(&ucsi->complete); return; } > if (UCSI_CCI_CONNECTOR(cci)) > ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci)); > thanks, -- heikki
