From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Andrei Kuchynski <akuchynski@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jameson Thies <jthies@google.com>,
Abhishek Pandit-Subedi <abhishekpandit@chromium.org>,
Benson Leung <bleung@chromium.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Diogo Ivo <diogo.ivo@tecnico.ulisboa.pt>,
Pooja Katiyar <pooja.katiyar@intel.com>,
Madhu M <madhu.m@intel.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH 1/2] usb: typec: ucsi: displayport: Fix deadlock
Date: Thu, 10 Apr 2025 10:01:39 +0300 [thread overview]
Message-ID: <Z_ds09xFjwedjTam@kuha.fi.intel.com> (raw)
In-Reply-To: <20250409140221.654892-2-akuchynski@chromium.org>
Hi Andrei,
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -1922,6 +1922,42 @@ void ucsi_set_drvdata(struct ucsi *ucsi, void *data)
> }
> EXPORT_SYMBOL_GPL(ucsi_set_drvdata);
>
> +/**
> + * ucsi_con_mutex_lock - Acquire the connector mutex
> + * @con: The connector interface to lock
> + *
> + * Returns true on success, false if the connector is disconnected
> + */
> +bool ucsi_con_mutex_lock(struct ucsi_connector *con)
> +{
> + bool mutex_locked = false;
> + bool connected = true;
> +
> + while (connected && !mutex_locked) {
> + mutex_locked = mutex_trylock(&con->lock) != 0;
> + connected = UCSI_CONSTAT(con, CONNECTED);
> + if (connected && !mutex_locked)
> + msleep(20);
> + }
> +
> + connected = connected && con->partner;
> + if (!connected && mutex_locked)
> + mutex_unlock(&con->lock);
> +
> + return connected;
> +}
> +EXPORT_SYMBOL_GPL(ucsi_con_mutex_lock);
> +
> +/**
> + * ucsi_con_mutex_unlock - Release the connector mutex
> + * @con: The connector interface to unlock
> + */
> +void ucsi_con_mutex_unlock(struct ucsi_connector *con)
> +{
> + mutex_unlock(&con->lock);
> +}
> +EXPORT_SYMBOL_GPL(ucsi_con_mutex_unlock);
No need to export these.
thanks,
--
heikki
next prev parent reply other threads:[~2025-04-10 7:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-09 14:02 [PATCH 0/2] Fix thread synchronization issues Andrei Kuchynski
2025-04-09 14:02 ` [PATCH 1/2] usb: typec: ucsi: displayport: Fix deadlock Andrei Kuchynski
2025-04-10 7:01 ` Heikki Krogerus [this message]
2025-04-09 14:02 ` [PATCH 2/2] usb: typec: ucsi: displayport: Fix NULL pointer access Andrei Kuchynski
2025-04-10 7:03 ` Heikki Krogerus
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=Z_ds09xFjwedjTam@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=abhishekpandit@chromium.org \
--cc=akuchynski@chromium.org \
--cc=bleung@chromium.org \
--cc=diogo.ivo@tecnico.ulisboa.pt \
--cc=dmitry.baryshkov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jthies@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=madhu.m@intel.com \
--cc=pooja.katiyar@intel.com \
--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