Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec579358 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by James Morris
Browse files

TPM: Fixup boot probe timeout for tpm_tis driver 



When probing the device in tpm_tis_init the call request_locality
uses timeout_a, which wasn't being initalized until after
request_locality. This results in request_locality falsely timing
out if the chip is still starting. Move the initialization to before
request_locality.

This probably only matters for embedded cases (ie mine), a BIOS likely
gets the TPM into a state where this code path isn't necessary.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent ddd29ec6

drivers/char/tpm/tpm_tis.c

+6 −6
Original line number Diff line number Diff line
@@ -450,6 +450,12 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, 
		goto out_err;

	}



	/* Default timeouts */

	chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);

	chip->vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT);



	if (request_locality(chip, 0) != 0) {

		rc = -ENODEV;

		goto out_err;
@@ -457,12 +463,6 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, 


	vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));



	/* Default timeouts */

	chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_b = msecs_to_jiffies(TIS_LONG_TIMEOUT);

	chip->vendor.timeout_c = msecs_to_jiffies(TIS_SHORT_TIMEOUT);

	chip->vendor.timeout_d = msecs_to_jiffies(TIS_SHORT_TIMEOUT);



	dev_info(dev,

		 "1.2 TPM (device-id 0x%X, rev-id %d)\n",

		 vendor >> 16, ioread8(chip->vendor.iobase + TPM_RID(0)));