Re: WTF: patch "[PATCH] tpm: Fix some name collisions with drivers/char/tpm.h" was seriously submitted to be applied to the 5.0-stable tree?

[Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>]

I agree. Please drop it.

/Jarkko

On Thu, Mar 21, 2019 at 11:16:00AM +0100, gregkh@linuxfoundation.org wrote:
> The patch below was submitted to be applied to the 5.0-stable tree.
> 
> I fail to see how this patch meets the stable kernel rules as found at
> Documentation/process/stable-kernel-rules.rst.
> 
> I could be totally wrong, and if so, please respond to 
> <stable@vger.kernel.org> and let me know why this patch should be
> applied.  Otherwise, it is now dropped from my patch queues, never to be
> seen again.
> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 8ab547a2dcfac6ec184a5e036e1093eb3f7a215c Mon Sep 17 00:00:00 2001
> From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Date: Tue, 5 Feb 2019 11:14:00 +0200
> Subject: [PATCH] tpm: Fix some name collisions with drivers/char/tpm.h
> 
> * Rename TPM_BUFSIZE defined in drivers/char/tpm/st33zp24/st33zp24.h to
>   ST33ZP24_BUFSIZE.
> * Rename TPM_BUFSIZE defined in drivers/char/tpm/tpm_i2c_infineon.c to
>   TPM_I2C_INFINEON_BUFSIZE.
> * Rename TPM_RETRY in tpm_i2c_nuvoton to TPM_I2C_RETRIES.
> * Remove TPM_HEADER_SIZE from tpm_i2c_nuvoton.
> 
> Cc: stable@vger.kernel.org
> Fixes: bf38b8710892 ("tpm/tpm_i2c_stm_st33: Split tpm_i2c_tpm_st33 in 2 layers (core + phy)")
> Fixes: aad628c1d91a ("char/tpm: Add new driver for Infineon I2C TIS TPM")
> Fixes: 32d33b29ba07 ("TPM: Retry SaveState command in suspend path")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> 
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index be5d1abd3e8e..8390c5b54c3b 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -33,7 +33,7 @@
>  
>  struct st33zp24_i2c_phy {
>  	struct i2c_client *client;
> -	u8 buf[TPM_BUFSIZE + 1];
> +	u8 buf[ST33ZP24_BUFSIZE + 1];
>  	int io_lpcpd;
>  };
>  
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index d7909ab287a8..ff019a1e3c68 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -63,7 +63,7 @@
>   * some latency byte before the answer is available (max 15).
>   * We have 2048 + 1024 + 15.
>   */
> -#define ST33ZP24_SPI_BUFFER_SIZE (TPM_BUFSIZE + (TPM_BUFSIZE / 2) +\
> +#define ST33ZP24_SPI_BUFFER_SIZE (ST33ZP24_BUFSIZE + (ST33ZP24_BUFSIZE / 2) +\
>  				  MAX_SPI_LATENCY)
>  
>  
> diff --git a/drivers/char/tpm/st33zp24/st33zp24.h b/drivers/char/tpm/st33zp24/st33zp24.h
> index 6f4a4198af6a..20da0a84988d 100644
> --- a/drivers/char/tpm/st33zp24/st33zp24.h
> +++ b/drivers/char/tpm/st33zp24/st33zp24.h
> @@ -18,8 +18,8 @@
>  #ifndef __LOCAL_ST33ZP24_H__
>  #define __LOCAL_ST33ZP24_H__
>  
> -#define TPM_WRITE_DIRECTION             0x80
> -#define TPM_BUFSIZE                     2048
> +#define TPM_WRITE_DIRECTION	0x80
> +#define ST33ZP24_BUFSIZE	2048
>  
>  struct st33zp24_dev {
>  	struct tpm_chip *chip;
> diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
> index 9086edc9066b..3b490d9d90e7 100644
> --- a/drivers/char/tpm/tpm_i2c_infineon.c
> +++ b/drivers/char/tpm/tpm_i2c_infineon.c
> @@ -26,8 +26,7 @@
>  #include <linux/wait.h>
>  #include "tpm.h"
>  
> -/* max. buffer size supported by our TPM */
> -#define TPM_BUFSIZE 1260
> +#define TPM_I2C_INFINEON_BUFSIZE 1260
>  
>  /* max. number of iterations after I2C NAK */
>  #define MAX_COUNT 3
> @@ -63,11 +62,13 @@ enum i2c_chip_type {
>  	UNKNOWN,
>  };
>  
> -/* Structure to store I2C TPM specific stuff */
>  struct tpm_inf_dev {
>  	struct i2c_client *client;
>  	int locality;
> -	u8 buf[TPM_BUFSIZE + sizeof(u8)]; /* max. buffer size + addr */
> +	/* In addition to the data itself, the buffer must fit the 7-bit I2C
> +	 * address and the direction bit.
> +	 */
> +	u8 buf[TPM_I2C_INFINEON_BUFSIZE + 1];
>  	struct tpm_chip *chip;
>  	enum i2c_chip_type chip_type;
>  	unsigned int adapterlimit;
> @@ -219,7 +220,7 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
>  		.buf = tpm_dev.buf
>  	};
>  
> -	if (len > TPM_BUFSIZE)
> +	if (len > TPM_I2C_INFINEON_BUFSIZE)
>  		return -EINVAL;
>  
>  	if (!tpm_dev.client->adapter->algo->master_xfer)
> @@ -527,8 +528,8 @@ static int tpm_tis_i2c_send(struct tpm_chip *chip, u8 *buf, size_t len)
>  	u8 retries = 0;
>  	u8 sts = TPM_STS_GO;
>  
> -	if (len > TPM_BUFSIZE)
> -		return -E2BIG;	/* command is too long for our tpm, sorry */
> +	if (len > TPM_I2C_INFINEON_BUFSIZE)
> +		return -E2BIG;
>  
>  	if (request_locality(chip, 0) < 0)
>  		return -EBUSY;
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index 217f7f1cbde8..5700cc2ddee1 100644
> --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -35,14 +35,12 @@
>  #include "tpm.h"
>  
>  /* I2C interface offsets */
> -#define TPM_STS                0x00
> -#define TPM_BURST_COUNT        0x01
> -#define TPM_DATA_FIFO_W        0x20
> -#define TPM_DATA_FIFO_R        0x40
> -#define TPM_VID_DID_RID        0x60
> -/* TPM command header size */
> -#define TPM_HEADER_SIZE        10
> -#define TPM_RETRY      5
> +#define TPM_STS			0x00
> +#define TPM_BURST_COUNT		0x01
> +#define TPM_DATA_FIFO_W		0x20
> +#define TPM_DATA_FIFO_R		0x40
> +#define TPM_VID_DID_RID		0x60
> +#define TPM_I2C_RETRIES		5
>  /*
>   * I2C bus device maximum buffer size w/o counting I2C address or command
>   * i.e. max size required for I2C write is 34 = addr, command, 32 bytes data
> @@ -292,7 +290,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)
>  		dev_err(dev, "%s() count < header size\n", __func__);
>  		return -EIO;
>  	}
> -	for (retries = 0; retries < TPM_RETRY; retries++) {
> +	for (retries = 0; retries < TPM_I2C_RETRIES; retries++) {
>  		if (retries > 0) {
>  			/* if this is not the first trial, set responseRetry */
>  			i2c_nuvoton_write_status(client,
>