usb: typec: ucsi: Register SOP' alternate modes with cable plug

Register SOP' alternate modes with a Type-C Connector Class cable plug.
Alternate modes are queried from the PPM using the GET_ALTERNATE_MODES
command with recipient set to SOP'.

Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jameson Thies <jthies@google.com>
Link: https://lore.kernel.org/r/20240305025804.1290919-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 3b64a0f51041cbe2d5c87cf66289d08f6d0f298e..cf52cb34d28592ccc76044a18a2cecc7f6280fda 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -399,6 +399,27 @@ static int ucsi_register_altmode(struct ucsi_connector *con,
 
                con->partner_altmode[i] = alt;
                break;
+       case UCSI_RECIPIENT_SOP_P:
+               i = ucsi_next_altmode(con->plug_altmode);
+               if (i < 0) {
+                       ret = i;
+                       goto err;
+               }
+
+               ret = ucsi_altmode_next_mode(con->plug_altmode, desc->svid);
+               if (ret < 0)
+                       return ret;
+
+               desc->mode = ret;
+
+               alt = typec_plug_register_altmode(con->plug, desc);
+               if (IS_ERR(alt)) {
+                       ret = PTR_ERR(alt);
+                       goto err;
+               }
+
+               con->plug_altmode[i] = alt;
+               break;
        default:
                return -EINVAL;
        }
@@ -566,6 +587,9 @@ static void ucsi_unregister_altmodes(struct ucsi_connector *con, u8 recipient)
        case UCSI_RECIPIENT_SOP:
                adev = con->partner_altmode;
                break;
+       case UCSI_RECIPIENT_SOP_P:
+               adev = con->plug_altmode;
+               break;
        default:
                return;
        }
@@ -836,6 +860,33 @@ static void ucsi_unregister_partner_pdos(struct ucsi_connector *con)
        con->partner_pd = NULL;
 }
 
+static int ucsi_register_plug(struct ucsi_connector *con)
+{
+       struct typec_plug *plug;
+       struct typec_plug_desc desc = {.index = TYPEC_PLUG_SOP_P};
+
+       plug = typec_register_plug(con->cable, &desc);
+       if (IS_ERR(plug)) {
+               dev_err(con->ucsi->dev,
+                       "con%d: failed to register plug (%ld)\n", con->num,
+                       PTR_ERR(plug));
+               return PTR_ERR(plug);
+       }
+
+       con->plug = plug;
+       return 0;
+}
+
+static void ucsi_unregister_plug(struct ucsi_connector *con)
+{
+       if (!con->plug)
+               return;
+
+       ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP_P);
+       typec_unregister_plug(con->plug);
+       con->plug = NULL;
+}
+
 static int ucsi_register_cable(struct ucsi_connector *con)
 {
        struct typec_cable *cable;
@@ -879,6 +930,7 @@ static void ucsi_unregister_cable(struct ucsi_connector *con)
        if (!con->cable)
                return;
 
+       ucsi_unregister_plug(con);
        typec_unregister_cable(con->cable);
        memset(&con->cable_identity, 0, sizeof(con->cable_identity));
        con->cable = NULL;
@@ -1085,6 +1137,14 @@ static int ucsi_check_cable(struct ucsi_connector *con)
        if (ret < 0)
                return ret;
 
+       ret = ucsi_register_plug(con);
+       if (ret < 0)
+               return ret;
+
+       ret = ucsi_register_altmodes(con, UCSI_RECIPIENT_SOP_P);
+       if (ret < 0)
+               return ret;
+
        return 0;
 }
 

diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
index b89fae82e8ce730268c481995c9164ee617763f5..32daf5f5865053d8a239d6be911644ce481d9e69 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.h
+++ b/drivers/usb/typec/ucsi/ucsi.h
@@ -429,9 +429,11 @@ struct ucsi_connector {
        struct typec_port *port;
        struct typec_partner *partner;
        struct typec_cable *cable;
+       struct typec_plug *plug;
 
        struct typec_altmode *port_altmode[UCSI_MAX_ALTMODES];
        struct typec_altmode *partner_altmode[UCSI_MAX_ALTMODES];
+       struct typec_altmode *plug_altmode[UCSI_MAX_ALTMODES];
 
        struct typec_capability typec_cap;