tpmdd updates for Linux v5.6-rc3
-----BEGIN PGP SIGNATURE----- iJYEABYIAD4WIQRE6pSOnaBC00OEHEIaerohdGur0gUCXkrf7CAcamFya2tvLnNh a2tpbmVuQGxpbnV4LmludGVsLmNvbQAKCRAaerohdGur0v6rAP9dug1d+LmeV3df 8ml5VqIODRh6Vuo5PLceOTD7YG854QD/R2VtY9Oq47CpscBO/6To1dOKadY6cSKm lybLAzMCpgs= =FSvH -----END PGP SIGNATURE----- Merge tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd Pull tpm fixes from Jarkko Sakkinen: "Two bug fixes" * tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd: tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
This commit is contained in:
commit
2b72104b8c
|
@ -21,9 +21,11 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o
|
||||||
tpm-$(CONFIG_OF) += eventlog/of.o
|
tpm-$(CONFIG_OF) += eventlog/of.o
|
||||||
obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
|
obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o
|
||||||
obj-$(CONFIG_TCG_TIS) += tpm_tis.o
|
obj-$(CONFIG_TCG_TIS) += tpm_tis.o
|
||||||
obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi_mod.o
|
|
||||||
tpm_tis_spi_mod-y := tpm_tis_spi.o
|
obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o
|
||||||
tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
|
tpm_tis_spi-y := tpm_tis_spi_main.o
|
||||||
|
tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o
|
||||||
|
|
||||||
obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
|
obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o
|
||||||
obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
|
obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o
|
||||||
obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
|
obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o
|
||||||
|
|
|
@ -525,6 +525,8 @@ static int tpm2_init_bank_info(struct tpm_chip *chip, u32 bank_index)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bank->crypto_id = HASH_ALGO__LAST;
|
||||||
|
|
||||||
return tpm2_pcr_read(chip, 0, &digest, &bank->digest_size);
|
return tpm2_pcr_read(chip, 0, &digest, &bank->digest_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue