[coreboot-gerrit] New patch to review for coreboot: tpm: use proper locality zero SPI bus addresses

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15568

-gerrit

commit 80935eb04354c9fed330c79c8ed27444607a7276
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Thu Jun 23 12:03:18 2016 -0700

    tpm: use proper locality zero SPI bus addresses
    
    The "PC Client Protection Profile for TPM 2.0" document defines SPI
    bus addresses for different localities. That definition is not honored
    in the cr50 implementation, this patch fixes it: locality zero
    register file is based off 0xd40000.
    
    BRANCH=none
    BUG=chrome-os-partner:54720
    TEST=with the fixed cr50 image and the rest of TPM2 initialization
         patches applied factory initialization sequence on Gru succeeds.
    
    Change-Id: I49b7ed55f0360448b9a6602ebd31a3a531608da3
    Signed-off-by: Martin Roth <martinroth at chromium.org>
    Original-Commit-Id: 43344fff5d58ec235e50030413fc38c98dd0a9a1
    Original-Change-Id: I2de6fa6c05d3eca989d6785228d5adde1f2a7ab7
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/355620
    Original-Reviewed-by: Bill Richardson <wfrichar at chromium.org>
---
 src/drivers/spi/tpm/tpm.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c
index a46042d..b02fc5f 100644
--- a/src/drivers/spi/tpm/tpm.c
+++ b/src/drivers/spi/tpm/tpm.c
@@ -24,12 +24,14 @@
 
 #include "tpm.h"
 
+#define TPM_LOCALITY_0_SPI_BASE 0x00d40000
+
 /* Assorted TPM2 registers for interface type FIFO. */
-#define TPM_ACCESS_REG       0
-#define TPM_STS_REG       0x18
-#define TPM_DATA_FIFO_REG 0x24
-#define TPM_DID_VID_REG  0xf00
-#define TPM_RID_REG      0xf04
+#define TPM_ACCESS_REG    (TPM_LOCALITY_0_SPI_BASE + 0)
+#define TPM_STS_REG       (TPM_LOCALITY_0_SPI_BASE + 0x18)
+#define TPM_DATA_FIFO_REG (TPM_LOCALITY_0_SPI_BASE + 0x24)
+#define TPM_DID_VID_REG   (TPM_LOCALITY_0_SPI_BASE + 0xf00)
+#define TPM_RID_REG       (TPM_LOCALITY_0_SPI_BASE + 0xf04)
 
 /* SPI Interface descriptor used by the driver. */
 struct tpm_spi_if {