From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 626352941C for ; Tue, 5 Mar 2024 03:07:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709608023; cv=none; b=hcDkQ1QGo7OjX+ouRJfIlkgBnh23ckMtbCUuq0bDvETa0J5ZAm5rEk+2NSn2ODk9oHoAc7BmzJJtL/fio2P4NdXyJ4k7GVTuimtodlb7LMylpTGPJi/BlJYgj6JbVu53G1MkWduGq+aEU3LoPm/48YBDH49TVJrrnEtO75bRoN0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709608023; c=relaxed/simple; bh=uHcEgK2RwbbxZXa7Bb1VBvp2l8KE2IDh5nHPHvo9Ccc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=cEqBHwZPdPAvxI1YGdHajRdACKX8G1MSBGObx51jjoP3f+goeXhSNiVAckNVIK469Gvro7Upj33M+uB9qA7BTOZ8iTAnhY7B6fkawmmkewXyBU1PtS557u4KQNYrcsjS9u9NQxfqUU4+xip/2tq+bzg9GzD6ztpAe7kIcdqw9ts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=A+Xl7Z1a; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="A+Xl7Z1a" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1dc9f4d1106so106505ad.0 for ; Mon, 04 Mar 2024 19:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709608020; x=1710212820; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=wWKuVTyF7D1NMGiLtOHafAeofAOAtwWgwgnfLrBqgrw=; b=A+Xl7Z1a1PXij6/rCmGyz+jjpJMnF0NCztnYwSIq0ZqqNppw4eRbdZ0LAkvn7iw6SR yS18B9ozHIHzVHoBzfuC5F7Z2s7zjbOb3thMkHrCh0klVooVAaUIikhcHGFJ1/NT3KIH sqKQiT402OqibQdXjTLv+BIGKvpi5IL+jB+bA51xxdH26Ovu4fgCXqqu7/kYs86RMHwu PnJhu+mFRjiVRdssD+1QYbTA2F6vlEH/yQ6CF/53N9v8B5sZZ98L71gGvMK1VTqIO7iW p8LvqEUvlzCY3Oh4/CsTMCPUjb34TvMbYah++dQiGiMSTZkoWCGWPo8f0/T/s0hG9Kk+ 8yMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709608020; x=1710212820; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wWKuVTyF7D1NMGiLtOHafAeofAOAtwWgwgnfLrBqgrw=; b=daB6rHOggttiASnBc1kmKoBgynQBU3gvUJBC1JPsITJ0nraqc3ReQ/YdLIDRWGE/A6 PvVhZVS0nX4iSJcq6o3HyhN/qMOvEMKe83ScPvyOQxRtCbUecNRobEoDGRNRgGDzxvz0 9rsmlW9UANCWD4FnyUdliBV0uwNGorHIUN8IwwCoHFi3G9Zt8JxvuZXklRiSj7usttU6 JUm9MbVHRrEM2GcV/KKswEfMFQ/SMSmwEGVsWElhO9bLCextsohfkEeeJABDaYxwErHs qBsDfXvsnXIAkRaeg5jr+R8p0zFrlDRI1GVcqyxf/7n0ZKXjbUh9B28qMjgfteiRrCZA DqLw== X-Forwarded-Encrypted: i=1; AJvYcCX19f2L2oM3E0BL8Ypcf/MbyW3nm++UKEyJu6eUjUWXcyeB44A84iEibr03k+1jFHJy8DAsBD1lMnpUZ7Fy7obRC3W+heOBFK3G X-Gm-Message-State: AOJu0Yy4ChkgIrd9YoOTR4s3S5OUcNs3/Jr4e4KcAafYPnsqfMjr3I7z G4TO4zicrKJyx++FazCmQaEsok9BKQvLBOuMavjrzZV3E5zAXBF09CLFryvITA== X-Google-Smtp-Source: AGHT+IG2Rv+wXp8CwVAkw3OEQNMw10CgAkXjsiCqu+GOkG3fph3yCypfcXHspn/AX5Hig+aSALvqxg== X-Received: by 2002:a17:903:22d0:b0:1dc:c779:5537 with SMTP id y16-20020a17090322d000b001dcc7795537mr64686plg.4.1709608020221; Mon, 04 Mar 2024 19:07:00 -0800 (PST) Received: from google.com (109.120.125.34.bc.googleusercontent.com. [34.125.120.109]) by smtp.gmail.com with ESMTPSA id u19-20020aa78393000000b006e6233563cesm2393652pfm.218.2024.03.04.19.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 19:06:59 -0800 (PST) Date: Tue, 5 Mar 2024 03:06:55 +0000 From: Benson Leung To: Jameson Thies 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 v4 3/4] usb: typec: ucsi: Register SOP/SOP' Discover Identity Responses Message-ID: References: <20240305025804.1290919-1-jthies@google.com> <20240305025804.1290919-4-jthies@google.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ln66GuyuzJRvCm2X" Content-Disposition: inline In-Reply-To: <20240305025804.1290919-4-jthies@google.com> --ln66GuyuzJRvCm2X Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jameson, On Tue, Mar 05, 2024 at 02:58:03AM +0000, Jameson Thies wrote: > Register SOP and SOP' Discover Identity responses with the USB Type-C > Connector Class as partner and cable identities, respectively. Discover > Identity responses are requested from the PPM using the GET_PD_MESSAGE > UCSI command. >=20 > Signed-off-by: Jameson Thies Reviewed-by: Benson Leung > --- > GET_PD_MESSAGE responses from the PPM populate partner and cable > identity in sysfs: > nospike-rev4 /sys/class/typec # ls port0-partner/identity/ > cert_stat id_header product product_type_vdo1 product_type_vdo2 > product_type_vdo3 > nospike-rev4 /sys/class/typec # ls port0-cable/identity/ > cert_stat id_header product product_type_vdo1 product_type_vdo2 > product_type_vdo3 >=20 > Changes in v4: > - Cleaned up redundent ucsi_send_command calls for discovering identity. >=20 > Changes in v3: > - None. >=20 > Changes in v2: > - Re-ordered memset call and null assignment when unregistering partners > and cables. > - Supports registering partner and cable identity with UCSI versions > before v2.0. > - Shortened lines to within 80 characters with the exception of two > error log lines with three indentations. > - Tested on usb-testing branch merged with chromeOS 6.8-rc2 kernel. >=20 > drivers/usb/typec/ucsi/ucsi.c | 112 ++++++++++++++++++++++++++++++++++ > drivers/usb/typec/ucsi/ucsi.h | 29 +++++++++ > 2 files changed, 141 insertions(+) >=20 > diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c > index 7c84687b5d1a3..3b64a0f51041c 100644 > --- a/drivers/usb/typec/ucsi/ucsi.c > +++ b/drivers/usb/typec/ucsi/ucsi.c > @@ -646,6 +646,108 @@ static int ucsi_get_src_pdos(struct ucsi_connector = *con) > return ret; > } > =20 > +static int ucsi_read_identity(struct ucsi_connector *con, u8 recipient, > + u8 offset, u8 bytes, void *resp) > +{ > + struct ucsi *ucsi =3D con->ucsi; > + u64 command; > + int ret; > + > + command =3D UCSI_COMMAND(UCSI_GET_PD_MESSAGE) | > + UCSI_CONNECTOR_NUMBER(con->num); > + command |=3D UCSI_GET_PD_MESSAGE_RECIPIENT(recipient); > + command |=3D UCSI_GET_PD_MESSAGE_OFFSET(offset); > + command |=3D UCSI_GET_PD_MESSAGE_BYTES(bytes); > + command |=3D UCSI_GET_PD_MESSAGE_TYPE(UCSI_GET_PD_MESSAGE_TYPE_IDENTITY= ); > + > + ret =3D ucsi_send_command(ucsi, command, resp, bytes); > + if (ret < 0) > + dev_err(ucsi->dev, "UCSI_GET_PD_MESSAGE failed (%d)\n", ret); > + > + return ret; > +} > + > +static int ucsi_get_identity(struct ucsi_connector *con, u8 recipient, > + struct usb_pd_identity *id) > +{ > + struct ucsi *ucsi =3D con->ucsi; > + struct ucsi_pd_message_disc_id resp =3D {}; > + int ret; > + > + if (ucsi->version < UCSI_VERSION_2_0) { > + /* > + * Before UCSI v2.0, MESSAGE_IN is 16 bytes which cannot fit > + * the 28 byte identity response including the VDM header. > + * First request the VDM header, ID Header VDO, Cert Stat VDO > + * and Product VDO. > + */ > + ret =3D ucsi_read_identity(con, recipient, 0, 0x10, &resp); > + if (ret < 0) > + return ret; > + > + > + /* Then request Product Type VDO1 through Product Type VDO3. */ > + ret =3D ucsi_read_identity(con, recipient, 0x10, 0xc, > + &resp.vdo[0]); > + if (ret < 0) > + return ret; > + > + } else { > + /* > + * In UCSI v2.0 and after, MESSAGE_IN is large enough to request > + * the large enough to request the full Discover Identity > + * response at once. > + */ > + ret =3D ucsi_read_identity(con, recipient, 0x0, 0x1c, &resp); > + if (ret < 0) > + return ret; > + } > + > + id->id_header =3D resp.id_header; > + id->cert_stat =3D resp.cert_stat; > + id->product =3D resp.product; > + id->vdo[0] =3D resp.vdo[0]; > + id->vdo[1] =3D resp.vdo[1]; > + id->vdo[2] =3D resp.vdo[2]; > + return 0; > +} > + > +static int ucsi_get_partner_identity(struct ucsi_connector *con) > +{ > + int ret; > + > + ret =3D ucsi_get_identity(con, UCSI_RECIPIENT_SOP, > + &con->partner_identity); > + if (ret < 0) > + return ret; > + > + ret =3D typec_partner_set_identity(con->partner); > + if (ret < 0) { > + dev_err(con->ucsi->dev, "Failed to set partner identity (%d)\n", > + ret); > + } > + > + return ret; > +} > + > +static int ucsi_get_cable_identity(struct ucsi_connector *con) > +{ > + int ret; > + > + ret =3D ucsi_get_identity(con, UCSI_RECIPIENT_SOP_P, > + &con->cable_identity); > + if (ret < 0) > + return ret; > + > + ret =3D typec_cable_set_identity(con->cable); > + if (ret < 0) { > + dev_err(con->ucsi->dev, "Failed to set cable identity (%d)\n", > + ret); > + } > + > + return ret; > +} > + > static int ucsi_check_altmodes(struct ucsi_connector *con) > { > int ret, num_partner_am; > @@ -754,6 +856,7 @@ static int ucsi_register_cable(struct ucsi_connector = *con) > break; > } > =20 > + desc.identity =3D &con->cable_identity; > desc.active =3D !!(UCSI_CABLE_PROP_FLAG_ACTIVE_CABLE & > con->cable_prop.flags); > desc.pd_revision =3D UCSI_CABLE_PROP_FLAG_PD_MAJOR_REV_AS_BCD( > @@ -777,6 +880,7 @@ static void ucsi_unregister_cable(struct ucsi_connect= or *con) > return; > =20 > typec_unregister_cable(con->cable); > + memset(&con->cable_identity, 0, sizeof(con->cable_identity)); > con->cable =3D NULL; > } > =20 > @@ -827,6 +931,7 @@ static int ucsi_register_partner(struct ucsi_connecto= r *con) > break; > } > =20 > + desc.identity =3D &con->partner_identity; > desc.usb_pd =3D pwr_opmode =3D=3D UCSI_CONSTAT_PWR_OPMODE_PD; > desc.pd_revision =3D UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->= cap.flags); > =20 > @@ -855,6 +960,7 @@ static void ucsi_unregister_partner(struct ucsi_conne= ctor *con) > ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP); > ucsi_unregister_cable(con); > typec_unregister_partner(con->partner); > + memset(&con->partner_identity, 0, sizeof(con->partner_identity)); > con->partner =3D NULL; > } > =20 > @@ -975,6 +1081,10 @@ static int ucsi_check_cable(struct ucsi_connector *= con) > if (ret < 0) > return ret; > =20 > + ret =3D ucsi_get_cable_identity(con); > + if (ret < 0) > + return ret; > + > return 0; > } > =20 > @@ -1019,6 +1129,7 @@ static void ucsi_handle_connector_change(struct wor= k_struct *work) > ucsi_register_partner(con); > ucsi_partner_task(con, ucsi_check_connection, 1, HZ); > ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ); > + ucsi_partner_task(con, ucsi_get_partner_identity, 1, HZ); > ucsi_partner_task(con, ucsi_check_cable, 1, HZ); > =20 > if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) =3D=3D > @@ -1418,6 +1529,7 @@ static int ucsi_register_port(struct ucsi *ucsi, st= ruct ucsi_connector *con) > ucsi_register_partner(con); > ucsi_pwr_opmode_change(con); > ucsi_port_psy_changed(con); > + ucsi_get_partner_identity(con); > ucsi_check_cable(con); > } > =20 > diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h > index f0aabef0b7c64..b89fae82e8ce7 100644 > --- a/drivers/usb/typec/ucsi/ucsi.h > +++ b/drivers/usb/typec/ucsi/ucsi.h > @@ -106,6 +106,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num); > #define UCSI_GET_CABLE_PROPERTY 0x11 > #define UCSI_GET_CONNECTOR_STATUS 0x12 > #define UCSI_GET_ERROR_STATUS 0x13 > +#define UCSI_GET_PD_MESSAGE 0x15 > =20 > #define UCSI_CONNECTOR_NUMBER(_num_) ((u64)(_num_) << 16) > #define UCSI_COMMAND(_cmd_) ((_cmd_) & 0xff) > @@ -159,6 +160,18 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num= ); > #define UCSI_MAX_PDOS (4) > #define UCSI_GET_PDOS_SRC_PDOS ((u64)1 << 34) > =20 > +/* GET_PD_MESSAGE command bits */ > +#define UCSI_GET_PD_MESSAGE_RECIPIENT(_r_) ((u64)(_r_) << 23) > +#define UCSI_GET_PD_MESSAGE_OFFSET(_r_) ((u64)(_r_) << 26) > +#define UCSI_GET_PD_MESSAGE_BYTES(_r_) ((u64)(_r_) << 34) > +#define UCSI_GET_PD_MESSAGE_TYPE(_r_) ((u64)(_r_) << 42) > +#define UCSI_GET_PD_MESSAGE_TYPE_SNK_CAP_EXT 0 > +#define UCSI_GET_PD_MESSAGE_TYPE_SRC_CAP_EXT 1 > +#define UCSI_GET_PD_MESSAGE_TYPE_BAT_CAP 2 > +#define UCSI_GET_PD_MESSAGE_TYPE_BAT_STAT 3 > +#define UCSI_GET_PD_MESSAGE_TYPE_IDENTITY 4 > +#define UCSI_GET_PD_MESSAGE_TYPE_REVISION 5 > + > /* ---------------------------------------------------------------------= ----- */ > =20 > /* Error information returned by PPM in response to GET_ERROR_STATUS com= mand. */ > @@ -338,6 +351,18 @@ struct ucsi_connector_status { > ((get_unaligned_le32(&(_p_)[5]) & GENMASK(16, 1)) >> 1) > } __packed; > =20 > +/* > + * Data structure filled by PPM in response to GET_PD_MESSAGE command wi= th the > + * Response Message Type set to Discover Identity Response. > + */ > +struct ucsi_pd_message_disc_id { > + u32 vdm_header; > + u32 id_header; > + u32 cert_stat; > + u32 product; > + u32 vdo[3]; > +} __packed; > + > /* ---------------------------------------------------------------------= ----- */ > =20 > struct ucsi_debugfs_entry { > @@ -428,6 +453,10 @@ struct ucsi_connector { > struct usb_power_delivery_capabilities *partner_sink_caps; > =20 > struct usb_role_switch *usb_role_sw; > + > + /* USB PD identity */ > + struct usb_pd_identity partner_identity; > + struct usb_pd_identity cable_identity; > }; > =20 > int ucsi_send_command(struct ucsi *ucsi, u64 command, > --=20 > 2.44.0.rc1.240.g4c46232300-goog >=20 --ln66GuyuzJRvCm2X Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCtZK6p/AktxXfkOlzbaomhzOwwgUCZeaMTgAKCRBzbaomhzOw wjUiAQCOuYaIKrMEZbSCC0M8lNswnJXqo0TrfvxZ1Pfq3oioPwEA8dZaJw1+IMXz w8mWqTDNKd3GDExPA8pDIVVMTaH0FgQ= =/p0r -----END PGP SIGNATURE----- --ln66GuyuzJRvCm2X--