From: Kyle Tso <kyletso@google.com>
To: linux@roeck-us.net, heikki.krogerus@linux.intel.com,
gregkh@linuxfoundation.org, hdegoede@redhat.com,
robh+dt@kernel.org
Cc: badhri@google.com, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Kyle Tso <kyletso@google.com>
Subject: [PATCH v4 5/8] usb: typec: ucsi: Detemine common SVDM Version
Date: Tue, 2 Feb 2021 17:33:39 +0800 [thread overview]
Message-ID: <20210202093342.738691-6-kyletso@google.com> (raw)
In-Reply-To: <20210202093342.738691-1-kyletso@google.com>
This patch implements the following requirement in the Spec.
PD Spec Revision 3.0 Version 2.0 + ECNs 2020-12-10
6.4.4.2.3 Structured VDM Version
"The Structured VDM Version field of the Discover Identity Command
sent and received during VDM discovery Shall be used to determine the
lowest common Structured VDM Version supported by the Port Partners or
Cable Plug and Shall continue to operate using this Specification
Revision until they are Detached."
Signed-off-by: Kyle Tso <kyletso@google.com>
---
drivers/usb/typec/ucsi/displayport.c | 12 +++++++++---
drivers/usb/typec/ucsi/ucsi.c | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/typec/ucsi/displayport.c b/drivers/usb/typec/ucsi/displayport.c
index 261131c9e37c..b58ef26a50e0 100644
--- a/drivers/usb/typec/ucsi/displayport.c
+++ b/drivers/usb/typec/ucsi/displayport.c
@@ -48,6 +48,7 @@ struct ucsi_dp {
static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo)
{
struct ucsi_dp *dp = typec_altmode_get_drvdata(alt);
+ struct typec_port *port = dp->con->port;
struct ucsi *ucsi = dp->con->ucsi;
u64 command;
u8 cur = 0;
@@ -83,7 +84,7 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo)
* mode, and letting the alt mode driver continue.
*/
- dp->header = VDO(USB_TYPEC_DP_SID, 1, CMD_ENTER_MODE);
+ dp->header = VDO(USB_TYPEC_DP_SID, 1, typec_get_svdm_version(port), CMD_ENTER_MODE);
dp->header |= VDO_OPOS(USB_TYPEC_DP_MODE);
dp->header |= VDO_CMDT(CMDT_RSP_ACK);
@@ -101,6 +102,7 @@ static int ucsi_displayport_enter(struct typec_altmode *alt, u32 *vdo)
static int ucsi_displayport_exit(struct typec_altmode *alt)
{
struct ucsi_dp *dp = typec_altmode_get_drvdata(alt);
+ struct typec_port *port = dp->con->port;
u64 command;
int ret = 0;
@@ -120,7 +122,7 @@ static int ucsi_displayport_exit(struct typec_altmode *alt)
if (ret < 0)
goto out_unlock;
- dp->header = VDO(USB_TYPEC_DP_SID, 1, CMD_EXIT_MODE);
+ dp->header = VDO(USB_TYPEC_DP_SID, 1, typec_get_svdm_version(port), CMD_EXIT_MODE);
dp->header |= VDO_OPOS(USB_TYPEC_DP_MODE);
dp->header |= VDO_CMDT(CMDT_RSP_ACK);
@@ -184,6 +186,7 @@ static int ucsi_displayport_vdm(struct typec_altmode *alt,
u32 header, const u32 *data, int count)
{
struct ucsi_dp *dp = typec_altmode_get_drvdata(alt);
+ struct typec_port *port = dp->con->port;
int cmd_type = PD_VDO_CMDT(header);
int cmd = PD_VDO_CMD(header);
@@ -200,7 +203,10 @@ static int ucsi_displayport_vdm(struct typec_altmode *alt,
switch (cmd_type) {
case CMDT_INIT:
- dp->header = VDO(USB_TYPEC_DP_SID, 1, cmd);
+ if (PD_VDO_SVDM_VER(header) < typec_get_svdm_version(port))
+ typec_set_svdm_version(port, PD_VDO_SVDM_VER(header));
+
+ dp->header = VDO(USB_TYPEC_DP_SID, 1, typec_get_svdm_version(port), cmd);
dp->header |= VDO_OPOS(USB_TYPEC_DP_MODE);
switch (cmd) {
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index ca3f4194ad90..8c4897a7bf75 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -764,6 +764,7 @@ static void ucsi_handle_connector_change(struct work_struct *work)
if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {
typec_set_pwr_role(con->port, role);
+ typec_set_svdm_version(con->port, con->typec_cap.svdm_version);
switch (UCSI_CONSTAT_PARTNER_TYPE(con->status.flags)) {
case UCSI_CONSTAT_PARTNER_TYPE_UFP:
@@ -1052,6 +1053,7 @@ static int ucsi_register_port(struct ucsi *ucsi, int index)
cap->revision = ucsi->cap.typec_version;
cap->pd_revision = ucsi->cap.pd_version;
+ cap->svdm_version = SVDM_VER_2_0;
cap->prefer_role = TYPEC_NO_PREFERRED_ROLE;
if (con->cap.op_mode & UCSI_CONCAP_OPMODE_AUDIO_ACCESSORY)
--
2.30.0.365.g02bc693789-goog
next prev parent reply other threads:[~2021-02-02 9:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 9:33 [PATCH v4 0/8] common SVDM version and VDO from dt Kyle Tso
2021-02-02 9:33 ` [PATCH v4 1/8] usb: typec: Manage SVDM version Kyle Tso
2021-02-02 9:33 ` [PATCH v4 2/8] usb: pd: Update VDO definitions Kyle Tso
2021-02-02 9:33 ` [PATCH v4 3/8] usb: pd: Make SVDM Version configurable in VDM header Kyle Tso
2021-02-02 14:50 ` Guenter Roeck
2021-02-02 14:52 ` Kyle Tso
2021-02-02 9:33 ` [PATCH v4 4/8] usb: typec: tcpm: Detemine common SVDM Version Kyle Tso
2021-02-02 9:33 ` Kyle Tso [this message]
2021-02-02 9:33 ` [PATCH v4 6/8] usb: typec: displayport: Fill the negotiated SVDM Version in the header Kyle Tso
2021-02-02 9:33 ` [PATCH v4 7/8] dt-bindings: connector: Add SVDM VDO properties Kyle Tso
2021-02-02 9:33 ` [PATCH v4 8/8] usb: typec: tcpm: Get Sink VDO from fwnode Kyle Tso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210202093342.738691-6-kyletso@google.com \
--to=kyletso@google.com \
--cc=badhri@google.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).