Commit e60d726f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-v5.14-rc1' of... 

Merge tag 'tpmdd-next-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm driver updates from Jarkko Sakkinen:
 "Bug fixes for TPM"

[ This isn't actually the whole contents of the tag and thus doesn't
  contain Jarkko's signature - I dropped the two top commits that added
  support for signing modules using elliptic curve keys because there's
  a new series for that that fixes a few confising things   - Linus ]

* tag 'tpmdd-next-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Replace WARN_ONCE() with dev_err_once() in tpm_tis_status()
  tpm_tis: Use DEFINE_RES_MEM() to simplify code
  tpm: fix some doc warnings in tpm1-cmd.c
  tpm_tis_spi: add missing SPI device ID entries
  tpm: add longer timeout for TPM2_CC_VERIFY_SIGNATURE
  char: tpm: move to use request_irq by IRQF_NO_AUTOEN flag
  tpm_tis_spi: set default probe function if device id not match
  tpm_crb: Use IOMEM_ERR_PTR when function returns iomem
parents 776ba3ad 0178f9d0

drivers/char/tpm/tpm1-cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) 
#define TPM_ST_CLEAR 1



/**

 * tpm_startup() - turn on the TPM

 * tpm1_startup() - turn on the TPM

 * @chip: TPM chip to use

 *

 * Normally the firmware should start the TPM. This function is provided as a
@@ -611,7 +611,7 @@ int tpm1_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf) 


#define TPM_ORD_CONTINUE_SELFTEST 83

/**

 * tpm_continue_selftest() - run TPM's selftest

 * tpm1_continue_selftest() - run TPM's selftest

 * @chip: TPM chip to use

 *

 * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing

drivers/char/tpm/tpm2-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static u8 tpm2_ordinal_duration_index(u32 ordinal) 
		return TPM_MEDIUM;



	case TPM2_CC_VERIFY_SIGNATURE:        /* 177 */

		return TPM_LONG;

		return TPM_LONG_LONG;



	case TPM2_CC_PCR_EXTEND:              /* 182 */

		return TPM_MEDIUM;

drivers/char/tpm/tpm_crb.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void __iomem *crb_map_res(struct device *dev, struct resource *iores, 


	/* Detect a 64 bit address on a 32 bit system */

	if (start != new_res.start)

		return (void __iomem *) ERR_PTR(-EINVAL);

		return IOMEM_ERR_PTR(-EINVAL);



	if (!iores)

		return devm_ioremap_resource(dev, &new_res);

drivers/char/tpm/tpm_tis.c

+1 −5
Original line number Diff line number Diff line
@@ -363,11 +363,7 @@ static int tpm_tis_force_device(void) 
{

	struct platform_device *pdev;

	static const struct resource x86_resources[] = {

		{

			.start = 0xFED40000,

			.end = 0xFED40000 + TIS_MEM_LEN - 1,

			.flags = IORESOURCE_MEM,

		},

		DEFINE_RES_MEM(0xFED40000, TIS_MEM_LEN)

	};



	if (!force)

drivers/char/tpm/tpm_tis_core.c

+18 −7
Original line number Diff line number Diff line
@@ -196,13 +196,24 @@ static u8 tpm_tis_status(struct tpm_chip *chip) 
		return 0;



	if (unlikely((status & TPM_STS_READ_ZERO) != 0)) {

		if  (!test_and_set_bit(TPM_TIS_INVALID_STATUS, &priv->flags)) {

			/*

			 * If this trips, the chances are the read is

			 * returning 0xff because the locality hasn't been

			 * acquired.  Usually because tpm_try_get_ops() hasn't

			 * been called before doing a TPM operation.

			 */

		WARN_ONCE(1, "TPM returned invalid status\n");

			dev_err(&chip->dev, "invalid TPM_STS.x 0x%02x, dumping stack for forensics\n",

				status);



			/*

			 * Dump stack for forensics, as invalid TPM_STS.x could be

			 * potentially triggered by impaired tpm_try_get_ops() or

			 * tpm_find_get_ops().

			 */

			dump_stack();

		}



		return 0;

	}