Commit 3cf9df00 authored by Fabien Lahoudere's avatar Fabien Lahoudere Committed by Jonathan Cameron
Browse files

iio: common: cros_ec_sensors: determine protocol version



This patch adds a function to determine which version of the
protocol is used to communicate with EC.

Signed-off-by: default avatarNick Vaccaro <nvaccaro@chromium.org>
Signed-off-by: default avatarFabien Lahoudere <fabien.lahoudere@collabora.com>
Reviewed-by: default avatarGwendal Grignou <gwendal@chromium.org>
Tested-by: default avatarGwendal Grignou <gwendal@chromium.org>
[rebased on top of iio/testing and solved conflicts]
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3e4dabac
Loading
Loading
Loading
Loading
+34 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,31 @@ static char *cros_ec_loc[] = {
	[MOTIONSENSE_LOC_MAX] = "unknown",
	[MOTIONSENSE_LOC_MAX] = "unknown",
};
};


static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
					     u16 cmd_offset, u16 cmd, u32 *mask)
{
	int ret;
	struct {
		struct cros_ec_command msg;
		union {
			struct ec_params_get_cmd_versions params;
			struct ec_response_get_cmd_versions resp;
		};
	} __packed buf = {
		.msg = {
			.command = EC_CMD_GET_CMD_VERSIONS + cmd_offset,
			.insize = sizeof(struct ec_response_get_cmd_versions),
			.outsize = sizeof(struct ec_params_get_cmd_versions)
			},
		.params = {.cmd = cmd}
	};

	ret = cros_ec_cmd_xfer_status(ec_dev, &buf.msg);
	if (ret >= 0)
		*mask = buf.resp.version_mask;
	return ret;
}

int cros_ec_sensors_core_init(struct platform_device *pdev,
int cros_ec_sensors_core_init(struct platform_device *pdev,
			      struct iio_dev *indio_dev,
			      struct iio_dev *indio_dev,
			      bool physical_device)
			      bool physical_device)
@@ -33,6 +58,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);
	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);
	struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);
	struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);
	struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
	struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
	u32 ver_mask;
	int ret;
	int ret;


	platform_set_drvdata(pdev, indio_dev);
	platform_set_drvdata(pdev, indio_dev);
@@ -48,8 +74,15 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,


	mutex_init(&state->cmd_lock);
	mutex_init(&state->cmd_lock);


	ret = cros_ec_get_host_cmd_version_mask(state->ec,
						ec->cmd_offset,
						EC_CMD_MOTION_SENSE_CMD,
						&ver_mask);
	if (ret < 0)
		return ret;

	/* Set up the host command structure. */
	/* Set up the host command structure. */
	state->msg->version = 2;
	state->msg->version = fls(ver_mask) - 1;
	state->msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
	state->msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
	state->msg->outsize = sizeof(struct ec_params_motion_sense);
	state->msg->outsize = sizeof(struct ec_params_motion_sense);