Re: [PATCH 1/1] char: tpm: handle HAS_IOPORT dependencies

From: Arnd Bergmann
Date: Thu Apr 04 2024 - 07:18:19 EST


On Thu, Apr 4, 2024, at 12:58, Niklas Schnelle wrote:
> diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> index 9c924a1440a9..99c6e565ec8d 100644
> --- a/drivers/char/tpm/tpm_infineon.c
> +++ b/drivers/char/tpm/tpm_infineon.c
> @@ -26,7 +26,9 @@
> #define TPM_MAX_TRIES 5000
> #define TPM_INFINEON_DEV_VEN_VALUE 0x15D1
>
> +#ifdef CONFIG_HAS_IOPORT
> #define TPM_INF_IO_PORT 0x0
> +#endif
> #define TPM_INF_IO_MEM 0x1

I think hiding this definition in this version of a patch
results in a build failure because of the assignment that
you are not stubbing out:

/* read IO-ports through PnP */
if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) &&
!(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) {
tpm_dev.iotype = TPM_INF_IO_PORT;

I don't know what changed since the earlier versions I tested,
or if I just missed it, but I think you either have to remove
the #ifdef above or add another one in tpm_inf_pnp_probe().

Arnd