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

hv: refine read/write configuration APIs for vmsi/vmsix

Browse Source 
change vmsi_read_cfg to read_vmsi_cfg, same applies to writing
change vmsix_read_cfg to read_vmsix_cfg, same applies to writing

Tracked-On: #4433

Signed-off-by: Yuan Liu <yuan1.liu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yuan Liu 2020-03-04 20:17:13 +08:00 committed by wenlingz
parent 4b6dd19ad1
commit e9a99845f6
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/dm/vpci/vmsi.c
View File

@ -98,7 +98,7 @@ static void remap_vmsi(const struct pci_vdev *vdev)
/** /**
* @pre vdev != NULL * @pre vdev != NULL
*/ */
void vmsi_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val) void read_vmsi_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val)
{ {
/* For PIO access, we emulate Capability Structures only */ /* For PIO access, we emulate Capability Structures only */
*val = pci_vdev_read_vcfg(vdev, offset, bytes); *val = pci_vdev_read_vcfg(vdev, offset, bytes);
@ -109,7 +109,7 @@ void vmsi_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes,
* *
* @pre vdev != NULL * @pre vdev != NULL
*/ */
void vmsi_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val) void write_vmsi_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val)
{ {
uint32_t msgctrl; uint32_t msgctrl;

4
hypervisor/dm/vpci/vmsix.c
View File

@ -113,7 +113,7 @@ static void remap_one_vmsix_entry(const struct pci_vdev *vdev, uint32_t index)
/** /**
* @pre vdev != NULL * @pre vdev != NULL
*/ */
void vmsix_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val) void read_vmsix_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val)
{ {
/* For PIO access, we emulate Capability Structures only */ /* For PIO access, we emulate Capability Structures only */
*val = pci_vdev_read_vcfg(vdev, offset, bytes); *val = pci_vdev_read_vcfg(vdev, offset, bytes);
@ -125,7 +125,7 @@ void vmsix_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes
* @pre vdev != NULL * @pre vdev != NULL
* @pre vdev->pdev != NULL * @pre vdev->pdev != NULL
*/ */
void vmsix_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val) void write_vmsix_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val)
{ {
uint32_t old_msgctrl, msgctrl; uint32_t old_msgctrl, msgctrl;

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

@ -476,9 +476,9 @@ static int32_t write_pt_dev_cfg(struct pci_vdev *vdev, uint32_t offset,
if (cfg_header_access(offset)) { if (cfg_header_access(offset)) {
write_cfg_header(vdev, offset, bytes, val); write_cfg_header(vdev, offset, bytes, val);
} else if (msicap_access(vdev, offset)) { } else if (msicap_access(vdev, offset)) {
vmsi_write_cfg(vdev, offset, bytes, val); write_vmsi_cfg(vdev, offset, bytes, val);
} else if (msixcap_access(vdev, offset)) { } else if (msixcap_access(vdev, offset)) {
vmsix_write_cfg(vdev, offset, bytes, val); write_vmsix_cfg(vdev, offset, bytes, val);
} else if (sriovcap_access(vdev, offset)) { } else if (sriovcap_access(vdev, offset)) {
write_sriov_cap_reg(vdev, offset, bytes, val); write_sriov_cap_reg(vdev, offset, bytes, val);
} else { } else {
@ -499,9 +499,9 @@ static int32_t read_pt_dev_cfg(const struct pci_vdev *vdev, uint32_t offset,
if (cfg_header_access(offset)) { if (cfg_header_access(offset)) {
read_cfg_header(vdev, offset, bytes, val); read_cfg_header(vdev, offset, bytes, val);
} else if (msicap_access(vdev, offset)) { } else if (msicap_access(vdev, offset)) {
vmsi_read_cfg(vdev, offset, bytes, val); read_vmsi_cfg(vdev, offset, bytes, val);
} else if (msixcap_access(vdev, offset)) { } else if (msixcap_access(vdev, offset)) {
vmsix_read_cfg(vdev, offset, bytes, val); read_vmsix_cfg(vdev, offset, bytes, val);
} else if (sriovcap_access(vdev, offset)) { } else if (sriovcap_access(vdev, offset)) {
read_sriov_cap_reg(vdev, offset, bytes, val); read_sriov_cap_reg(vdev, offset, bytes, val);
} else { } else {

8
hypervisor/dm/vpci/vpci_priv.h
View File

@ -106,14 +106,14 @@ void vdev_pt_write_vbar(struct pci_vdev *vdev, uint32_t idx, uint32_t val);
void vdev_pt_map_msix(struct pci_vdev *vdev, bool hold_lock); void vdev_pt_map_msix(struct pci_vdev *vdev, bool hold_lock);
void init_vmsi(struct pci_vdev *vdev); void init_vmsi(struct pci_vdev *vdev);
void vmsi_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val); void read_vmsi_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val);
void vmsi_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val); void write_vmsi_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val);
void deinit_vmsi(const struct pci_vdev *vdev); void deinit_vmsi(const struct pci_vdev *vdev);
void init_vmsix(struct pci_vdev *vdev); void init_vmsix(struct pci_vdev *vdev);
int32_t vmsix_handle_table_mmio_access(struct io_request *io_req, void *handler_private_data); int32_t vmsix_handle_table_mmio_access(struct io_request *io_req, void *handler_private_data);
void vmsix_read_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val); void read_vmsix_cfg(const struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t *val);
void vmsix_write_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val); void write_vmsix_cfg(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, uint32_t val);
void deinit_vmsix(const struct pci_vdev *vdev); void deinit_vmsix(const struct pci_vdev *vdev);
void init_vsriov(struct pci_vdev *vdev); void init_vsriov(struct pci_vdev *vdev);