github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

hv: mmiodev: a minor bug fix about refine acrn_mmiodev data structure

Browse Source 
Rename base_hpa to host_pa in acrn_mmiodev data structure.

Tracked-On: #6366
Signed-off-by: Fei Li <fei1.li@intel.com>
This commit is contained in:
Fei Li 2021-08-13 09:06:45 +08:00 committed by wenlingz
parent 2c5c8754de
commit 2e7491a8ec
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/arch/x86/guest/vm.c
View File

@ -302,8 +302,8 @@ static void prepare_prelaunched_vm_memmap(struct acrn_vm *vm, const struct acrn_
(void)assign_mmio_dev(vm, &vm_config->mmiodevs[i]); (void)assign_mmio_dev(vm, &vm_config->mmiodevs[i]);
#ifdef P2SB_VGPIO_DM_ENABLED #ifdef P2SB_VGPIO_DM_ENABLED
if ((vm_config->pt_p2sb_bar) && (vm_config->mmiodevs[i].base_hpa == P2SB_BAR_ADDR)) { if ((vm_config->pt_p2sb_bar) && (vm_config->mmiodevs[i].res[0].host_pa == P2SB_BAR_ADDR)) {
register_vgpio_handler(vm, &vm_config->mmiodevs[i]); register_vgpio_handler(vm, &vm_config->mmiodevs[i].res[0]);
} }
#endif #endif
} }

8
hypervisor/dm/vgpio.c
View File

@ -129,17 +129,17 @@ static int32_t vgpio_mmio_handler(struct io_request *io_req, void *data)
} }
/** /**
* @pre vm != NULL && mmiodev != NULL * @pre vm != NULL && res != NULL
*/ */
void register_vgpio_handler(struct acrn_vm *vm, const struct acrn_mmiodev *mmiodev) void register_vgpio_handler(struct acrn_vm *vm, const struct acrn_mmiores *res)
{ {
uint64_t gpa_start, gpa_end, gpio_pcr_sz; uint64_t gpa_start, gpa_end, gpio_pcr_sz;
uint64_t base_hpa; uint64_t base_hpa;
gpa_start = mmiodev->user_vm_pa + (P2SB_BASE_GPIO_PORT_ID << P2SB_PORTID_SHIFT); gpa_start = res->user_vm_pa + (P2SB_BASE_GPIO_PORT_ID << P2SB_PORTID_SHIFT);
gpio_pcr_sz = P2SB_PCR_SPACE_SIZE_PER_AGENT * P2SB_MAX_GPIO_COMMUNITIES; gpio_pcr_sz = P2SB_PCR_SPACE_SIZE_PER_AGENT * P2SB_MAX_GPIO_COMMUNITIES;
gpa_end = gpa_start + gpio_pcr_sz; gpa_end = gpa_start + gpio_pcr_sz;
base_hpa = mmiodev->host_pa + (P2SB_BASE_GPIO_PORT_ID << P2SB_PORTID_SHIFT); base_hpa = res->host_pa + (P2SB_BASE_GPIO_PORT_ID << P2SB_PORTID_SHIFT);
/* emulate MMIO access to the GPIO private configuration space registers */ /* emulate MMIO access to the GPIO private configuration space registers */
set_paging_supervisor((uint64_t)hpa2hva(base_hpa), gpio_pcr_sz); set_paging_supervisor((uint64_t)hpa2hva(base_hpa), gpio_pcr_sz);

2
hypervisor/include/dm/vgpio.h
View File

@ -7,6 +7,6 @@
#ifndef VGPIO_H #ifndef VGPIO_H
#define VGPIO_H #define VGPIO_H
void register_vgpio_handler(struct acrn_vm *vm, const struct acrn_mmiodev *mmiodev); void register_vgpio_handler(struct acrn_vm *vm, const struct acrn_mmiores *res);
#endif /* MMIO_DEV_H */ #endif /* MMIO_DEV_H */