Commit 8516b23a authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Jarkko Sakkinen

char: tpm: Keep TPM_INF_IO_PORT define for HAS_IOPORT=n

The recent change to handle HAS_IOPORT removed the TPM_INF_IO_PORT
define for the HAS_IOPORT=n case despite the define being used in
sections of code not covered by the same ifdef check. This was missed
because at the moment TCG_INFINEON indirectly depends on HAS_IOPORT via
PNP which depends on ACPI || ISA. As TCG_INFINEON does in principle
support MMIO only use add it for COMPILE_TEST to cover the HAS_IOPORT=n
case.

Link: https://lore.kernel.org/lkml/9d9fa267-067e-421b-9a39-aa178b913298@app.fastmail.com/
Fixes: dab56f80e7f9 ("char: tpm: handle HAS_IOPORT dependencies")
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 45121fcb
...@@ -157,7 +157,7 @@ config TCG_ATMEL ...@@ -157,7 +157,7 @@ config TCG_ATMEL
config TCG_INFINEON config TCG_INFINEON
tristate "Infineon Technologies TPM Interface" tristate "Infineon Technologies TPM Interface"
depends on PNP depends on PNP || COMPILE_TEST
help help
If you have a TPM security chip from Infineon Technologies If you have a TPM security chip from Infineon Technologies
(either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it (either SLD 9630 TT 1.1 or SLB 9635 TT 1.2) say Yes and it
......
...@@ -26,9 +26,7 @@ ...@@ -26,9 +26,7 @@
#define TPM_MAX_TRIES 5000 #define TPM_MAX_TRIES 5000
#define TPM_INFINEON_DEV_VEN_VALUE 0x15D1 #define TPM_INFINEON_DEV_VEN_VALUE 0x15D1
#ifdef CONFIG_HAS_IOPORT
#define TPM_INF_IO_PORT 0x0 #define TPM_INF_IO_PORT 0x0
#endif
#define TPM_INF_IO_MEM 0x1 #define TPM_INF_IO_MEM 0x1
#define TPM_INF_ADDR 0x0 #define TPM_INF_ADDR 0x0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment