Commit 8a2d296a authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm, tpm_tis: Reserve locality in tpm_tis_resume() 



Reserve locality in tpm_tis_resume(), as it could be unsert after waking
up from a sleep state.

Cc: stable@vger.kernel.org
Cc: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Fixes: a3fbfae8 ("tpm: take TPM chip power gating out of tpm_transmit()")
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent e630af7d

drivers/char/tpm/tpm_tis_core.c

+10 −2
Original line number Diff line number Diff line
@@ -1125,12 +1125,20 @@ int tpm_tis_resume(struct device *dev) 
	if (ret)

		return ret;



	/* TPM 1.2 requires self-test on resume. This function actually returns

	/*

	 * TPM 1.2 requires self-test on resume. This function actually returns

	 * an error code but for unknown reason it isn't handled.

	 */

	if (!(chip->flags & TPM_CHIP_FLAG_TPM2))

	if (!(chip->flags & TPM_CHIP_FLAG_TPM2)) {

		ret = request_locality(chip, 0);

		if (ret < 0)

			return ret;



		tpm1_do_selftest(chip);



		release_locality(chip, 0);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(tpm_tis_resume);