github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-03 17:31:42 +00:00
Code Issues Projects Releases Wiki Activity

hv: vpci: add callback functions to struct vpci

Browse Source 
Add 'struct vpci_ops *ops' to 'struct vpci' so we have clearer structure:

- struct vpci: include struct vpci_ops pointing to different callback
  functions for partition or sharing mode repsectively.
- struct pci_vdev: includes struct pci_vdev_ops to handle different vpci
  functionalities:
      hostbridge emulation
      passthrough device BAR emulation
      msi/msi-x remapping

This patch moves the code around but doesn't change the underlying logic
in terms of PCI spec handling. More detailed implementation:

- create new file partition_mode.c to house the implementation of partition mode
  regarding the vpci layer.
- vpci.c: only keeps the abstract code which calls vpci->ops to functions
  in partition_mode.c, and potentially to sharing_mode.c.
- the following functions are moved to partition_mode.c and renamed with
  partition_mode prefix.
    - vpci_init() -> partition_mode_vpci_init()
    - vpci_cleanup() -> partition_mode_vpci_deinit()
    - pci_cfg_io_write() -> partition_mode_cfgread()
    - pci_cfg_io_read() -> partition_mode_cfgwrite()

Track-On: #1568
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
Reviewed-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Zide Chen 2018-10-08 17:08:04 -07:00 committed by lijinxia
parent 3e54c70d0f
commit 6af47f249c
4 changed files with 96 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
hypervisor/dm/vpci/pci_vdev.c → hypervisor/dm/vpci/partition_mode.c
View File

@ -32,8 +32,7 @@
#include <hypervisor.h> #include <hypervisor.h>
#include "pci_priv.h" #include "pci_priv.h"
static struct pci_vdev *partition_mode_find_vdev(struct vpci *vpci, union pci_bdf vbdf)
static struct pci_vdev *pci_vdev_find(struct vpci *vpci, union pci_bdf vbdf)
{ {
struct vpci_vdev_array *vdev_array; struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev; struct pci_vdev *vdev;
@ -50,31 +49,71 @@ static struct pci_vdev *pci_vdev_find(struct vpci *vpci, union pci_bdf vbdf)
return NULL; return NULL;
} }
/* PCI cfg vm-exit handler */ static int partition_mode_vpci_init(struct vm *vm)
void pci_vdev_cfg_handler(struct vpci *vpci, uint32_t in, union pci_bdf vbdf,
uint32_t offset, uint32_t bytes, uint32_t *val)
{ {
struct vpci_vdev_array *vdev_array;
struct vpci *vpci = &vm->vpci;
struct pci_vdev *vdev; struct pci_vdev *vdev;
int ret; int i;
vdev = pci_vdev_find(vpci, vbdf); vdev_array = vm->vm_desc->vpci_vdev_array;
if (vdev == NULL) {
return;
}
ret = -EINVAL; for (i = 0; i < vdev_array->num_pci_vdev; i++) {
if (in == 1U) { vdev = &vdev_array->vpci_vdev_list[i];
if ((vdev->ops != NULL) && (vdev->ops->cfgread != NULL)) { vdev->vpci = vpci;
ret = vdev->ops->cfgread(vdev, offset, bytes, val);
} if ((vdev->ops != NULL) && (vdev->ops->init != NULL)) {
} else { if (vdev->ops->init(vdev) != 0U) {
if ((vdev->ops != NULL) && (vdev->ops->cfgwrite != NULL)) { pr_err("%s() failed at PCI device (bdf %x)!", __func__,
ret = vdev->ops->cfgwrite(vdev, offset, bytes, *val); vdev->vbdf);
}
} }
} }
if (ret != 0) { return 0;
pr_dbg("pci_vdev_cfg_handler failed, ret=%d", ret); }
static void partition_mode_vpci_deinit(struct vm *vm)
{
struct vpci_vdev_array *vdev_array;
struct pci_vdev *vdev;
int i;
vdev_array = vm->vm_desc->vpci_vdev_array;
for (i = 0; i < vdev_array->num_pci_vdev; i++) {
vdev = &vdev_array->vpci_vdev_list[i];
if ((vdev->ops != NULL) && (vdev->ops->deinit != NULL)) {
if (vdev->ops->deinit(vdev) != 0U) {
pr_err("vdev->ops->deinit failed!");
}
}
} }
} }
static void partition_mode_cfgread(struct vpci *vpci, union pci_bdf vbdf,
uint32_t offset, uint32_t bytes, uint32_t *val)
{
struct pci_vdev *vdev = partition_mode_find_vdev(vpci, vbdf);
if ((vdev != NULL) && (vdev->ops != NULL)
&& (vdev->ops->cfgread != NULL)) {
(void)vdev->ops->cfgread(vdev, offset, bytes, val);
}
}
static void partition_mode_cfgwrite(struct vpci *vpci, union pci_bdf vbdf,
uint32_t offset, uint32_t bytes, uint32_t val)
{
struct pci_vdev *vdev = partition_mode_find_vdev(vpci, vbdf);
if ((vdev != NULL) && (vdev->ops != NULL)
&& (vdev->ops->cfgwrite != NULL)) {
(void)vdev->ops->cfgwrite(vdev, offset, bytes, val);
}
}
struct vpci_ops partition_mode_vpci_ops = {
.init = partition_mode_vpci_init,
.deinit = partition_mode_vpci_deinit,
.cfgread = partition_mode_cfgread,
.cfgwrite = partition_mode_cfgwrite,
};

