Commit 7ac50510 authored by Kyle Tso's avatar Kyle Tso Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: Introduce snk_vdo_v1 for SVDM version 1.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.

Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarKyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210601123151.3441914-4-kyletso@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55b54c26

drivers/usb/typec/tcpm/tcpm.c

+28 −12
Original line number Diff line number Diff line
@@ -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,19 +1563,17 @@ 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

					response[1] = port->snk_vdo[0];

				for (i = 1; i <  port->nr_snk_vdo; i++)

				if (svdm_version < SVDM_VER_2_0) {

					for (i = 0; i < port->nr_snk_vdo_v1; i++)

						response[i + 1] = port->snk_vdo_v1[i];

					rlen = port->nr_snk_vdo_v1 + 1;



				} else {

					for (i = 0; i < port->nr_snk_vdo; i++)

						response[i + 1] = port->snk_vdo[i];

					rlen = port->nr_snk_vdo + 1;

				}

			}

			break;

		case CMD_DISCOVER_SVID:

			tcpm_ams_start(port, DISCOVER_SVIDS);
@@ -5953,6 +5953,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;

}