diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/tpm_test/ftdi_spi_tpm.c | 7 | ||||
| -rw-r--r-- | test/tpm_test/mpsse.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/tpm_test/ftdi_spi_tpm.c b/test/tpm_test/ftdi_spi_tpm.c index 4fc281aa24..ebec39b766 100644 --- a/test/tpm_test/ftdi_spi_tpm.c +++ b/test/tpm_test/ftdi_spi_tpm.c @@ -86,7 +86,7 @@ void FtdiStop(void) static void FtdiSpiPoke(void) { Start(mpsse_); - usleep(1000); + usleep(10000); Stop(mpsse_); usleep(60000); } @@ -248,7 +248,7 @@ int FtdiSpiInit(uint32_t freq, int enable_debug) freq = (freq / (100 * 1000)) * 100 * 1000; printf("Starting MPSSE at %d kHz\n", freq / 1000); - mpsse_ = MPSSE(freq, MSB, NULL); + mpsse_ = MPSSE(freq, MSB, getenv("ISERIAL")); if (!mpsse_) return false; @@ -257,6 +257,7 @@ int FtdiSpiInit(uint32_t freq, int enable_debug) FtdiSpiPoke(); + printf("Reading TPM_DID_VID register\n"); FtdiReadReg(TPM_DID_VID_REG, sizeof(did_vid), &did_vid); vid = did_vid & 0xffff; @@ -264,7 +265,7 @@ int FtdiSpiInit(uint32_t freq, int enable_debug) fprintf(stderr, "unknown did_vid: %#x\n", did_vid); return false; } - + printf("Claiming TPM locality zero.\n"); /* Try claiming locality zero. */ FtdiReadReg(TPM_ACCESS_REG, sizeof(cmd), &cmd); if ((cmd & (activeLocality & tpmRegValidSts)) == diff --git a/test/tpm_test/mpsse.c b/test/tpm_test/mpsse.c index e57a9cf761..249b548b11 100644 --- a/test/tpm_test/mpsse.c +++ b/test/tpm_test/mpsse.c @@ -65,7 +65,7 @@ enum clock_rates { #define NULL_CONTEXT_ERROR_MSG "NULL MPSSE context pointer!" #define SPI_TRANSFER_SIZE 512 #define SPI_RW_SIZE (63 * 1024) -#define SETUP_DELAY 25000 +#define SETUP_DELAY 100000 #define LATENCY_MS 2 #define USB_TIMEOUT 120000 #define CHUNK_SIZE 65535 @@ -386,6 +386,12 @@ static struct mpsse_context *OpenIndex(int vid, */ ftdi_usb_purge_buffers(&mpsse->ftdi); + printf("Using FTDI vid=%x, pid=%x", vid, pid); + if (NULL != serial) + printf(" serial=%s\n", serial); + else + printf("\n"); + return mpsse; } |