From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, akuchynski@chromium.org
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.15.y] usb: typec: ucsi: displayport: Fix deadlock
Date: Tue, 20 May 2025 03:52:20 -0400 [thread overview]
Message-ID: <20250519182548-93e326d4d142d87a@stable.kernel.org> (raw)
In-Reply-To: <20250519094330.3225918-1-akuchynski@chromium.org>
[ 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: 61fc1a8e1e10)
6.12.y | Not found
6.6.y | Not found
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: 364618c89d4c5 ! 1: caf9dc6a5a533 usb: typec: ucsi: displayport: Fix deadlock
@@ Commit message
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-5.15.y | Success | Success |
prev parent reply other threads:[~2025-05-20 7:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-12 10:43 FAILED: patch "[PATCH] usb: typec: ucsi: displayport: Fix deadlock" failed to apply to 5.15-stable tree gregkh
2025-05-14 15:01 ` [PATCH 5.15.y] usb: typec: ucsi: displayport: Fix deadlock Andrei Kuchynski
2025-05-15 0:28 ` Sasha Levin
2025-05-19 9:43 ` Andrei Kuchynski
2025-05-20 7:52 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250519182548-93e326d4d142d87a@stable.kernel.org \
--to=sashal@kernel.org \
--cc=akuchynski@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox