Commit 0afb7118 authored Mar 10, 2017 by Nayna Jain Committed by Jarkko Sakkinen Apr 03, 2017

tpm: add sleep only for retry in i2c_nuvoton_write_status()



Currently, there is an unnecessary 1 msec delay added in
i2c_nuvoton_write_status() for the successful case. This
function is called multiple times during send() and recv(),
which implies adding multiple extra delays for every TPM
operation.

This patch calls usleep_range() only if retry is to be done.

Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org (linux-4.8)
Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

parent 2d2e376f

drivers/char/tpm/tpm_i2c_nuvoton.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -124,6 +124,7 @@ static s32 i2c_nuvoton_write_status(struct i2c_client *client, u8 data)
	/* this causes the current command to be aborted */		/* this causes the current command to be aborted */
	for (i = 0, status = -1; i < TPM_I2C_RETRY_COUNT && status < 0; i++) {		for (i = 0, status = -1; i < TPM_I2C_RETRY_COUNT && status < 0; i++) {
	status = i2c_nuvoton_write_buf(client, TPM_STS, 1, &data);		status = i2c_nuvoton_write_buf(client, TPM_STS, 1, &data);
			if (status < 0)
	usleep_range(TPM_I2C_BUS_DELAY, TPM_I2C_BUS_DELAY		usleep_range(TPM_I2C_BUS_DELAY, TPM_I2C_BUS_DELAY
	+ TPM_I2C_DELAY_RANGE);		+ TPM_I2C_DELAY_RANGE);
	}		}