Re: [PATCH v1 3/3] usb: typec: ucsi: Get PD revision for partner

[Heikki Krogerus]

Hi Abhishek,

Few nitpicks for this one.

On Tue, Jan 23, 2024 at 02:30:36PM -0800, Abhishek Pandit-Subedi wrote:
> From: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
> 
> 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.
> 
> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
> ---
> $ cat /sys/class/typec/port2-partner/usb_power_delivery_revision
> 3.0
> 
>  drivers/usb/typec/ucsi/ucsi.c | 25 +++++++++++++++++++++++++
>  drivers/usb/typec/ucsi/ucsi.h |  3 +++
>  2 files changed, 28 insertions(+)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index 4edf785d203b..8e0a512853ba 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -782,6 +782,8 @@ 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);

	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)) {
> @@ -856,6 +858,28 @@ 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 && !IS_MIN_VERSION_2_0(con->ucsi))
> +		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));

	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;
> @@ -925,6 +949,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)
> diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
> index 94b373378f63..5e60328f398e 100644
> --- a/drivers/usb/typec/ucsi/ucsi.h
> +++ b/drivers/usb/typec/ucsi/ucsi.h
> @@ -36,6 +36,9 @@ struct dentry;
>  #define UCSI_BCD_GET_MINOR(_v_)		(((_v_) >> 4) & 0x0F)
>  #define UCSI_BCD_GET_SUBMINOR(_v_)	((_v_) & 0x0F)
>  
> +#define IS_MIN_VERSION(ucsi, min_ver)	((ucsi)->version >= min_ver)

Probable better to use brackets also with that min_ver:

#define IS_MIN_VERSION(ucsi, min_ver)	((ucsi)->version >= (min_ver))

> +#define IS_MIN_VERSION_2_0(ucsi)	IS_MIN_VERSION(ucsi, UCSI_VERSION_2_0)
> +
>  /* Command Status and Connector Change Indication (CCI) bits */
>  #define UCSI_CCI_CONNECTOR(_c_)		(((_c_) & GENMASK(7, 1)) >> 1)
>  #define UCSI_CCI_LENGTH(_c_)		(((_c_) & GENMASK(15, 8)) >> 8)
> -- 
> 2.43.0.429.g432eaa2c6b-goog

thanks,

-- 
heikki