usb: typec: ucsi: Fix connector check on init

commit ce4c8d21054ae9396cd759fe6e8157b525616dc4 upstream.

Fix issues when initially checking for a connector change:
- Use the correct connector number not the entire CCI.
- Call ->read under the PPM lock.
- Remove a bogus READ_ONCE.

Fixes: 808a8b9e0b87 ("usb: typec: ucsi: Check for notifications after init")
Cc: stable@kernel.org
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240401210515.1902048-1-lk@c--e.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index df7c42df9ea0d755adbdf11f9960a4edfe49f344..cb6458ec042cd5e151d28aed91a2eb8ef8b0d126 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -1294,11 +1294,13 @@ static int ucsi_init(struct ucsi *ucsi)
 
        ucsi->ntfy = ntfy;
 
+       mutex_lock(&ucsi->ppm_lock);
        ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci));
+       mutex_unlock(&ucsi->ppm_lock);
        if (ret)
                return ret;
-       if (UCSI_CCI_CONNECTOR(READ_ONCE(cci)))
-               ucsi_connector_change(ucsi, cci);
+       if (UCSI_CCI_CONNECTOR(cci))
+               ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci));
 
        return 0;