[PATCH] usb: typec: ucsi: Fix the partner PD revision - Linux-stable-mirror

30 Aug 2024

The Partner PD Revision field in GET_CONNECTOR_CAPABILITY
data structure was introduced in UCSI v2.1. In
ucsi_check_connector_capability() the version was assumed to
be 2.0, and in ucsi_register_partner() the field is accessed
completely unconditionally.
Fixing the version in ucsi_check_connector_capability(), and
replacing the unconditional pd_revision assignment with a
direct call to ucsi_check_connector_capability() in
ucsi_register_port(). After this the revision is also
checked only if there is a PD contract.
Fixes: b9fccfdb4ebb ("usb: typec: ucsi: Get PD revision for partner")
Cc: stable@vger.kernel.org
Signed-off-by: Heikki Krogerus heikki.krogerus@linux.intel.com
---
 drivers/usb/typec/ucsi/ucsi.c | 50 ++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index f0b5867048e2..fad43f292e7f 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -959,6 +959,27 @@ static void ucsi_unregister_cable(struct ucsi_connector *con)
    con->cable = NULL;
 }
+static int ucsi_check_connector_capability(struct ucsi_connector *con)
+{
+	u64 command;
+	int ret;
+
+	if (!con->partner || con->ucsi->version < UCSI_VERSION_2_1)
+		return 0;
+
+	command = UCSI_GET_CONNECTOR_CAPABILITY | UCSI_CONNECTOR_NUMBER(con->num);
+	ret = ucsi_send_command(con->ucsi, command, &con->cap, sizeof(con->cap));
+	if (ret < 0) {
+		dev_err(con->ucsi->dev, "GET_CONNECTOR_CAPABILITY failed (%d)\n", ret);
+		return ret;
+	}
+
+	typec_partner_set_pd_revision(con->partner,
+		UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags));
+
+	return ret;
+}
+
 static void ucsi_pwr_opmode_change(struct ucsi_connector *con)
 {
    switch (UCSI_CONSTAT_PWR_OPMODE(con->status.flags)) {
@@ -968,6 +989,7 @@ static void ucsi_pwr_opmode_change(struct ucsi_connector *con)
    	ucsi_partner_task(con, ucsi_get_src_pdos, 30, 0);
    	ucsi_partner_task(con, ucsi_check_altmodes, 30, HZ);
    	ucsi_partner_task(con, ucsi_register_partner_pdos, 1, HZ);
+		ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ);
    	break;
    case UCSI_CONSTAT_PWR_OPMODE_TYPEC1_5:
    	con->rdo = 0;
@@ -1012,7 +1034,6 @@ static int ucsi_register_partner(struct ucsi_connector *con)
    if (con->ucsi->cap.features & UCSI_CAP_GET_PD_MESSAGE)
    	desc.identity = &con->partner_identity;
    desc.usb_pd = pwr_opmode == UCSI_CONSTAT_PWR_OPMODE_PD;
-	desc.pd_revision = UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags);
partner = typec_register_partner(con->port, &desc);
    if (IS_ERR(partner)) {
@@ -1089,27 +1110,6 @@ static void ucsi_partner_change(struct ucsi_connector *con)
    		con->num, u_role);
 }
-static int ucsi_check_connector_capability(struct ucsi_connector *con)
-{
-	u64 command;
-	int ret;
-
-	if (!con->partner || con->ucsi->version < UCSI_VERSION_2_0)
-		return 0;
-
-	command = UCSI_GET_CONNECTOR_CAPABILITY | UCSI_CONNECTOR_NUMBER(con->num);
-	ret = ucsi_send_command(con->ucsi, command, &con->cap, sizeof(con->cap));
-	if (ret < 0) {
-		dev_err(con->ucsi->dev, "GET_CONNECTOR_CAPABILITY failed (%d)\n", ret);
-		return ret;
-	}
-
-	typec_partner_set_pd_revision(con->partner,
-		UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags));
-
-	return ret;
-}
-
 static int ucsi_check_connection(struct ucsi_connector *con)
 {
    u8 prev_flags = con->status.flags;
@@ -1231,15 +1231,16 @@ static void ucsi_handle_connector_change(struct work_struct *work)
    	if (con->status.flags & UCSI_CONSTAT_CONNECTED) {
    		ucsi_register_partner(con);
    		ucsi_partner_task(con, ucsi_check_connection, 1, HZ);
-			ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ);
    		if (con->ucsi->cap.features & UCSI_CAP_GET_PD_MESSAGE)
    			ucsi_partner_task(con, ucsi_get_partner_identity, 1, HZ);
    		if (con->ucsi->cap.features & UCSI_CAP_CABLE_DETAILS)
    			ucsi_partner_task(con, ucsi_check_cable, 1, HZ);
if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) ==
-			    UCSI_CONSTAT_PWR_OPMODE_PD)
+			    UCSI_CONSTAT_PWR_OPMODE_PD) {
    			ucsi_partner_task(con, ucsi_register_partner_pdos, 1, HZ);
+				ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ);
+			}
    	} else {
    		ucsi_unregister_partner(con);
    	}
@@ -1668,6 +1669,7 @@ static int ucsi_register_port(struct ucsi *ucsi, struct ucsi_connector *con)
    	ucsi_register_device_pdos(con);
    	ucsi_get_src_pdos(con);
    	ucsi_check_altmodes(con);
+		ucsi_check_connector_capability(con);
    }
trace_ucsi_register_port(con->num, &con->status);
-- 
2.45.2



    