github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-11 13:49:39 +00:00
Code Issues Projects Releases Wiki Activity

HV: pci-vuart support create vdev hcall

Browse Source 
Add cteate method for vmcs9900 vdev in hypercalls.

The destroy method of ivshmem is also suitable for other emulated vdev,
move it into hcall_destroy_vdev() for all emulated vdevs

Tracked-On: #5394
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Reviewed-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Tao Yuhong
2020-10-23 17:43:45 -04:00
committed by wenlingz
parent a371815462
commit 996e8f680c
6 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hypervisor/dm/vpci/ivshmem.c
View File

@@ -394,27 +394,15 @@ int32_t create_ivshmem_vdev(struct acrn_vm *vm, struct acrn_emul_dev *dev)
return ret;
}
/**
* @pre vm != NULL
* @pre dev != NULL
*/
int32_t destroy_ivshmem_vdev(struct acrn_vm *vm, struct acrn_emul_dev *dev)
int32_t destroy_ivshmem_vdev(struct pci_vdev *vdev)
{
struct pci_vdev *vdev;
union pci_bdf bdf;
int32_t ret = 0;
uint32_t i;
bdf.value = (uint16_t) dev->slot;
vdev = pci_find_vdev(&vm->vpci, bdf);
if (vdev != NULL) {
vdev->pci_dev_config->vbdf.value = UNASSIGNED_VBDF;
(void)memset(vdev->pci_dev_config->vbar_base, 0U, sizeof(vdev->pci_dev_config->vbar_base));
} else {
pr_warn("%s, failed to destroy ivshmem device %x:%x.%x\n",
__func__, bdf.bits.b, bdf.bits.d, bdf.bits.f);
ret = -EINVAL;
for (i = 0U; i < vdev->nr_bars; i++) {
vpci_update_one_vbar(vdev, i, 0U, NULL, ivshmem_vbar_unmap);
}
return ret;
return 0;
}
const struct pci_vdev_ops vpci_ivshmem_ops = {

41
hypervisor/dm/vpci/vmcs9900.c
View File

@@ -10,6 +10,7 @@
#include <logmsg.h>
#include <vmcs9900.h>
#include "vpci_priv.h"
#include <errno.h>
#define MCS9900_MMIO_BAR 0U
#define MCS9900_MSIX_BAR 1U
@@ -167,3 +168,43 @@ const struct pci_vdev_ops vmcs9900_ops = {
.write_vdev_cfg = write_vmcs9900_cfg,
.read_vdev_cfg = read_vmcs9900_cfg,
};
int32_t create_vmcs9900_vdev(struct acrn_vm *vm, struct acrn_emul_dev *dev)
{
uint32_t i;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
struct acrn_vm_pci_dev_config *dev_config = NULL;
int32_t ret = -EINVAL;
uint16_t vuart_idx = *((uint16_t*)(dev->args));
for (i = 0U; i < vm_config->pci_dev_num; i++) {
dev_config = &vm_config->pci_devs[i];
if (dev_config->vuart_idx == vuart_idx) {
dev_config->vbdf.value = (uint16_t) dev->slot;
dev_config->vbar_base[0] = (uint64_t) dev->io_addr[0];
dev_config->vbar_base[1] = (uint64_t) dev->io_addr[1];
(void) vpci_init_vdev(&vm->vpci, dev_config, NULL);
ret = 0;
break;
}
}
if (ret != 0) {
pr_err("Unsupport: create VM%d vuart_idx=%d", vm->vm_id, vuart_idx);
}
return ret;
}
int32_t destroy_vmcs9900_vdev(struct pci_vdev *vdev)
{
uint32_t i;
for (i = 0U; i < vdev->nr_bars; i++) {
vpci_update_one_vbar(vdev, i, 0U, NULL, unmap_vmcs9900_vbar);
}
deinit_pci_vuart(vdev);
return 0;
}