From: Jameson Thies <jthies@google.com>
To: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org
Cc: jthies@google.com, pmalani@chromium.org, bleung@google.com,
abhishekpandit@chromium.org, andersson@kernel.org,
dmitry.baryshkov@linaro.org, fabrice.gasnier@foss.st.com,
gregkh@linuxfoundation.org, hdegoede@redhat.com,
neil.armstrong@linaro.org, rajaram.regupathy@intel.com,
saranya.gopal@intel.com, linux-kernel@vger.kernel.org,
Benson Leung <bleung@chromium.org>
Subject: [PATCH v2 4/4] usb: typec: ucsi: Always set number of alternate modes
Date: Wed, 24 Apr 2024 01:48:21 +0000 [thread overview]
Message-ID: <20240424014821.4154159-5-jthies@google.com> (raw)
In-Reply-To: <20240424014821.4154159-1-jthies@google.com>
Providing the number of known alternate modes allows user space to
determine when device registration has completed. Always register a
number of known alternate modes for the partner and cable plug, even
when the number of supported alternate modes is 0.
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Jameson Thies <jthies@google.com>
---
Changes in V2:
- None.
drivers/usb/typec/ucsi/ucsi.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index f167891e3f79d..994b8a6b6be96 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -815,10 +815,11 @@ static int ucsi_check_altmodes(struct ucsi_connector *con)
/* Ignoring the errors in this case. */
if (con->partner_altmode[0]) {
num_partner_am = ucsi_get_num_altmode(con->partner_altmode);
- if (num_partner_am > 0)
- typec_partner_set_num_altmodes(con->partner, num_partner_am);
+ typec_partner_set_num_altmodes(con->partner, num_partner_am);
ucsi_altmode_update_active(con);
return 0;
+ } else {
+ typec_partner_set_num_altmodes(con->partner, 0);
}
return ret;
@@ -1141,7 +1142,7 @@ static int ucsi_check_connection(struct ucsi_connector *con)
static int ucsi_check_cable(struct ucsi_connector *con)
{
u64 command;
- int ret;
+ int ret, num_plug_am;
if (con->cable)
return 0;
@@ -1175,6 +1176,13 @@ static int ucsi_check_cable(struct ucsi_connector *con)
return ret;
}
+ if (con->plug_altmode[0]) {
+ num_plug_am = ucsi_get_num_altmode(con->plug_altmode);
+ typec_plug_set_num_altmodes(con->plug, num_plug_am);
+ } else {
+ typec_plug_set_num_altmodes(con->plug, 0);
+ }
+
return 0;
}
--
2.44.0.769.g3c40516874-goog
prev parent reply other threads:[~2024-04-24 1:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 1:48 [PATCH v2 0/4] usb: typec: ucsi: Update UCSI alternate mode Jameson Thies
2024-04-24 1:48 ` [PATCH v2 1/4] usb: typec: ucsi: Fix null deref in trace Jameson Thies
2024-04-24 2:06 ` Dmitry Baryshkov
2024-04-25 0:00 ` Abhishek Pandit-Subedi
2024-04-25 5:30 ` Christian A. Ehrhardt
2024-04-25 8:51 ` Markus Elfring
2024-04-25 19:35 ` Greg Kroah-Hartman
2024-04-30 0:43 ` Jameson Thies
2024-04-30 1:00 ` Dmitry Baryshkov
2024-04-30 1:14 ` Jameson Thies
2024-04-30 7:17 ` Dan Carpenter
2024-05-02 22:47 ` Jameson Thies
2024-05-03 12:03 ` Dan Carpenter
2024-04-24 1:48 ` [PATCH v2 2/4] usb: typec: Update sysfs when setting ops Jameson Thies
2024-04-24 1:48 ` [PATCH v2 3/4] usb: typec: ucsi: Delay alternate mode discovery Jameson Thies
2024-04-24 1:48 ` Jameson Thies [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=20240424014821.4154159-5-jthies@google.com \
--to=jthies@google.com \
--cc=abhishekpandit@chromium.org \
--cc=andersson@kernel.org \
--cc=bleung@chromium.org \
--cc=bleung@google.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=fabrice.gasnier@foss.st.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=pmalani@chromium.org \
--cc=rajaram.regupathy@intel.com \
--cc=saranya.gopal@intel.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).