diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2020-12-08 10:18:33 +0100 |
|---|---|---|
| committer | Patrick Rudolph <siro@das-labor.org> | 2020-12-10 07:25:23 +0000 |
| commit | d147d43617ec8ca8d90774961955fb4b1f193b61 (patch) | |
| tree | 0ad1c1a712214b2c6182e6b73dcc3f9396b3f240 | |
| parent | f4bf8f5fab33e18eccde7c7db8eb9388cc286297 (diff) | |
| download | coreboot-d147d43617ec8ca8d90774961955fb4b1f193b61.tar.xz | |
drivers/crb/tpm: Fix compilation on x86_64
Change-Id: I19cce90f44b54e4eb6dd8517793ae887f0bd1e22
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48453
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
| -rw-r--r-- | src/drivers/crb/tpm.c | 5 | ||||
| -rw-r--r-- | src/drivers/crb/tpm.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/crb/tpm.c b/src/drivers/crb/tpm.c index 476b62b657..fcefe96448 100644 --- a/src/drivers/crb/tpm.c +++ b/src/drivers/crb/tpm.c @@ -43,10 +43,11 @@ static void crb_readControlArea(void) control_area.cancel = read32(CRB_REG(cur_loc, CRB_REG_CANCEL)); control_area.interrupt_control = read64(CRB_REG(cur_loc, CRB_REG_INT_CTRL)); control_area.command_size = read32(CRB_REG(cur_loc, CRB_REG_CMD_SIZE)); - control_area.command_bfr = (void *)(uint32_t)read64(CRB_REG(cur_loc, CRB_REG_CMD_ADDR)); + control_area.command_bfr = + (void *)(uintptr_t)read64(CRB_REG(cur_loc, CRB_REG_CMD_ADDR)); control_area.response_size = read32(CRB_REG(cur_loc, CRB_REG_RESP_SIZE)); control_area.response_bfr = - (void *)(uint32_t)read64(CRB_REG(cur_loc, CRB_REG_RESP_ADDR)); + (void *)(uintptr_t)read64(CRB_REG(cur_loc, CRB_REG_RESP_ADDR)); } /* Wait for Reg to be expected Value */ diff --git a/src/drivers/crb/tpm.h b/src/drivers/crb/tpm.h index 0d683848ae..c43beb6843 100644 --- a/src/drivers/crb/tpm.h +++ b/src/drivers/crb/tpm.h @@ -6,7 +6,7 @@ #define TPM_CRB_BASE_ADDRESS CONFIG_CRB_TPM_BASE_ADDRESS #define CRB_REG(LOCTY, REG) \ - (void *)(CONFIG_CRB_TPM_BASE_ADDRESS + (LOCTY << 12) + REG) + (void *)(uintptr_t)(CONFIG_CRB_TPM_BASE_ADDRESS + (LOCTY << 12) + REG) /* hardware registers */ #define CRB_REG_LOC_STATE 0x00 |