lkml.org 
[lkml]   [2020]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 2/4] platform/chrome: typec: Register PD CTRL cmd v2
    On Thu, May 28, 2020 at 04:36:05AM -0700, Prashant Malani wrote:
    > Recognize EC_CMD_USB_PD_CONTROL command version 2. This is necessary in
    > order to process Type C mux information (like DP alt mode pin
    > configuration), which is needed by the Type C Connector class API to
    > configure the Type C muxes correctly
    >
    > While we are here, rename the struct member storing this version number
    > from cmd_ver to pd_ctrl_ver, which more accurately reflects what is
    > being stored.
    >
    > Also, slightly change the logic for calling
    > cros_typec_set_port_params_*(). Now, v0 is called when pd_ctrl_ver is 0,
    > and v1 is called otherwise.
    >
    > Signed-off-by: Prashant Malani <pmalani@chromium.org>

    LGTM. One nitpick bellow, but don't prepare v2 just because of that.
    FWIW:

    Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

    > ---
    > drivers/platform/chrome/cros_ec_typec.c | 16 +++++++++-------
    > 1 file changed, 9 insertions(+), 7 deletions(-)
    >
    > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
    > index 6e79f917314b..d69a88464cef 100644
    > --- a/drivers/platform/chrome/cros_ec_typec.c
    > +++ b/drivers/platform/chrome/cros_ec_typec.c
    > @@ -37,7 +37,7 @@ struct cros_typec_data {
    > struct device *dev;
    > struct cros_ec_device *ec;
    > int num_ports;
    > - unsigned int cmd_ver;
    > + unsigned int pd_ctrl_ver;
    > /* Array of ports, indexed by port number. */
    > struct cros_typec_port *ports[EC_USB_PD_MAX_PORTS];
    > struct notifier_block nb;
    > @@ -340,7 +340,7 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
    > req.mux = USB_PD_CTRL_MUX_NO_CHANGE;
    > req.swap = USB_PD_CTRL_SWAP_NONE;
    >
    > - ret = cros_typec_ec_command(typec, typec->cmd_ver,
    > + ret = cros_typec_ec_command(typec, typec->pd_ctrl_ver,
    > EC_CMD_USB_PD_CONTROL, &req, sizeof(req),
    > &resp, sizeof(resp));
    > if (ret < 0)
    > @@ -351,7 +351,7 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
    > dev_dbg(typec->dev, "Polarity %d: 0x%hhx\n", port_num, resp.polarity);
    > dev_dbg(typec->dev, "State %d: %s\n", port_num, resp.state);
    >
    > - if (typec->cmd_ver == 1)
    > + if (typec->pd_ctrl_ver != 0)

    How about:

    if (typec->pd_ctrl_ver)

    > cros_typec_set_port_params_v1(typec, port_num, &resp);
    > else
    > cros_typec_set_port_params_v0(typec, port_num,
    > @@ -374,13 +374,15 @@ static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
    > if (ret < 0)
    > return ret;
    >
    > - if (resp.version_mask & EC_VER_MASK(1))
    > - typec->cmd_ver = 1;
    > + if (resp.version_mask & EC_VER_MASK(2))
    > + typec->pd_ctrl_ver = 2;
    > + else if (resp.version_mask & EC_VER_MASK(1))
    > + typec->pd_ctrl_ver = 1;
    > else
    > - typec->cmd_ver = 0;
    > + typec->pd_ctrl_ver = 0;
    >
    > dev_dbg(typec->dev, "PD Control has version mask 0x%hhx\n",
    > - typec->cmd_ver);
    > + typec->pd_ctrl_ver);
    >
    > return 0;
    > }

    thanks,

    --
    heikki

    \
     
     \ /
      Last update: 2020-06-16 09:28    [W:6.287 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site