platform/chrome: cros_ec_typec: Report SOP' PD revision from status

cros_typec_handle_sop_prime_disc now takes the PD revision provided
by the EC_CMD_TYPEC_STATUS command response for the SOP'.

Attach the properly formatted pd_revision to the cable desc before
registering the cable.

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@chromium.org>
Link: https://lore.kernel.org/r/20210129061406.2680146-5-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 e724a5eaef1c76b76f7d1afc820398432a2a226d..30600e9454e185b476c7d81cdb4cc3b3dd11f534 100644 (file)
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -748,7 +748,7 @@ static void cros_typec_parse_pd_identity(struct usb_pd_identity *id,
                id->vdo[i - 3] = disc->discovery_vdo[i];
 }
 
-static int cros_typec_handle_sop_prime_disc(struct cros_typec_data *typec, int port_num)
+static int cros_typec_handle_sop_prime_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 *disc = port->disc_data;
@@ -794,6 +794,7 @@ static int cros_typec_handle_sop_prime_disc(struct cros_typec_data *typec, int p
        }
 
        c_desc.identity = &port->c_identity;
+       c_desc.pd_revision = pd_revision;
 
        port->cable = typec_register_cable(port->port, &c_desc);
        if (IS_ERR(port->cable)) {
@@ -893,7 +894,11 @@ static void cros_typec_handle_status(struct cros_typec_data *typec, int port_num
 
        if (resp.events & PD_STATUS_EVENT_SOP_PRIME_DISC_DONE &&
            !typec->ports[port_num]->sop_prime_disc_done) {
-               ret = cros_typec_handle_sop_prime_disc(typec, port_num);
+               u16 sop_prime_revision;
+
+               /* Convert BCD to the format preferred by the TypeC framework */
+               sop_prime_revision = (le16_to_cpu(resp.sop_prime_revision) & 0xff00) >> 4;
+               ret = cros_typec_handle_sop_prime_disc(typec, port_num, sop_prime_revision);
                if (ret < 0)
                        dev_err(typec->dev, "Couldn't parse SOP' Disc data, port: %d\n", port_num);
                else