sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/tpm/: turn tis_{init,open} into tis_probe

Browse Source 
Init was always followed by open and after successful initialization we
need only send-receive function, which is now returned by tis_probe on
success further reducing number of functions to export from drivers.

Change-Id: Ib4ce35ada24e3959ea1a518c29d431b4ae123809
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68991
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Sergii Dmytruk
2022-10-29 20:42:28 +03:00
committed by Felix Held
parent 86f845ad0d
commit d43154486d
11 changed files with 124 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/i2c/tpm/cr50.c
View File

@@ -484,7 +484,6 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
cr50_set_board_cfg();
}
chip->is_open = 1;
return 0;
}

41
src/drivers/i2c/tpm/tis.c
View File

@@ -19,32 +19,6 @@ static struct tpm_chip chip;
#define TPM_CMD_COUNT_BYTE 2
#define TPM_CMD_ORDINAL_BYTE 6
int tis_open(void)
{
int rc;
if (chip.is_open) {
printk(BIOS_DEBUG, "%s() called twice.\n", __func__);
return -1;
}
rc = tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS,
CONFIG_DRIVER_TPM_I2C_ADDR);
if (rc < 0)
chip.is_open = 0;
if (rc)
return -1;
return 0;
}
int tis_init(void)
{
return tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS,
CONFIG_DRIVER_TPM_I2C_ADDR);
}
static ssize_t tpm_transmit(const uint8_t *sbuf, size_t sbufsiz, void *rbuf,
size_t rbufsiz)
{
@@ -107,8 +81,8 @@ out:
return rc;
}
int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
uint8_t *recvbuf, size_t *rbuf_len)
static int i2c_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
uint8_t *recvbuf, size_t *rbuf_len)
{
ASSERT(sbuf_size >= 10);
@@ -144,3 +118,14 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
return 0;
}
tis_sendrecv_fn tis_probe(void)
{
if (tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR))
return NULL;
if (tpm_vendor_init(&chip, CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR))
return NULL;
return &i2c_tpm_sendrecv;
}

19
src/drivers/i2c/tpm/tis_atmel.c
View File

@@ -22,18 +22,8 @@ struct tpm_output_header {
uint32_t return_code;
} __packed;
int tis_open(void)
{
return 0;
}
int tis_init(void)
{
return 0;
}
int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
uint8_t *recvbuf, size_t *rbuf_len)
static int i2c_tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
uint8_t *recvbuf, size_t *rbuf_len)
{
size_t hdr_bytes;
struct tpm_output_header *header;
@@ -112,3 +102,8 @@ int tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size,
/* Successful transfer */
return 0;
}
tis_sendrecv_fn tis_probe(void)
{
return &i2c_tis_sendrecv;
}

2
src/drivers/i2c/tpm/tpm.c
View File

@@ -507,8 +507,6 @@ int tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr)
tpm_dev.sleep_short = SLEEP_DURATION;
tpm_dev.sleep_long = SLEEP_DURATION_LONG;
chip->is_open = 1;
chip->req_complete_mask = TPM_STS_DATA_AVAIL | TPM_STS_VALID;
chip->req_complete_val = TPM_STS_DATA_AVAIL | TPM_STS_VALID;
chip->req_canceled = TPM_STS_COMMAND_READY;

1
src/drivers/i2c/tpm/tpm.h
View File

@@ -38,7 +38,6 @@ enum tpm_timeout {
#define TPM_DID_VID(l) (0x0006 | ((l) << 4))
struct tpm_chip {
int is_open;
uint8_t req_complete_mask;
uint8_t req_complete_val;
uint8_t req_canceled;