Commit ad7c0510 authored by Prashant Malani's avatar Prashant Malani Committed by Enric Balletbo i Serra

platform/chrome: cros_ec_typec: Update port info from EC

After registering the ports at probe, get the current port information
from EC and update the Type C connector class ports accordingly.
Co-developed-by: default avatarJon Flatley <jflat@chromium.org>
Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
parent fdc6b21e
...@@ -21,6 +21,7 @@ struct cros_typec_data { ...@@ -21,6 +21,7 @@ struct cros_typec_data {
struct device *dev; struct device *dev;
struct cros_ec_device *ec; struct cros_ec_device *ec;
int num_ports; int num_ports;
unsigned int cmd_ver;
/* Array of ports, indexed by port number. */ /* Array of ports, indexed by port number. */
struct typec_port *ports[EC_USB_PD_MAX_PORTS]; struct typec_port *ports[EC_USB_PD_MAX_PORTS];
/* Initial capabilities for each port. */ /* Initial capabilities for each port. */
...@@ -171,6 +172,106 @@ static int cros_typec_ec_command(struct cros_typec_data *typec, ...@@ -171,6 +172,106 @@ static int cros_typec_ec_command(struct cros_typec_data *typec,
return ret; return ret;
} }
static void cros_typec_set_port_params_v0(struct cros_typec_data *typec,
int port_num, struct ec_response_usb_pd_control *resp)
{
struct typec_port *port = typec->ports[port_num];
enum typec_orientation polarity;
if (!resp->enabled)
polarity = TYPEC_ORIENTATION_NONE;
else if (!resp->polarity)
polarity = TYPEC_ORIENTATION_NORMAL;
else
polarity = TYPEC_ORIENTATION_REVERSE;
typec_set_pwr_role(port, resp->role ? TYPEC_SOURCE : TYPEC_SINK);
typec_set_orientation(port, polarity);
}
static void cros_typec_set_port_params_v1(struct cros_typec_data *typec,
int port_num, struct ec_response_usb_pd_control_v1 *resp)
{
struct typec_port *port = typec->ports[port_num];
enum typec_orientation polarity;
if (!(resp->enabled & PD_CTRL_RESP_ENABLED_CONNECTED))
polarity = TYPEC_ORIENTATION_NONE;
else if (!resp->polarity)
polarity = TYPEC_ORIENTATION_NORMAL;
else
polarity = TYPEC_ORIENTATION_REVERSE;
typec_set_orientation(port, polarity);
typec_set_data_role(port, resp->role & PD_CTRL_RESP_ROLE_DATA ?
TYPEC_HOST : TYPEC_DEVICE);
typec_set_pwr_role(port, resp->role & PD_CTRL_RESP_ROLE_POWER ?
TYPEC_SOURCE : TYPEC_SINK);
typec_set_vconn_role(port, resp->role & PD_CTRL_RESP_ROLE_VCONN ?
TYPEC_SOURCE : TYPEC_SINK);
}
static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
{
struct ec_params_usb_pd_control req;
struct ec_response_usb_pd_control_v1 resp;
int ret;
if (port_num < 0 || port_num >= typec->num_ports) {
dev_err(typec->dev, "cannot get status for invalid port %d\n",
port_num);
return -EINVAL;
}
req.port = port_num;
req.role = USB_PD_CTRL_ROLE_NO_CHANGE;
req.mux = USB_PD_CTRL_MUX_NO_CHANGE;
req.swap = USB_PD_CTRL_SWAP_NONE;
ret = cros_typec_ec_command(typec, typec->cmd_ver,
EC_CMD_USB_PD_CONTROL, &req, sizeof(req),
&resp, sizeof(resp));
if (ret < 0)
return ret;
dev_dbg(typec->dev, "Enabled %d: 0x%hhx\n", port_num, resp.enabled);
dev_dbg(typec->dev, "Role %d: 0x%hhx\n", port_num, resp.role);
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)
cros_typec_set_port_params_v1(typec, port_num, &resp);
else
cros_typec_set_port_params_v0(typec, port_num,
(struct ec_response_usb_pd_control *) &resp);
return 0;
}
static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
{
struct ec_params_get_cmd_versions_v1 req_v1;
struct ec_response_get_cmd_versions resp;
int ret;
/* We're interested in the PD control command version. */
req_v1.cmd = EC_CMD_USB_PD_CONTROL;
ret = cros_typec_ec_command(typec, 1, EC_CMD_GET_CMD_VERSIONS,
&req_v1, sizeof(req_v1), &resp,
sizeof(resp));
if (ret < 0)
return ret;
if (resp.version_mask & EC_VER_MASK(1))
typec->cmd_ver = 1;
else
typec->cmd_ver = 0;
dev_dbg(typec->dev, "PD Control has version mask 0x%hhx\n",
typec->cmd_ver);
return 0;
}
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id cros_typec_acpi_id[] = { static const struct acpi_device_id cros_typec_acpi_id[] = {
{ "GOOG0014", 0 }, { "GOOG0014", 0 },
...@@ -192,7 +293,7 @@ static int cros_typec_probe(struct platform_device *pdev) ...@@ -192,7 +293,7 @@ static int cros_typec_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct cros_typec_data *typec; struct cros_typec_data *typec;
struct ec_response_usb_pd_ports resp; struct ec_response_usb_pd_ports resp;
int ret; int ret, i;
typec = devm_kzalloc(dev, sizeof(*typec), GFP_KERNEL); typec = devm_kzalloc(dev, sizeof(*typec), GFP_KERNEL);
if (!typec) if (!typec)
...@@ -202,6 +303,12 @@ static int cros_typec_probe(struct platform_device *pdev) ...@@ -202,6 +303,12 @@ static int cros_typec_probe(struct platform_device *pdev)
typec->ec = dev_get_drvdata(pdev->dev.parent); typec->ec = dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, typec); platform_set_drvdata(pdev, typec);
ret = cros_typec_get_cmd_version(typec);
if (ret < 0) {
dev_err(dev, "failed to get PD command version info\n");
return ret;
}
ret = cros_typec_ec_command(typec, 0, EC_CMD_USB_PD_PORTS, NULL, 0, ret = cros_typec_ec_command(typec, 0, EC_CMD_USB_PD_PORTS, NULL, 0,
&resp, sizeof(resp)); &resp, sizeof(resp));
if (ret < 0) if (ret < 0)
...@@ -219,7 +326,19 @@ static int cros_typec_probe(struct platform_device *pdev) ...@@ -219,7 +326,19 @@ static int cros_typec_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < typec->num_ports; i++) {
ret = cros_typec_port_update(typec, i);
if (ret < 0)
goto unregister_ports;
}
return 0; return 0;
unregister_ports:
for (i = 0; i < typec->num_ports; i++)
if (typec->ports[i])
typec_unregister_port(typec->ports[i]);
return ret;
} }
static struct platform_driver cros_typec_driver = { static struct platform_driver cros_typec_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment