summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2016-09-19 19:20:56 -0700
committerDuncan Laurie <dlaurie@chromium.org>2016-09-19 19:20:56 -0700
commit1de4f9549b8cb290451843dc9d2274887d4f3b22 (patch)
treed6fc0eba37af7cc4710984b8d14e7830fcab1caf
parent4d534870c216110e22ef98456d26237385e585dd (diff)
downloadcoreboot-1de4f9549b8cb290451843dc9d2274887d4f3b22.tar.xz
Revert "drivers/i2c/tpm/cr50: Reduce max buffer size"
This reverts commit 97a2a1ece152b6d40a524361721405b77c37959d.
-rw-r--r--src/drivers/i2c/tpm/cr50.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c
index 1190262100..419ac1e68f 100644
--- a/src/drivers/i2c/tpm/cr50.c
+++ b/src/drivers/i2c/tpm/cr50.c
@@ -41,19 +41,19 @@
#include <timer.h>
#include "tpm.h"
+#define CR50_MAX_BURSTCOUNT 63
#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_DID_VID 0x00281ae0L
struct tpm_inf_dev {
int bus;
unsigned int addr;
- uint8_t buf[CR50_MAX_BUFSIZE + sizeof(uint8_t)];
+ uint8_t buf[TPM_BUFSIZE + sizeof(uint8_t)];
};
static struct tpm_inf_dev g_tpm_dev CAR_GLOBAL;
@@ -115,7 +115,7 @@ static int iic_tpm_write(uint8_t addr, uint8_t *buffer, size_t len)
if (tpm_dev->addr == 0)
return -1;
- if (len > CR50_MAX_BUFSIZE)
+ if (len > TPM_BUFSIZE)
return -1;
/* Prepend the 'register address' to the buffer */
@@ -226,7 +226,7 @@ static int cr50_wait_burst_status(struct tpm_chip *chip, uint8_t mask,
/* Check if mask matches and burst is valid */
if ((*status & mask) == mask &&
- *burst > 0 && *burst <= CR50_MAX_BUFSIZE)
+ *burst > 0 && *burst <= CR50_MAX_BURSTCOUNT)
return 0;
udelay(SLEEP_DURATION_SAFE);
@@ -310,6 +310,9 @@ static int cr50_tis_i2c_send(struct tpm_chip *chip, uint8_t *buf, size_t len)
uint8_t tpm_go[4] = { TPM_STS_GO };
struct stopwatch sw;
+ if (len > TPM_BUFSIZE)
+ return -1;
+
stopwatch_init_msecs_expire(&sw, 2000);
/* Wait until TPM is ready for a command */