Received-SPF: pass (google.com: domain of linux-kernel+bounces-77650-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 23 Feb 2024 01:47:37 +0000
From: Benson Leung <bleung@google.com>
To: Jameson Thies <jthies@google.com>
Cc: heikki.krogerus@linux.intel.com, linux-usb@vger.kernel.org,
	pmalani@chromium.org, abhishekpandit@chromium.org,
	andersson@kernel.org, dmitry.baryshkov@linaro.org,
	fabrice.gasnier@foss.st.com, gregkh@linuxfoundation.org,
	hdegoede@redhat.com, neil.armstrong@linaro.org,
	rajaram.regupathy@intel.com, saranya.gopal@intel.com,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] usb: typec: ucsi: Register SOP' alternate modes with
 cable plug
Message-ID: <Zdf5OQectSrBf_sn@google.com>
References: <20240223010328.2826774-1-jthies@google.com>
 <20240223010328.2826774-5-jthies@google.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="crR+FIe5gTszUjTd"
Content-Disposition: inline
In-Reply-To: <20240223010328.2826774-5-jthies@google.com>


--crR+FIe5gTszUjTd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi Jameson,

On Fri, Feb 23, 2024 at 01:03:28AM +0000, Jameson Thies wrote:
> 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'.
>=20

Is there a plan to do the same for the SOP Double Prime for advanced active
cables with two plugs?

> Signed-off-by: Jameson Thies <jthies@google.com>

Other than that question,

Reviewed-by: Benson Leung <bleung@chromium.org>

> ---
> Tested on v6.6 kernel. SOP' GET_ALTERNATE_MODE responses from the PPM
> are correctly registered as to the cable plug.
> redrix-rev3 /sys/class/typec # ls port2-cable/port2-plug0/
> device  port2-plug0.0  port2-plug0.1  power  subsystem  uevent
>=20
>  drivers/usb/typec/ucsi/ucsi.c | 60 +++++++++++++++++++++++++++++++++++
>  drivers/usb/typec/ucsi/ucsi.h |  2 ++
>  2 files changed, 62 insertions(+)
>=20
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index 6d6443e61faa..9b541547917b 100644
> --- 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_connect=
or *con,
> =20
>  		con->partner_altmode[i] =3D alt;
>  		break;
> +	case UCSI_RECIPIENT_SOP_P:
> +		i =3D ucsi_next_altmode(con->plug_altmode);
> +		if (i < 0) {
> +			ret =3D i;
> +			goto err;
> +		}
> +
> +		ret =3D ucsi_altmode_next_mode(con->plug_altmode, desc->svid);
> +		if (ret < 0)
> +			return ret;
> +
> +		desc->mode =3D ret;
> +
> +		alt =3D typec_plug_register_altmode(con->plug, desc);
> +		if (IS_ERR(alt)) {
> +			ret =3D PTR_ERR(alt);
> +			goto err;
> +		}
> +
> +		con->plug_altmode[i] =3D alt;
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> @@ -566,6 +587,9 @@ static void ucsi_unregister_altmodes(struct ucsi_conn=
ector *con, u8 recipient)
>  	case UCSI_RECIPIENT_SOP:
>  		adev =3D con->partner_altmode;
>  		break;
> +	case UCSI_RECIPIENT_SOP_P:
> +		adev =3D con->plug_altmode;
> +		break;
>  	default:
>  		return;
>  	}
> @@ -801,6 +825,33 @@ static void ucsi_unregister_partner_pdos(struct ucsi=
_connector *con)
>  	con->partner_pd =3D NULL;
>  }
> =20
> +static int ucsi_register_plug(struct ucsi_connector *con)
> +{
> +	struct typec_plug *plug;
> +	struct typec_plug_desc desc =3D {.index =3D TYPEC_PLUG_SOP_P};
> +
> +	plug =3D 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 =3D 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 =3D NULL;
> +}
> +
>  static int ucsi_register_cable(struct ucsi_connector *con)
>  {
>  	struct typec_cable *cable;
> @@ -842,6 +893,7 @@ static void ucsi_unregister_cable(struct ucsi_connect=
or *con)
>  	if (!con->cable)
>  		return;
> =20
> +	ucsi_unregister_plug(con);
>  	typec_unregister_cable(con->cable);
>  	con->cable =3D NULL;
>  	memset(&con->cable_identity, 0, sizeof(con->cable_identity));
> @@ -1046,6 +1098,14 @@ static int ucsi_check_cable(struct ucsi_connector =
*con)
>  	if (ret < 0)
>  		return ret;
> =20
> +	ret =3D ucsi_register_plug(con);
> +	if (ret < 0)
> +		return ret;
> +
> +	ret =3D ucsi_register_altmodes(con, UCSI_RECIPIENT_SOP_P);
> +	if (ret < 0)
> +		return ret;
> +
>  	return 0;
>  }
> =20
> diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h
> index b89fae82e8ce..32daf5f58650 100644
> --- 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;
> =20
>  	struct typec_altmode *port_altmode[UCSI_MAX_ALTMODES];
>  	struct typec_altmode *partner_altmode[UCSI_MAX_ALTMODES];
> +	struct typec_altmode *plug_altmode[UCSI_MAX_ALTMODES];
> =20
>  	struct typec_capability typec_cap;
> =20
> --=20
> 2.44.0.rc0.258.g7320e95886-goog
>=20

--crR+FIe5gTszUjTd
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQQCtZK6p/AktxXfkOlzbaomhzOwwgUCZdf5OAAKCRBzbaomhzOw
wonTAQDqAauPp5X46PDTM5+U7Sw5KGHeA77Vn5fKGzxHWNWM+gEAkmbBJC78698T
6M+p+fQHFs85ChV5M6Gy5rhtaShYtgM=
=llRe
-----END PGP SIGNATURE-----

--crR+FIe5gTszUjTd--