[ Sasha's backport helper bot ]
Hi,
Summary of potential issues: ⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 364618c89d4c57c85e5fc51a2446cd939bf57802
Status in newer kernel trees: 6.14.y | Present (different SHA1: 64ae1063347e) 6.12.y | Present (different SHA1: 477e97e46b74) 6.6.y | Present (different SHA1: 3dc48bb63649)
Note: The patch differs from the upstream commit: --- 1: 364618c89d4c5 ! 1: 1e9e5ea8c6147 usb: typec: ucsi: displayport: Fix deadlock @@ Commit message
Cc: stable stable@kernel.org Fixes: af8622f6a585 ("usb: typec: ucsi: Support for DisplayPort alt mode") + Change-Id: I8b77692a60f77b8ddbb0503088f447fe1bb6a512 Signed-off-by: Andrei Kuchynski akuchynski@chromium.org Reviewed-by: Heikki Krogerus heikki.krogerus@linux.intel.com Link: https://lore.kernel.org/r/20250424084429.3220757-2-akuchynski@chromium.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org + (cherry picked from commit 364618c89d4c57c85e5fc51a2446cd939bf57802)
## drivers/usb/typec/ucsi/displayport.c ## @@ drivers/usb/typec/ucsi/displayport.c: static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo) @@ drivers/usb/typec/ucsi/ucsi.c: void ucsi_set_drvdata(struct ucsi *ucsi, void *da + + while (connected && !mutex_locked) { + mutex_locked = mutex_trylock(&con->lock) != 0; -+ connected = UCSI_CONSTAT(con, CONNECTED); ++ connected = con->status.flags & UCSI_CONSTAT_CONNECTED; + if (connected && !mutex_locked) + msleep(20); + } @@ drivers/usb/typec/ucsi/ucsi.c: void ucsi_set_drvdata(struct ucsi *ucsi, void *da * @dev: Device interface to the PPM (Platform Policy Manager)
## drivers/usb/typec/ucsi/ucsi.h ## +@@ + + struct ucsi; + struct ucsi_altmode; ++struct ucsi_connector; + + /* UCSI offsets (Bytes) */ + #define UCSI_VERSION 0 @@ drivers/usb/typec/ucsi/ucsi.h: int ucsi_register(struct ucsi *ucsi); void ucsi_unregister(struct ucsi *ucsi); void *ucsi_get_drvdata(struct ucsi *ucsi); ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |