github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-22 17:27:53 +00:00
Code Issues Projects Releases Wiki Activity

DM: tpm: remove fixed value TPM_CRB_MMIO_ADDR

Browse Source 
The GPA of TPM device has fixed value TPM_CRB_MMIO_ADDR, remove
TPM_CRB_MMIO_ADDR and allocate GPA base for TPM device

Tracked-On: #5913
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Acked-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Tao Yuhong
2021-04-19 09:38:40 -04:00
committed by wenlingz
parent f1c2eca1dc
commit cb8a6a7514
6 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devicemodel/hw/platform/acpi/acpi.c
View File

@@ -820,7 +820,8 @@ static void tpm2_crb_fwrite_dsdt(void)
dsdt_line(" Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings");
dsdt_line(" {");
dsdt_indent(4);
dsdt_fixed_mem32(TPM_CRB_MMIO_ADDR, TPM_CRB_MMIO_SIZE);
/* TODO: consider a better framework for mmio likes pci's vdev_write_dsdt. */
dsdt_fixed_mem32(get_tpm_crb_mmio_addr(), TPM_CRB_MMIO_SIZE);
dsdt_unindent(4);
dsdt_line(" })");
dsdt_line(" Method (_STA, 0, NotSerialized) // _STA: Status");

26
devicemodel/hw/platform/tpm/tpm.c
View File

@@ -14,6 +14,8 @@
#include "tpm.h"
#include "tpm_internal.h"
#include "log.h"
#include "mmio_dev.h"
#include "dm.h"
static int tpm_debug;
#define LOG_TAG "tpm: "
@@ -24,6 +26,25 @@ static int tpm_debug;
#define STR_MAX_LEN 1024U
static char *sock_path = NULL;
static uint32_t vtpm_crb_mmio_addr = 0U;
uint32_t get_vtpm_crb_mmio_addr(void) {
return vtpm_crb_mmio_addr;
}
uint32_t get_tpm_crb_mmio_addr(void)
{
uint32_t base;
if (pt_tpm2) {
base = (uint32_t)get_mmio_dev_tpm2_base_gpa();
} else {
base = get_vtpm_crb_mmio_addr();
}
return base;
}
enum {
SOCK_PATH_OPT = 0
@@ -68,6 +89,11 @@ void init_vtpm2(struct vmctx *ctx)
return;
}
if (mmio_dev_alloc_gpa_resource32(&vtpm_crb_mmio_addr, TPM_CRB_MMIO_SIZE) < 0) {
WPRINTF("Failed allocate gpa resorce!\n");
return;
}
if (init_tpm_crb(ctx) < 0) {
WPRINTF("Failed init tpm emulator!\n");
}

17
devicemodel/hw/platform/tpm/tpm_crb.c
View File

@@ -206,11 +206,11 @@ static uint64_t crb_reg_read(struct tpm_crb_vdev *tpm_vdev, uint64_t addr, int s
uint32_t val;
uint64_t off;
off = (addr & ~3UL) - TPM_CRB_MMIO_ADDR;
off = (addr & ~3UL) - get_vtpm_crb_mmio_addr();
val = mmio_read(&tpm_vdev->crb_regs.regs.bytes[off], size);
if (addr == CRB_REGS_LOC_STATE) {
if (off == CRB_REGS_LOC_STATE) {
val |= !swtpm_get_tpm_established_flag();
}
@@ -291,8 +291,9 @@ static void crb_reg_write(struct tpm_crb_vdev *tpm_vdev, uint64_t addr, int size
{
uint8_t target_loc = (addr >> 12) & 0b111; /* convert address to locality */
uint32_t cmd_size;
uint64_t off = addr - get_vtpm_crb_mmio_addr();
switch (addr) {
switch (off) {
case CRB_REGS_CTRL_REQ:
if (tpm_vdev->crb_regs.regs.ctrl_start == CRB_CTRL_START_CMD)
break;
@@ -388,7 +389,7 @@ static int tpm_crb_data_buffer_handler(struct vmctx *ctx, int vcpu, int dir, uin
if (tpm_vdev->crb_regs.regs.ctrl_sts.tpmIdle == 1)
return 0;
off = addr - CRB_DATA_BUFFER;
off = addr - get_vtpm_crb_mmio_addr() - CRB_DATA_BUFFER;
if (dir == MEM_F_READ) {
*val = mmio_read(&tpm_vdev->data_buffer[off], size);
@@ -457,7 +458,7 @@ int init_tpm_crb(struct vmctx *ctx)
ctx->tpm_dev = tpm_vdev;
mr_cmd.name = "tpm_crb_reg";
mr_cmd.base = TPM_CRB_MMIO_ADDR;
mr_cmd.base = get_vtpm_crb_mmio_addr();
mr_cmd.size = TPM_CRB_REG_SIZE;
mr_cmd.flags = MEM_F_RW;
mr_cmd.handler = tpm_crb_reg_handler;
@@ -471,7 +472,7 @@ int init_tpm_crb(struct vmctx *ctx)
}
mr_data.name = "tpm_crb_buffer";
mr_data.base = CRB_DATA_BUFFER;
mr_data.base = get_vtpm_crb_mmio_addr() + CRB_DATA_BUFFER;
mr_data.size = TPM_CRB_DATA_BUFFER_SIZE;
mr_data.flags = MEM_F_RW;
mr_data.handler = tpm_crb_data_buffer_handler;
@@ -538,12 +539,12 @@ void deinit_tpm_crb(struct vmctx *ctx)
void *status;
mr.name = "tpm_crb_reg";
mr.base = TPM_CRB_MMIO_ADDR;
mr.base = get_vtpm_crb_mmio_addr();
mr.size = TPM_CRB_REG_SIZE;
unregister_mem(&mr);
mr.name = "tpm_crb_buffer";
mr.base = CRB_DATA_BUFFER;
mr.base = get_vtpm_crb_mmio_addr() + CRB_DATA_BUFFER;
mr.size = TPM_CRB_DATA_BUFFER_SIZE;
unregister_mem(&mr);