mfd: cros_ec: Use struct cros_ec_command to communicate with the EC (5d4773e2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mfd/cros_ec.c

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -25,22 +25,22 @@
	#include <linux/mfd/cros_ec_commands.h>		#include <linux/mfd/cros_ec_commands.h>

	int cros_ec_prepare_tx(struct cros_ec_device *ec_dev,		int cros_ec_prepare_tx(struct cros_ec_device *ec_dev,
	struct cros_ec_msg *msg)		struct cros_ec_command *msg)
	{		{
	uint8_t *out;		uint8_t *out;
	int csum, i;		int csum, i;

	BUG_ON(msg->out_len > EC_PROTO2_MAX_PARAM_SIZE);		BUG_ON(msg->outsize > EC_PROTO2_MAX_PARAM_SIZE);
	out = ec_dev->dout;		out = ec_dev->dout;
	out[0] = EC_CMD_VERSION0 + msg->version;		out[0] = EC_CMD_VERSION0 + msg->version;
	out[1] = msg->cmd;		out[1] = msg->command;
	out[2] = msg->out_len;		out[2] = msg->outsize;
	csum = out[0] + out[1] + out[2];		csum = out[0] + out[1] + out[2];
	for (i = 0; i < msg->out_len; i++)		for (i = 0; i < msg->outsize; i++)
	csum += out[EC_MSG_TX_HEADER_BYTES + i] = msg->out_buf[i];		csum += out[EC_MSG_TX_HEADER_BYTES + i] = msg->outdata[i];
	out[EC_MSG_TX_HEADER_BYTES + msg->out_len] = (uint8_t)(csum & 0xff);		out[EC_MSG_TX_HEADER_BYTES + msg->outsize] = (uint8_t)(csum & 0xff);

	return EC_MSG_TX_PROTO_BYTES + msg->out_len;		return EC_MSG_TX_PROTO_BYTES + msg->outsize;
	}		}
	EXPORT_SYMBOL(cros_ec_prepare_tx);		EXPORT_SYMBOL(cros_ec_prepare_tx);

	@@ -48,14 +48,14 @@ static int cros_ec_command_sendrecv(struct cros_ec_device *ec_dev,
	uint16_t cmd, void *out_buf, int out_len,		uint16_t cmd, void *out_buf, int out_len,
	void *in_buf, int in_len)		void *in_buf, int in_len)
	{		{
	struct cros_ec_msg msg;		struct cros_ec_command msg;

	msg.version = cmd >> 8;		msg.version = cmd >> 8;
	msg.cmd = cmd & 0xff;		msg.command = cmd & 0xff;
	msg.out_buf = out_buf;		msg.outdata = out_buf;
	msg.out_len = out_len;		msg.outsize = out_len;
	msg.in_buf = in_buf;		msg.indata = in_buf;
	msg.in_len = in_len;		msg.insize = in_len;

	return ec_dev->cmd_xfer(ec_dev, &msg);		return ec_dev->cmd_xfer(ec_dev, &msg);
	}		}

