Commit 07d8004d authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Jarkko Sakkinen
Browse files

tpm: add bufsiz parameter in the .send callback 



Add a new `bufsiz` parameter to the `.send` callback in `tpm_class_ops`.
This parameter will allow drivers to differentiate between the actual
command length to send and the total buffer size. Currently `bufsiz` is
not used, but it will be used to implement devices with synchronous send()
to send the command and receive the response on the same buffer.

Also rename the previous parameter `len` to `cmd_len` in the declaration
to make it clear that it contains the length in bytes of the command
stored in the buffer. The semantics don't change and it can be used as
before by drivers. This is an optimization since the drivers could get it
from the header, but let's avoid duplicating code.

While we are here, resolve a checkpatch warning:
  WARNING: Unnecessary space before function pointer arguments
  #66: FILE: include/linux/tpm.h:90:
  +	int (*send) (struct tpm_chip *chip, u8 *buf, size_t bufsiz,

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Suggested-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 89be9a83

drivers/char/tpm/st33zp24/st33zp24.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static irqreturn_t tpm_ioserirq_handler(int irq, void *dev_id) 
 * send TPM commands through the I2C bus.

 */

static int st33zp24_send(struct tpm_chip *chip, unsigned char *buf,

			 size_t len)

			 size_t bufsiz, size_t len)

{

	struct st33zp24_dev *tpm_dev = dev_get_drvdata(&chip->dev);

	u32 status, i, size, ordinal;

drivers/char/tpm/tpm-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, void *buf, size_t bufsiz) 
		return -E2BIG;

	}



	rc = chip->ops->send(chip, buf, count);

	rc = chip->ops->send(chip, buf, bufsiz, count);

	if (rc < 0) {

		if (rc != -EPIPE)

			dev_err(&chip->dev,

drivers/char/tpm/tpm_atmel.c

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
	return size;

}



static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)

static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz,

			 size_t count)

{

	struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);

	int i;

drivers/char/tpm/tpm_crb.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int tpm_crb_smc_start(struct device *dev, unsigned long func_id) 
}

#endif



static int crb_send(struct tpm_chip *chip, u8 *buf, size_t len)

static int crb_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz, size_t len)

{

	struct crb_priv *priv = dev_get_drvdata(&chip->dev);

	int rc = 0;

drivers/char/tpm/tpm_ftpm_tee.c

+3 −1
Original line number Diff line number Diff line
@@ -63,13 +63,15 @@ static int ftpm_tee_tpm_op_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
 * ftpm_tee_tpm_op_send() - send TPM commands through the TEE shared memory.

 * @chip:	the tpm_chip description as specified in driver/char/tpm/tpm.h

 * @buf:	the buffer to send.

 * @bufsiz:	the size of the buffer.

 * @len:	the number of bytes to send.

 *

 * Return:

 *	In case of success, returns 0.

 *	On failure, -errno

 */

static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len)

static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t bufsiz,

				size_t len)

{

	struct ftpm_tee_private *pvt_data = dev_get_drvdata(chip->dev.parent);

	size_t resp_len;