GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "drivers/i2c/tpm/cr50: Clean up timeouts" 

This reverts commit 93c778688f.
This commit is contained in:
Duncan Laurie 2016-09-19 19:20:52 -07:00
parent 18f58982b5
commit 4d534870c2
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,12 @@
#include "tpm.h" #include "tpm.h"
#define SLEEP_DURATION 60 /* in usec */
#define SLEEP_DURATION_LONG 210 /* in usec */
#define SLEEP_DURATION_SAFE 750 /* in usec */
#define SLEEP_DURATION_PROBE_MS 1000 /* in msec */
#define CR50_MAX_BUFSIZE 63 #define CR50_MAX_BUFSIZE 63
#define CR50_TIMEOUT_LONG_MS 2000 /* Long timeout while waiting for TPM */
#define CR50_TIMEOUT_SHORT_MS 2 /* Short timeout during transactions */
#define CR50_DID_VID 0x00281ae0L #define CR50_DID_VID 0x00281ae0L
struct tpm_inf_dev { struct tpm_inf_dev {
@ -82,7 +85,7 @@ static int iic_tpm_read(uint8_t addr, uint8_t *buffer, size_t len)
} }
/* Wait for TPM to be ready with response data */ /* Wait for TPM to be ready with response data */
mdelay(CR50_TIMEOUT_SHORT_MS); udelay(SLEEP_DURATION_SAFE);
/* Read response data from the TPM */ /* Read response data from the TPM */
if (i2c_read_raw(tpm_dev->bus, tpm_dev->addr, buffer, len)) { if (i2c_read_raw(tpm_dev->bus, tpm_dev->addr, buffer, len)) {
@ -126,7 +129,7 @@ static int iic_tpm_write(uint8_t addr, uint8_t *buffer, size_t len)
} }
/* Wait for TPM to be ready */ /* Wait for TPM to be ready */
mdelay(CR50_TIMEOUT_SHORT_MS); udelay(SLEEP_DURATION_SAFE);
return 0; return 0;
} }
@ -198,7 +201,6 @@ static void cr50_tis_i2c_ready(struct tpm_chip *chip)
{ {
uint8_t buf[4] = { TPM_STS_COMMAND_READY }; uint8_t buf[4] = { TPM_STS_COMMAND_READY };
iic_tpm_write(TPM_STS(chip->vendor.locality), buf, sizeof(buf)); iic_tpm_write(TPM_STS(chip->vendor.locality), buf, sizeof(buf));
mdelay(CR50_TIMEOUT_SHORT_MS);
} }
/* cr50 uses bytes 3:2 of status register for burst count and /* cr50 uses bytes 3:2 of status register for burst count and
@ -209,13 +211,13 @@ static int cr50_wait_burst_status(struct tpm_chip *chip, uint8_t mask,
uint8_t buf[4]; uint8_t buf[4];
struct stopwatch sw; struct stopwatch sw;
stopwatch_init_msecs_expire(&sw, CR50_TIMEOUT_LONG_MS); stopwatch_init_msecs_expire(&sw, 2000);
while (!stopwatch_expired(&sw)) { while (!stopwatch_expired(&sw)) {
if (iic_tpm_read(TPM_STS(chip->vendor.locality), if (iic_tpm_read(TPM_STS(chip->vendor.locality),
buf, sizeof(buf)) != 0) { buf, sizeof(buf)) != 0) {
printk(BIOS_WARNING, "%s: Read failed\n", __func__); printk(BIOS_WARNING, "%s: Read failed\n", __func__);
mdelay(CR50_TIMEOUT_SHORT_MS); udelay(SLEEP_DURATION_SAFE);
continue; continue;
} }
@ -227,7 +229,7 @@ static int cr50_wait_burst_status(struct tpm_chip *chip, uint8_t mask,
*burst > 0 && *burst <= CR50_MAX_BUFSIZE) *burst > 0 && *burst <= CR50_MAX_BUFSIZE)
return 0; return 0;
mdelay(CR50_TIMEOUT_SHORT_MS); udelay(SLEEP_DURATION_SAFE);
} }
printk(BIOS_ERR, "%s: Timeout reading burst and status\n", __func__); printk(BIOS_ERR, "%s: Timeout reading burst and status\n", __func__);
@ -308,7 +310,7 @@ static int cr50_tis_i2c_send(struct tpm_chip *chip, uint8_t *buf, size_t len)
uint8_t tpm_go[4] = { TPM_STS_GO }; uint8_t tpm_go[4] = { TPM_STS_GO };
struct stopwatch sw; struct stopwatch sw;
stopwatch_init_msecs_expire(&sw, CR50_TIMEOUT_LONG_MS); stopwatch_init_msecs_expire(&sw, 2000);
/* Wait until TPM is ready for a command */ /* Wait until TPM is ready for a command */
while (!(cr50_tis_i2c_status(chip) & TPM_STS_COMMAND_READY)) { while (!(cr50_tis_i2c_status(chip) & TPM_STS_COMMAND_READY)) {
@ -319,6 +321,7 @@ static int cr50_tis_i2c_send(struct tpm_chip *chip, uint8_t *buf, size_t len)
} }
cr50_tis_i2c_ready(chip); cr50_tis_i2c_ready(chip);
udelay(SLEEP_DURATION_SAFE);
} }
while (len > 0) { while (len > 0) {
@ -385,7 +388,7 @@ int tpm_vendor_probe(unsigned bus, uint32_t addr)
struct stopwatch sw; struct stopwatch sw;
uint8_t buf = 0; uint8_t buf = 0;
int ret; int ret;
long sw_run_duration = CR50_TIMEOUT_LONG_MS; long sw_run_duration = SLEEP_DURATION_PROBE_MS;
tpm_dev->bus = bus; tpm_dev->bus = bus;
tpm_dev->addr = addr; tpm_dev->addr = addr;
@ -398,7 +401,7 @@ int tpm_vendor_probe(unsigned bus, uint32_t addr)
sw_run_duration = stopwatch_duration_msecs(&sw); sw_run_duration = stopwatch_duration_msecs(&sw);
break; break;
} }
mdelay(CR50_TIMEOUT_SHORT_MS); udelay(SLEEP_DURATION_SAFE);
} while (!stopwatch_expired(&sw)); } while (!stopwatch_expired(&sw));
printk(BIOS_INFO, printk(BIOS_INFO,