usb: typec: ucsi: Always set number of alternate modes

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>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240510201244.2968152-5-jthies@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index bb6e57064513dab7514ede34ad23170497ff93ee..52a14bfe4107e5e0e30660340c6514ccf20c29d7 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -812,10 +812,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;
@@ -1138,7 +1139,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;
@@ -1172,6 +1173,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;
 }