| Message ID | 20210129061406.2680146-5-bleung@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | usb: typec: and platform/chrome: Add PD revision numbers | expand |
On Thu, Jan 28, 2021 at 10:14:04PM -0800, Benson Leung wrote: > 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> > --- > drivers/platform/chrome/cros_ec_typec.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c > index e724a5eaef1c..30600e9454e1 100644 > --- 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 > -- > 2.30.0.365.g02bc693789-goog thanks, -- heikki
Hi Benson, On 29/1/21 7:14, Benson Leung wrote: > 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: Enric Balletbo i Serra <enric.balletbo@collabora.com> > --- > drivers/platform/chrome/cros_ec_typec.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c > index e724a5eaef1c..30600e9454e1 100644 > --- 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 >
Hi Benson, On Thu, Jan 28, 2021 at 10:14 PM Benson Leung <bleung@chromium.org> wrote: > > 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> Reviewed-by: Prashant Malani <pmalani@chromium.org> > --- > drivers/platform/chrome/cros_ec_typec.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c > index e724a5eaef1c..30600e9454e1 100644 > --- 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 > -- > 2.30.0.365.g02bc693789-goog >
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index e724a5eaef1c..30600e9454e1 100644 --- 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
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> --- drivers/platform/chrome/cros_ec_typec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)