| Message ID | 20210527084419.4164369-4-kyletso@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add the support of SVDM Version 2.0 VDOs | expand |
On Thu, May 27, 2021 at 04:44:19PM +0800, Kyle Tso wrote: > The ID Header VDO and Product VDOs defined in USB PD Spec rev 2.0 and > rev 3.1 are quite different. Add an additional array snk_vdo_v1 and > send it as the response to the port partner if it only supports SVDM > version 1.0. > > Signed-off-by: Kyle Tso <kyletso@google.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/tcpm/tcpm.c | 40 +++++++++++++++++++++++++---------- > 1 file changed, 29 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index a1bf0dc5babf..07d2bed0a63b 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -401,6 +401,8 @@ struct tcpm_port { > unsigned int nr_src_pdo; > u32 snk_pdo[PDO_MAX_OBJECTS]; > unsigned int nr_snk_pdo; > + u32 snk_vdo_v1[VDO_MAX_OBJECTS]; > + unsigned int nr_snk_vdo_v1; > u32 snk_vdo[VDO_MAX_OBJECTS]; > unsigned int nr_snk_vdo; > > @@ -1561,18 +1563,18 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev, > */ > if ((port->data_role == TYPEC_DEVICE || svdm_version >= SVDM_VER_2_0) && > port->nr_snk_vdo) { > - /* > - * Product Type DFP and Connector Type are not defined in SVDM > - * version 1.0 and shall be set to zero. > - */ > - if (svdm_version < SVDM_VER_2_0) > - response[1] = port->snk_vdo[0] & ~IDH_DFP_MASK > - & ~IDH_CONN_MASK; > - else > + if (svdm_version < SVDM_VER_2_0) { > + response[1] = port->snk_vdo_v1[0]; > + for (i = 1; i < port->nr_snk_vdo_v1; i++) > + response[i + 1] = port->snk_vdo_v1[i]; > + rlen = port->nr_snk_vdo_v1 + 1; > + > + } else { > response[1] = port->snk_vdo[0]; > - for (i = 1; i < port->nr_snk_vdo; i++) > - response[i + 1] = port->snk_vdo[i]; > - rlen = port->nr_snk_vdo + 1; > + for (i = 1; i < port->nr_snk_vdo; i++) > + response[i + 1] = port->snk_vdo[i]; > + rlen = port->nr_snk_vdo + 1; > + } > } > break; > case CMD_DISCOVER_SVID: > @@ -5953,6 +5955,22 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, > return ret; > } > > + /* If sink-vdos is found, sink-vdos-v1 is expected for backward compatibility. */ > + if (port->nr_snk_vdo) { > + ret = fwnode_property_count_u32(fwnode, "sink-vdos-v1"); > + if (ret < 0) > + return ret; > + else if (ret == 0) > + return -ENODATA; > + > + port->nr_snk_vdo_v1 = min(ret, VDO_MAX_OBJECTS); > + ret = fwnode_property_read_u32_array(fwnode, "sink-vdos-v1", > + port->snk_vdo_v1, > + port->nr_snk_vdo_v1); > + if (ret < 0) > + return ret; > + } > + > return 0; > } > > -- > 2.31.1.818.g46aad6cb9e-goog -- heikki
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index a1bf0dc5babf..07d2bed0a63b 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -401,6 +401,8 @@ struct tcpm_port { unsigned int nr_src_pdo; u32 snk_pdo[PDO_MAX_OBJECTS]; unsigned int nr_snk_pdo; + u32 snk_vdo_v1[VDO_MAX_OBJECTS]; + unsigned int nr_snk_vdo_v1; u32 snk_vdo[VDO_MAX_OBJECTS]; unsigned int nr_snk_vdo; @@ -1561,18 +1563,18 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev, */ if ((port->data_role == TYPEC_DEVICE || svdm_version >= SVDM_VER_2_0) && port->nr_snk_vdo) { - /* - * Product Type DFP and Connector Type are not defined in SVDM - * version 1.0 and shall be set to zero. - */ - if (svdm_version < SVDM_VER_2_0) - response[1] = port->snk_vdo[0] & ~IDH_DFP_MASK - & ~IDH_CONN_MASK; - else + if (svdm_version < SVDM_VER_2_0) { + response[1] = port->snk_vdo_v1[0]; + for (i = 1; i < port->nr_snk_vdo_v1; i++) + response[i + 1] = port->snk_vdo_v1[i]; + rlen = port->nr_snk_vdo_v1 + 1; + + } else { response[1] = port->snk_vdo[0]; - for (i = 1; i < port->nr_snk_vdo; i++) - response[i + 1] = port->snk_vdo[i]; - rlen = port->nr_snk_vdo + 1; + for (i = 1; i < port->nr_snk_vdo; i++) + response[i + 1] = port->snk_vdo[i]; + rlen = port->nr_snk_vdo + 1; + } } break; case CMD_DISCOVER_SVID: @@ -5953,6 +5955,22 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, return ret; } + /* If sink-vdos is found, sink-vdos-v1 is expected for backward compatibility. */ + if (port->nr_snk_vdo) { + ret = fwnode_property_count_u32(fwnode, "sink-vdos-v1"); + if (ret < 0) + return ret; + else if (ret == 0) + return -ENODATA; + + port->nr_snk_vdo_v1 = min(ret, VDO_MAX_OBJECTS); + ret = fwnode_property_read_u32_array(fwnode, "sink-vdos-v1", + port->snk_vdo_v1, + port->nr_snk_vdo_v1); + if (ret < 0) + return ret; + } + return 0; }
The ID Header VDO and Product VDOs defined in USB PD Spec rev 2.0 and rev 3.1 are quite different. Add an additional array snk_vdo_v1 and send it as the response to the port partner if it only supports SVDM version 1.0. Signed-off-by: Kyle Tso <kyletso@google.com> --- drivers/usb/typec/tcpm/tcpm.c | 40 +++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 11 deletions(-)