platform/chrome: cros_ec_typec: Set Partner PD revision from status

Status provides sop_revision. Process it, and set it using the new
setter in the typec class.

Signed-off-by: Benson Leung <bleung@chromium.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Prashant Malani <pmalani@chomium.org>
Link: https://lore.kernel.org/r/20210129061406.2680146-6-bleung@chromium.org
Signed-off-by: Benson Leung <bleung@chromium.org>

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 30600e9..6bc6faf 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -824,7 +824,7 @@ sop_prime_disc_exit:
        return ret;
 }
 
-static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_num)
+static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_num, u16 pd_revision)
 {
        struct cros_typec_port *port = typec->ports[port_num];
        struct ec_response_typec_discovery *sop_disc = port->disc_data;
@@ -842,6 +842,12 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu
                goto disc_exit;
        }
 
+       ret = typec_partner_set_pd_revision(port->partner, pd_revision);
+       if (ret < 0) {
+               dev_err(typec->dev, "Failed to update partner PD revision, port: %d\n", port_num);
+               goto disc_exit;
+       }
+
        memset(sop_disc, 0, EC_PROTO2_MAX_RESPONSE_SIZE);
        ret = cros_typec_ec_command(typec, 0, EC_CMD_TYPEC_DISCOVERY, &req, sizeof(req),
                                    sop_disc, EC_PROTO2_MAX_RESPONSE_SIZE);
@@ -885,7 +891,11 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
 
        /* Handle any events appropriately. */
        if (resp.events & PD_STATUS_EVENT_SOP_DISC_DONE && !typec->ports[port_num]->sop_disc_done) {
-               ret = cros_typec_handle_sop_disc(typec, port_num);
+               u16 sop_revision;
+
+               /* Convert BCD to the format preferred by the TypeC framework */
+               sop_revision = (le16_to_cpu(resp.sop_revision) & 0xff00) >> 4;
+               ret = cros_typec_handle_sop_disc(typec, port_num, sop_revision);
                if (ret < 0)
                        dev_err(typec->dev, "Couldn't parse SOP Disc data, port: %d\n", port_num);
                else