drivers/mfd/cros_ec_i2c.c

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ static inline struct cros_ec_device to_ec_dev(struct device dev)
	}		}

	static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,		static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,
	struct cros_ec_msg *msg)		struct cros_ec_command *msg)
	{		{
	struct i2c_client *client = ec_dev->priv;		struct i2c_client *client = ec_dev->priv;
	int ret = -ENOMEM;		int ret = -ENOMEM;
	@@ -50,7 +50,7 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,
	* allocate larger packet (one byte for checksum, one byte for		* allocate larger packet (one byte for checksum, one byte for
	* length, and one for result code)		* length, and one for result code)
	*/		*/
	packet_len = msg->in_len + 3;		packet_len = msg->insize + 3;
	in_buf = kzalloc(packet_len, GFP_KERNEL);		in_buf = kzalloc(packet_len, GFP_KERNEL);
	if (!in_buf)		if (!in_buf)
	goto done;		goto done;
	@@ -61,7 +61,7 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,
	* allocate larger packet (one byte for checksum, one for		* allocate larger packet (one byte for checksum, one for
	* command code, one for length, and one for command version)		* command code, one for length, and one for command version)
	*/		*/
	packet_len = msg->out_len + 4;		packet_len = msg->outsize + 4;
	out_buf = kzalloc(packet_len, GFP_KERNEL);		out_buf = kzalloc(packet_len, GFP_KERNEL);
	if (!out_buf)		if (!out_buf)
	goto done;		goto done;
	@@ -69,16 +69,16 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,
	i2c_msg[0].buf = (char *)out_buf;		i2c_msg[0].buf = (char *)out_buf;

	out_buf[0] = EC_CMD_VERSION0 + msg->version;		out_buf[0] = EC_CMD_VERSION0 + msg->version;
	out_buf[1] = msg->cmd;		out_buf[1] = msg->command;
	out_buf[2] = msg->out_len;		out_buf[2] = msg->outsize;

	/* copy message payload and compute checksum */		/* copy message payload and compute checksum */
	sum = out_buf[0] + out_buf[1] + out_buf[2];		sum = out_buf[0] + out_buf[1] + out_buf[2];
	for (i = 0; i < msg->out_len; i++) {		for (i = 0; i < msg->outsize; i++) {
	out_buf[3 + i] = msg->out_buf[i];		out_buf[3 + i] = msg->outdata[i];
	sum += out_buf[3 + i];		sum += out_buf[3 + i];
	}		}
	out_buf[3 + msg->out_len] = sum;		out_buf[3 + msg->outsize] = sum;

	/* send command to EC and read answer */		/* send command to EC and read answer */
	ret = i2c_transfer(client->adapter, i2c_msg, 2);		ret = i2c_transfer(client->adapter, i2c_msg, 2);
	@@ -94,20 +94,20 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device *ec_dev,
	/* check response error code */		/* check response error code */
	if (i2c_msg[1].buf[0]) {		if (i2c_msg[1].buf[0]) {
	dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",		dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",
	msg->cmd, i2c_msg[1].buf[0]);		msg->command, i2c_msg[1].buf[0]);
	ret = -EINVAL;		ret = -EINVAL;
	goto done;		goto done;
	}		}

	/* copy response packet payload and compute checksum */		/* copy response packet payload and compute checksum */
	sum = in_buf[0] + in_buf[1];		sum = in_buf[0] + in_buf[1];
	for (i = 0; i < msg->in_len; i++) {		for (i = 0; i < msg->insize; i++) {
	msg->in_buf[i] = in_buf[2 + i];		msg->indata[i] = in_buf[2 + i];
	sum += in_buf[2 + i];		sum += in_buf[2 + i];
	}		}
	dev_dbg(ec_dev->dev, "packet: %*ph, sum = %02x\n",		dev_dbg(ec_dev->dev, "packet: %*ph, sum = %02x\n",
	i2c_msg[1].len, in_buf, sum);		i2c_msg[1].len, in_buf, sum);
	if (sum != in_buf[2 + msg->in_len]) {		if (sum != in_buf[2 + msg->insize]) {
	dev_err(ec_dev->dev, "bad packet checksum\n");		dev_err(ec_dev->dev, "bad packet checksum\n");
	ret = -EBADMSG;		ret = -EBADMSG;
	goto done;		goto done;

drivers/mfd/cros_ec_spi.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,7 @@ static int cros_ec_spi_receive_response(struct cros_ec_device *ec_dev,
	* @ec_msg: Message to transfer		* @ec_msg: Message to transfer
	*/		*/
	static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,		static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
	struct cros_ec_msg *ec_msg)		struct cros_ec_command *ec_msg)
	{		{
	struct cros_ec_spi *ec_spi = ec_dev->priv;		struct cros_ec_spi *ec_spi = ec_dev->priv;
	struct spi_transfer trans;		struct spi_transfer trans;
	@@ -261,7 +261,7 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
	/* Get the response */		/* Get the response */
	if (!ret) {		if (!ret) {
	ret = cros_ec_spi_receive_response(ec_dev,		ret = cros_ec_spi_receive_response(ec_dev,
	ec_msg->in_len + EC_MSG_TX_PROTO_BYTES);		ec_msg->insize + EC_MSG_TX_PROTO_BYTES);
	} else {		} else {
	dev_err(ec_dev->dev, "spi transfer failed: %d\n", ret);		dev_err(ec_dev->dev, "spi transfer failed: %d\n", ret);
	}		}
	@@ -290,21 +290,21 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
	if (ptr[0]) {		if (ptr[0]) {
	if (ptr[0] == EC_RES_IN_PROGRESS) {		if (ptr[0] == EC_RES_IN_PROGRESS) {
	dev_dbg(ec_dev->dev, "command 0x%02x in progress\n",		dev_dbg(ec_dev->dev, "command 0x%02x in progress\n",
	ec_msg->cmd);		ec_msg->command);
	ret = -EAGAIN;		ret = -EAGAIN;
	goto exit;		goto exit;
	}		}
	dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",		dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n",
	ec_msg->cmd, ptr[0]);		ec_msg->command, ptr[0]);
	debug_packet(ec_dev->dev, "in_err", ptr, len);		debug_packet(ec_dev->dev, "in_err", ptr, len);
	ret = -EINVAL;		ret = -EINVAL;
	goto exit;		goto exit;
	}		}
	len = ptr[1];		len = ptr[1];
	sum = ptr[0] + ptr[1];		sum = ptr[0] + ptr[1];
	if (len > ec_msg->in_len) {		if (len > ec_msg->insize) {
	dev_err(ec_dev->dev, "packet too long (%d bytes, expected %d)",		dev_err(ec_dev->dev, "packet too long (%d bytes, expected %d)",
	len, ec_msg->in_len);		len, ec_msg->insize);
	ret = -ENOSPC;		ret = -ENOSPC;
	goto exit;		goto exit;
	}		}
	@@ -312,8 +312,8 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev,
	/* copy response packet payload and compute checksum */		/* copy response packet payload and compute checksum */
	for (i = 0; i < len; i++) {		for (i = 0; i < len; i++) {
	sum += ptr[i + 2];		sum += ptr[i + 2];
	if (ec_msg->in_len)		if (ec_msg->insize)
	ec_msg->in_buf[i] = ptr[i + 2];		ec_msg->indata[i] = ptr[i + 2];
	}		}
	sum &= 0xff;		sum &= 0xff;

include/linux/mfd/cros_ec.h

+18 −17

Original line number	Original line	Diff line number	Diff line
	@@ -35,23 +35,23 @@ enum {
	EC_MSG_TX_PROTO_BYTES,		EC_MSG_TX_PROTO_BYTES,
	};		};

	/**		/*
	* struct cros_ec_msg - A message sent to the EC, and its reply
	*
	* @version: Command version number (often 0)		* @version: Command version number (often 0)
	* @cmd: Command to send (EC_CMD_...)		* @command: Command to send (EC_CMD_...)
	* @out_buf: Outgoing payload (to EC)		* @outdata: Outgoing data to EC
	* @outlen: Outgoing length		* @outsize: Outgoing length in bytes
	* @in_buf: Incoming payload (from EC)		* @indata: Where to put the incoming data from EC
	* @in_len: Incoming length		* @insize: Incoming length in bytes (filled in by EC)
			* @result: EC's response to the command (separate from communication failure)
	*/		*/
	struct cros_ec_msg {		struct cros_ec_command {
	u8 version;		uint32_t version;
	u8 cmd;		uint32_t command;
	uint8_t *out_buf;		uint8_t *outdata;
	int out_len;		uint32_t outsize;
	uint8_t *in_buf;		uint8_t *indata;
	int in_len;		uint32_t insize;
			uint32_t result;
	};		};

	/**		/**
	@@ -114,7 +114,8 @@ struct cros_ec_device {
	struct device *parent;		struct device *parent;
	bool wake_enabled;		bool wake_enabled;
	struct mutex lock;		struct mutex lock;
	int (cmd_xfer)(struct cros_ec_device ec, struct cros_ec_msg *msg);		int (cmd_xfer)(struct cros_ec_device ec,
			struct cros_ec_command *msg);
	};		};

	/**		/**
	@@ -148,7 +149,7 @@ int cros_ec_resume(struct cros_ec_device *ec_dev);
	* @msg: Message to write		* @msg: Message to write
	*/		*/
	int cros_ec_prepare_tx(struct cros_ec_device *ec_dev,		int cros_ec_prepare_tx(struct cros_ec_device *ec_dev,
	struct cros_ec_msg *msg);		struct cros_ec_command *msg);

	/**		/**
	* cros_ec_remove - Remove a ChromeOS EC		* cros_ec_remove - Remove a ChromeOS EC