korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: ucsi: Check for notifications after init

Browse Source 
commit 808a8b9e0b upstream.

The completion notification for the final SET_NOTIFICATION_ENABLE
command during initialization can include a connector change
notification.  However, at the time this completion notification is
processed, the ucsi struct is not ready to handle this notification.
As a result the notification is ignored and the controller
never sends an interrupt again.

Re-check CCI for a pending connector state change after
initialization is complete. Adjust the corresponding debug
message accordingly.

Fixes: 71a1fa0df2 ("usb: typec: ucsi: Store the notification mask")
Cc: stable@vger.kernel.org
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian A. Ehrhardt 2024-03-20 08:39:23 +01:00 committed by Greg Kroah-Hartman
parent 3dfe35d868
commit 897a97b795
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/typec/ucsi/ucsi.c
View File

@ -975,7 +975,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
struct ucsi_connector *con = &ucsi->connector[num - 1]; struct ucsi_connector *con = &ucsi->connector[num - 1];
if (!(ucsi->ntfy & UCSI_ENABLE_NTFY_CONNECTOR_CHANGE)) { if (!(ucsi->ntfy & UCSI_ENABLE_NTFY_CONNECTOR_CHANGE)) {
dev_dbg(ucsi->dev, "Bogus connector change event\n"); dev_dbg(ucsi->dev, "Early connector change event\n");
return; return;
} }
@ -1406,6 +1406,7 @@ static int ucsi_init(struct ucsi *ucsi)
{ {
struct ucsi_connector *con, *connector; struct ucsi_connector *con, *connector;
u64 command, ntfy; u64 command, ntfy;
u32 cci;
int ret; int ret;
int i; int i;
@ -1458,6 +1459,13 @@ static int ucsi_init(struct ucsi *ucsi)
ucsi->connector = connector; ucsi->connector = connector;
ucsi->ntfy = ntfy; ucsi->ntfy = ntfy;
ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci));
if (ret)
return ret;
if (UCSI_CCI_CONNECTOR(READ_ONCE(cci)))
ucsi_connector_change(ucsi, cci);
return 0; return 0;
err_unregister: err_unregister: