lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 05/11] platform/chrome: cros_ec_typec: Factor out PD identity parsing
    Date
    Factor out the PD identity parsing code into a separate function. This
    way it can be re-used for Cable PD identity parsing in future patches.

    No functional changes are introduced by this patch.

    Signed-off-by: Prashant Malani <pmalani@chromium.org>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    ---

    Changes in v3:
    - Re-arranged patch order and combined it with related series of
    patches.
    - Added Reviewed-by tags

    Changes in v2:
    - No changes.

    drivers/platform/chrome/cros_ec_typec.c | 35 ++++++++++++++++---------
    1 file changed, 23 insertions(+), 12 deletions(-)

    diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
    index 801c3d2c1fbd..f6d3c37c2c27 100644
    --- a/drivers/platform/chrome/cros_ec_typec.c
    +++ b/drivers/platform/chrome/cros_ec_typec.c
    @@ -657,6 +657,28 @@ static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
    return ret;
    }

    +/*
    + * Parse the PD identity data from the EC PD discovery responses and copy that to the supplied
    + * PD identity struct.
    + */
    +static void cros_typec_parse_pd_identity(struct usb_pd_identity *id,
    + struct ec_response_typec_discovery *disc)
    +{
    + int i;
    +
    + /* First, update the PD identity VDOs for the partner. */
    + if (disc->identity_count > 0)
    + id->id_header = disc->discovery_vdo[0];
    + if (disc->identity_count > 1)
    + id->cert_stat = disc->discovery_vdo[1];
    + if (disc->identity_count > 2)
    + id->product = disc->discovery_vdo[2];
    +
    + /* Copy the remaining identity VDOs till a maximum of 6. */
    + for (i = 3; i < disc->identity_count && i < VDO_MAX_OBJECTS; i++)
    + id->vdo[i - 3] = disc->discovery_vdo[i];
    +}
    +
    static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_num)
    {
    struct cros_typec_port *port = typec->ports[port_num];
    @@ -666,7 +688,6 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu
    .partner_type = TYPEC_PARTNER_SOP,
    };
    int ret = 0;
    - int i;

    if (!port->partner) {
    dev_err(typec->dev,
    @@ -684,17 +705,7 @@ static int cros_typec_handle_sop_disc(struct cros_typec_data *typec, int port_nu
    goto disc_exit;
    }

    - /* First, update the PD identity VDOs for the partner. */
    - if (sop_disc->identity_count > 0)
    - port->p_identity.id_header = sop_disc->discovery_vdo[0];
    - if (sop_disc->identity_count > 1)
    - port->p_identity.cert_stat = sop_disc->discovery_vdo[1];
    - if (sop_disc->identity_count > 2)
    - port->p_identity.product = sop_disc->discovery_vdo[2];
    -
    - /* Copy the remaining identity VDOs till a maximum of 6. */
    - for (i = 3; i < sop_disc->identity_count && i < VDO_MAX_OBJECTS; i++)
    - port->p_identity.vdo[i - 3] = sop_disc->discovery_vdo[i];
    + cros_typec_parse_pd_identity(&port->p_identity, sop_disc);

    ret = typec_partner_set_identity(port->partner);
    if (ret < 0) {
    --
    2.29.2.299.gdc1121823c-goog
    \
     
     \ /
      Last update: 2020-11-16 21:15    [W:3.229 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site