github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 19:17:34 +00:00
Code Issues Projects Releases Wiki Activity

DM: add mmio resource to acrn_mmiodev

Browse Source 
The mmiores[3] is added in acrn_mmiodev, this is the DM land part of
the change.

Tracked-On: #6320
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
This commit is contained in:
Tao Yuhong 2021-06-30 11:23:30 -04:00 committed by Xie, Nanlin
parent e3a55de27b
commit 5976c58792
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devicemodel/hw/mmio/core.c
View File

@ -74,12 +74,13 @@ int parse_pt_acpidev(char *opt)
if (strncmp(opt, "MSFT0101", 8) == 0) { if (strncmp(opt, "MSFT0101", 8) == 0) {
strncpy(mmio_devs[mmio_dev_idx].name, "MSFT0101", 8); strncpy(mmio_devs[mmio_dev_idx].name, "MSFT0101", 8);
/* TODO: We would parse the /proc/iomem to get the corresponding resources */ /* TODO: We would parse the /proc/iomem to get the corresponding resources */
mmio_devs[mmio_dev_idx].dev.base_hpa = 0xFED40000UL; strncpy(mmio_devs[mmio_dev_idx].dev.name, "tpm2", 4);
mmio_devs[mmio_dev_idx].dev.mmiores[0].base_hpa = 0xFED40000UL;
/* FIXME: The 0xFED40000 doesn't conflict with other mmio or system memory so far. /* FIXME: The 0xFED40000 doesn't conflict with other mmio or system memory so far.
* This need to be fixed by redesign the mmio_dev_alloc_gpa_resource32(). * This need to be fixed by redesign the mmio_dev_alloc_gpa_resource32().
*/ */
mmio_devs[mmio_dev_idx].dev.base_gpa = 0xFED40000UL; mmio_devs[mmio_dev_idx].dev.mmiores[0].base_gpa = 0xFED40000UL;
mmio_devs[mmio_dev_idx].dev.size = 0x00005000UL; mmio_devs[mmio_dev_idx].dev.mmiores[0].size = 0x00005000UL;
mmio_dev_idx++; mmio_dev_idx++;
pt_tpm2 = true; pt_tpm2 = true;
} }
@ -103,8 +104,8 @@ int parse_pt_mmiodev(char *opt)
(!dm_strtoul(cp + 1, &cp, 16, &size))) { (!dm_strtoul(cp + 1, &cp, 16, &size))) {
pr_dbg("%s pt mmiodev base: 0x%lx, size: 0x%lx\n", __func__, base_hpa, size); pr_dbg("%s pt mmiodev base: 0x%lx, size: 0x%lx\n", __func__, base_hpa, size);
strncpy(mmio_devs[mmio_dev_idx].name, pt_mmiodev.name, 8); strncpy(mmio_devs[mmio_dev_idx].name, pt_mmiodev.name, 8);
mmio_devs[mmio_dev_idx].dev.base_hpa = base_hpa; mmio_devs[mmio_dev_idx].dev.mmiores[0].base_hpa = base_hpa;
mmio_devs[mmio_dev_idx].dev.size = size; mmio_devs[mmio_dev_idx].dev.mmiores[0].size = size;
mmio_dev_idx++; mmio_dev_idx++;
} else { } else {
pr_err("%s, %s invalid, please check!\n", __func__, opt); pr_err("%s, %s invalid, please check!\n", __func__, opt);
@ -131,14 +132,14 @@ int init_mmio_dev(struct vmctx *ctx, struct mmio_dev_ops *ops, struct acrn_mmiod
int ret; int ret;
uint32_t base; uint32_t base;
if (mmiodev->base_gpa == 0UL) { if (mmiodev->mmiores[0].base_gpa == 0UL) {
/* FIXME: The mmio_dev_alloc_gpa_resource32 needs to add one new parameter to indicate /* FIXME: The mmio_dev_alloc_gpa_resource32 needs to add one new parameter to indicate
* if the caller needs one specific GPA instead of dynamic allocation. * if the caller needs one specific GPA instead of dynamic allocation.
*/ */
ret = mmio_dev_alloc_gpa_resource32(&base, mmiodev->size); ret = mmio_dev_alloc_gpa_resource32(&base, mmiodev->mmiores[0].size);
if (ret < 0) if (ret < 0)
return ret; return ret;
mmiodev->base_gpa = base; mmiodev->mmiores[0].base_gpa = base;
} }
return ops->init(ctx, mmiodev); return ops->init(ctx, mmiodev);
@ -158,7 +159,8 @@ int init_mmio_devs(struct vmctx *ctx)
ops = mmio_dev_finddev(mmio_devs[i].name); ops = mmio_dev_finddev(mmio_devs[i].name);
if (ops != NULL) { if (ops != NULL) {
err = init_mmio_dev(ctx, ops, &mmio_devs[i].dev); err = init_mmio_dev(ctx, ops, &mmio_devs[i].dev);
pr_notice("mmiodev[%d] hpa:0x%x gpa:0x%x size:0x%x err:%d\n", i, mmio_devs[i].dev.base_hpa, mmio_devs[i].dev.base_gpa, mmio_devs[i].dev.size, err); pr_notice("mmiodev[%d] hpa:0x%x gpa:0x%x size:0x%x err:%d\n", i, mmio_devs[i].dev.mmiores[0].base_hpa,
mmio_devs[i].dev.mmiores[0].base_gpa, mmio_devs[i].dev.mmiores[0].size, err);
} }
if (err != 0) if (err != 0)
@ -218,7 +220,7 @@ uint64_t get_mmio_dev_tpm2_base_gpa(void)
for (i = 0; i < mmio_dev_idx; i++) { for (i = 0; i < mmio_dev_idx; i++) {
if (!strcmp(mmio_devs[i].name, "MSFT0101")) { if (!strcmp(mmio_devs[i].name, "MSFT0101")) {
base_gpa = mmio_devs[i].dev.base_gpa; base_gpa = mmio_devs[i].dev.mmiores[0].base_gpa;
break; break;
} }
} }

7
devicemodel/include/public/vhm_ioctl_defs.h
View File

@ -190,6 +190,8 @@ struct acrn_assign_pcidev {
* @brief Info to assign or deassign a MMIO device for a VM * @brief Info to assign or deassign a MMIO device for a VM
*/ */
struct acrn_mmiodev { struct acrn_mmiodev {
char name[8];
struct acrn_mmiores {
/** the gpa of the MMIO region for the MMIO device */ /** the gpa of the MMIO region for the MMIO device */
uint64_t base_gpa; uint64_t base_gpa;
@ -199,8 +201,11 @@ struct acrn_mmiodev {
/** the size of the MMIO region for the MMIO device */ /** the size of the MMIO region for the MMIO device */
uint64_t size; uint64_t size;
uint64_t attr;
} mmiores[3];
/** reserved for extension */ /** reserved for extension */
uint64_t reserved[13]; uint64_t reserved[3];
} __attribute__((aligned(8))); } __attribute__((aligned(8)));