On Sun, May 23, 2021 at 09:58:55AM +0800, Kyle Tso wrote:
> If snk_vdo is not populated from fwnode, it implies the port does not
> support responding to SVDM commands. Not_Supported Message shall be sent
> if the contract is in PD3. And for PD2, the port shall ignore the
> commands.
>
> Fixes: 193a68011fdc ("staging: typec: tcpm: Respond to Discover Identity commands")
> Signed-off-by: Kyle Tso <kyletso@xxxxxxxxxx>
> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Acked-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tcpm/tcpm.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index 7db6ae3e9c0b..a56bc71f4eb5 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -2458,7 +2458,10 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
> NONE_AMS);
> break;
> case PD_DATA_VENDOR_DEF:
> - tcpm_handle_vdm_request(port, msg->payload, cnt);
> + if (tcpm_vdm_ams(port) || port->nr_snk_vdo)
> + tcpm_handle_vdm_request(port, msg->payload, cnt);
> + else if (port->negotiated_rev > PD_REV20)
> + tcpm_pd_handle_msg(port, PD_MSG_CTRL_NOT_SUPP, NONE_AMS);
> break;
> case PD_DATA_BIST:
> port->bist_request = le32_to_cpu(msg->payload[0]);
> --
> 2.31.1.818.g46aad6cb9e-goog
--
heikki
