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

HV: repace vpci_vdev_array with pci_ptdev config

Browse Source 
Use acrn_vm_pci_ptdev_config struct for PCI PT devices configuration
in acrn_vm_config, the only needed configure item is PT devices's
vBDF and pBDF info. When init PT devices, the BDF info will be stored
in pci_vdevs[] of acrn_vm.

With this patch, the previous vpci_vdev_array struct is not needed.

Tracked-On: #2291

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun
2019-02-02 16:52:05 +08:00
committed by Eddie Dong
parent af1e5d5742
commit 827d24ccb9
7 changed files with 77 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hypervisor/dm/vpci/partition_mode.c
View File

@@ -34,20 +34,20 @@
static struct pci_vdev *partition_mode_find_vdev(struct acrn_vpci *vpci, union pci_bdf vbdf)
{
struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev;
struct pci_vdev *vdev = NULL;
struct acrn_vm_config *vm_config = get_vm_config(vpci->vm->vm_id);
int32_t i;
vdev_array = vm_config->vpci_vdev_array;
for (i = 0; i < vdev_array->num_pci_vdev; i++) {
vdev = &vdev_array->vpci_vdev_list[i];
for (i = 0; i < vm_config->pci_ptdev_num; i++) {
vdev = &vpci->vm->pci_vdevs[i];
if (vdev->vbdf.value == vbdf.value) {
return vdev;
break;
}
vdev = NULL;
}
return NULL;
return vdev;
}
static inline bool is_valid_bar_type(const struct pci_bar *bar)
@@ -95,17 +95,18 @@ static void partition_mode_pdev_init(struct pci_vdev *vdev)
static int32_t partition_mode_vpci_init(const struct acrn_vm *vm)
{
struct vpci_vdev_array *vdev_array;
const struct acrn_vpci *vpci = &vm->vpci;
struct pci_vdev *vdev;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
struct acrn_vm_pci_ptdev_config *ptdev_config;
int32_t i;
vdev_array = vm_config->vpci_vdev_array;
for (i = 0; i < vdev_array->num_pci_vdev; i++) {
vdev = &vdev_array->vpci_vdev_list[i];
for (i = 0; i < vm_config->pci_ptdev_num; i++) {
vdev = (struct pci_vdev *)&vm->pci_vdevs[i];
ptdev_config = vm_config->pci_ptdevs + i;
vdev->vpci = vpci;
vdev->vbdf.value = ptdev_config->vbdf.value;
vdev->pbdf.value = ptdev_config->pbdf.value;
if (vdev->vbdf.value != 0U) {
partition_mode_pdev_init(vdev);
@@ -127,15 +128,12 @@ static int32_t partition_mode_vpci_init(const struct acrn_vm *vm)
static void partition_mode_vpci_deinit(const struct acrn_vm *vm)
{
struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
int32_t i;
vdev_array = vm_config->vpci_vdev_array;
for (i = 0; i < vdev_array->num_pci_vdev; i++) {
vdev = &vdev_array->vpci_vdev_list[i];
for (i = 0; i < vm_config->pci_ptdev_num; i++) {
vdev = (struct pci_vdev *)&vm->pci_vdevs[i];
if ((vdev->ops != NULL) && (vdev->ops->deinit != NULL)) {
if (vdev->ops->deinit(vdev) != 0) {
pr_err("vdev->ops->deinit failed!");