diff options
author | Sergii Dmytruk <sergii.dmytruk@3mdeb.com> | 2022-11-01 00:48:43 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2024-04-16 13:52:14 +0000 |
commit | 3e5cefcc45d7ef7da9fd9b6ecc499a05f8134039 (patch) | |
tree | 676b2369f6559b7d0028aaafc0c9b84af798ade6 /src/drivers/pc80 | |
parent | 7c75f8e5b2c3877487b424a1523c1e2a0caa4111 (diff) |
security/tpm: support compiling in multiple TPM drivers
Starting from here CONFIG_TPM1 and CONFIG_TPM2 are no longer mutually
exclusive.
Change-Id: I44c5a1d825afe414c2f5c2c90f4cfe41ba9bef5f
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69162
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/pc80')
-rw-r--r-- | src/drivers/pc80/tpm/tis.c | 10 | ||||
-rw-r--r-- | src/drivers/pc80/tpm/tpm.h | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index 568065c654..f922714381 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -24,7 +24,9 @@ #include <device/pnp.h> #include <drivers/tpm/tpm_ppi.h> #include <timer.h> + #include "chip.h" +#include "tpm.h" #define PREFIX "lpc_tpm: " @@ -374,7 +376,7 @@ static tpm_result_t tis_command_ready(u8 locality) * Returns TPM_SUCCESS on success (the device is found or was found during * an earlier invocation) or TPM_CB_FAIL if the device is not found. */ -static tpm_result_t pc80_tis_probe(enum tpm_family *family) +static tpm_result_t pc80_tpm_probe(enum tpm_family *family) { static enum tpm_family tpm_family; @@ -718,7 +720,7 @@ static tpm_result_t pc80_tpm_sendrecv(const uint8_t *sendbuf, size_t send_size, } /* - * tis_probe() + * pc80_tis_probe() * * Probe for the TPM device and set it up for use within locality 0. * @@ -726,9 +728,9 @@ static tpm_result_t pc80_tpm_sendrecv(const uint8_t *sendbuf, size_t send_size, * * Returns pointer to send-receive function on success or NULL on failure. */ -tis_sendrecv_fn tis_probe(enum tpm_family *family) +tis_sendrecv_fn pc80_tis_probe(enum tpm_family *family) { - if (pc80_tis_probe(family)) + if (pc80_tpm_probe(family)) return NULL; if (pc80_tis_open()) diff --git a/src/drivers/pc80/tpm/tpm.h b/src/drivers/pc80/tpm/tpm.h new file mode 100644 index 0000000000..db71e03900 --- /dev/null +++ b/src/drivers/pc80/tpm/tpm.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef DRIVERS_PC80_TPM_TPM_H +#define DRIVERS_PC80_TPM_TPM_H + +#include <security/tpm/tis.h> + +tis_sendrecv_fn pc80_tis_probe(enum tpm_family *family); + +#endif /* DRIVERS_PC80_TPM_TPM_H */ |