5
hypervisor/dm/vpci/pci_priv.h
View File

@ -68,10 +68,9 @@ pci_vdev_write_cfg_u32(struct pci_vdev *vdev, uint32_t offset, uint32_t val)
*(uint32_t *)(vdev->cfgdata + offset) = val; *(uint32_t *)(vdev->cfgdata + offset) = val;
} }
extern struct vpci_ops partition_mode_vpci_ops;
uint32_t pci_vdev_read_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes); uint32_t pci_vdev_read_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes);
void pci_vdev_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val); void pci_vdev_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val);
void pci_vdev_cfg_handler(struct vpci *vpci, uint32_t in, union pci_bdf vbdf, uint32_t offset,
uint32_t bytes, uint32_t *val);
#endif /* PCI_PRIV_H_ */ #endif /* PCI_PRIV_H_ */

68
hypervisor/dm/vpci/vpci.c
View File

@ -68,12 +68,14 @@ static uint32_t pci_cfg_io_read(struct vm *vm, uint16_t addr, size_t bytes)
if (pi->cached_enable) { if (pi->cached_enable) {
uint16_t offset = addr - PCI_CONFIG_DATA; uint16_t offset = addr - PCI_CONFIG_DATA;
pci_vdev_cfg_handler(vpci, 1U, pi->cached_bdf, if ((vpci->ops != NULL) && (vpci->ops->cfgread != NULL)) {
pi->cached_reg + offset, bytes, &val); vpci->ops->cfgread(vpci, pi->cached_bdf,
pi->cached_reg + offset, bytes, &val);
}
pci_cfg_clear_cache(pi); pci_cfg_clear_cache(pi);
} }
} else { } else {
val = 0xFFFFFFFFU; val = 0xFFFFFFFFU;
} }
@ -89,9 +91,9 @@ static void pci_cfg_io_write(struct vm *vm, uint16_t addr, size_t bytes,
if (is_cfg_addr(addr)) { if (is_cfg_addr(addr)) {
/* TODO: handling the non 4 bytes access */ /* TODO: handling the non 4 bytes access */
if (bytes == 4U) { if (bytes == 4U) {
pi->cached_bdf.bits.b = (val >> 16U) & PCI_BUSMAX; pi->cached_bdf.bits.b = (uint8_t)(val >> 16U) & PCI_BUSMAX;
pi->cached_bdf.bits.d = (val >> 11U) & PCI_SLOTMAX; pi->cached_bdf.bits.d = (uint8_t)(val >> 11U) & PCI_SLOTMAX;
pi->cached_bdf.bits.f = (val >> 8U) & PCI_FUNCMAX; pi->cached_bdf.bits.f = (uint8_t)(val >> 8U) & PCI_FUNCMAX;
pi->cached_reg = val & PCI_REGMAX; pi->cached_reg = val & PCI_REGMAX;
pi->cached_enable = pi->cached_enable =
@ -101,62 +103,40 @@ static void pci_cfg_io_write(struct vm *vm, uint16_t addr, size_t bytes,
if (pi->cached_enable) { if (pi->cached_enable) {
uint16_t offset = addr - PCI_CONFIG_DATA; uint16_t offset = addr - PCI_CONFIG_DATA;
pci_vdev_cfg_handler(vpci, 0U, pi->cached_bdf, if ((vpci->ops != NULL) && (vpci->ops->cfgwrite != NULL)) {
pi->cached_reg + offset, bytes, &val); vpci->ops->cfgwrite(vpci, pi->cached_bdf,
pi->cached_reg + offset, bytes, val);
}
pci_cfg_clear_cache(pi); pci_cfg_clear_cache(pi);
} }
} else { } else {
pr_err("Not PCI cfg data/addr port access!"); pr_err("Not PCI cfg data/addr port access!");
} }
} }
void vpci_init(struct vm *vm) void vpci_init(struct vm *vm)
{ {
struct vpci *vpci = &vm->vpci; struct vpci *vpci = &vm->vpci;
struct vpci_vdev_array *vdev_array; struct vm_io_range pci_cfg_range = {
struct pci_vdev *vdev; .flags = IO_ATTR_RW,
int i; .base = PCI_CONFIG_ADDR,
int ret; .len = 8U
struct vm_io_range pci_cfg_range = {.flags = IO_ATTR_RW, };
.base = PCI_CONFIG_ADDR, .len = 8U};
vpci->vm = vm; vpci->vm = vm;
vdev_array = vm->vm_desc->vpci_vdev_array; vpci->ops = &partition_mode_vpci_ops;
for (i = 0; i < vdev_array->num_pci_vdev; i++) { if ((vpci->ops->init != NULL) && (vpci->ops->init(vm) == 0)) {
vdev = &vdev_array->vpci_vdev_list[i]; register_io_emulation_handler(vm, &pci_cfg_range,
vdev->vpci = vpci; &pci_cfg_io_read, &pci_cfg_io_write);
if ((vdev->ops != NULL) && (vdev->ops->init != NULL)) {
ret = vdev->ops->init(vdev);
if (ret != 0) {
pr_err("vdev->ops->init failed!");
}
}
} }
register_io_emulation_handler(vm, &pci_cfg_range,
&pci_cfg_io_read, &pci_cfg_io_write);
} }
void vpci_cleanup(struct vm *vm) void vpci_cleanup(struct vm *vm)
{ {
struct vpci_vdev_array *vdev_array; struct vpci *vpci = &vm->vpci;
struct pci_vdev *vdev;
int i;
int ret;
vdev_array = vm->vm_desc->vpci_vdev_array; if ((vpci->ops != NULL) && (vpci->ops->deinit != NULL)) {
vpci->ops->deinit(vm);
for (i = 0; i < vdev_array->num_pci_vdev; i++) {
vdev = &vdev_array->vpci_vdev_list[i];
if ((vdev->ops != NULL) && (vdev->ops->deinit != NULL)) {
ret = vdev->ops->deinit(vdev);
if (ret != 0) {
pr_err("vdev->ops->deinit failed!");
}
}
} }
} }

11
hypervisor/include/dm/vpci.h
View File

@ -78,9 +78,20 @@ struct pci_addr_info {
uint32_t cached_reg, cached_enable; uint32_t cached_reg, cached_enable;
}; };
struct vpci_ops {
int (*init)(struct vm *vm);
void (*deinit)(struct vm *vm);
void (*cfgread)(struct vpci *vpci, union pci_bdf vbdf, uint32_t offset,
uint32_t bytes, uint32_t *val);
void (*cfgwrite)(struct vpci *vpci, union pci_bdf vbdf, uint32_t offset,
uint32_t bytes, uint32_t val);
};
struct vpci { struct vpci {
struct vm *vm; struct vm *vm;
struct pci_addr_info addr_info; struct pci_addr_info addr_info;
struct vpci_ops *ops;
}; };
extern struct pci_vdev_ops pci_ops_vdev_hostbridge; extern struct pci_vdev_ops pci_ops_vdev_hostbridge;