Skip to content

Commit

Permalink
usb: typec: ucsi: Get PD revision for partner
Browse files Browse the repository at this point in the history
PD major revision for the port partner is described in
GET_CONNECTOR_CAPABILITY and is only valid on UCSI 2.0 and newer. Update
the pd_revision on the partner if the UCSI version is 2.0 or newer.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Link: https://lore.kernel.org/r/20240209143723.v5.3.Idf7d373c3cbb54058403cb951d644f1f09973d15@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
apandit authored and gregkh committed Feb 17, 2024
1 parent 335e3ef commit b9fccfd
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions drivers/usb/typec/ucsi/ucsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@ static int ucsi_register_partner(struct ucsi_connector *con)
}

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)) {
Expand Down Expand Up @@ -856,6 +857,27 @@ 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;
Expand Down Expand Up @@ -925,6 +947,7 @@ 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 (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) ==
UCSI_CONSTAT_PWR_OPMODE_PD)
Expand Down

0 comments on commit b9fccfd

Please sign in to comment.