OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: assign: rename ptirq_msix_remap to ptirq_prepare_msix_remap 

ptirq_msix_remap doesn't do the real remap, that's the vmsi_remap and vmsix_remap_entry
does. ptirq_msix_remap only did the preparation.

Tracked-On: #3475
Signed-off-by: Li Fei1 <fei1.li@intel.com>
This commit is contained in:
Li Fei1 2019-11-26 22:26:15 +08:00 committed by wenlingz
parent 51a43dab79
commit 6ee076f7df
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/developer-guides/hld/hv-dev-passthrough.rst
View File

@ -239,7 +239,7 @@ SOS:
.. doxygenfunction:: ptirq_intx_pin_remap
:project: Project ACRN
.. doxygenfunction:: ptirq_msix_remap
.. doxygenfunction:: ptirq_prepare_msix_remap
:project: Project ACRN
The following APIs are provided to manipulate the interrupt remapping

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

@ -601,7 +601,7 @@ void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_pin, uint32_t vpin_src)
* entry_nr = 0 means first vector
* user must provide bdf and entry_nr
*/
int32_t ptirq_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
uint16_t entry_nr, struct ptirq_msi_info *info)
{
struct ptirq_remapping_info *entry;
@ -626,7 +626,7 @@ int32_t ptirq_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bd
pr_err("dev-assign: msi entry exist in others");
}
} else {
/* ptirq_msix_remap is called by SOS on demand, if
/* ptirq_prepare_msix_remap is called by SOS on demand, if
* failed to find pre-hold mapping, return error to
* the caller.
*/

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

@ -75,7 +75,7 @@ static int32_t vmsi_remap(const struct pci_vdev *vdev, bool enable)
info.vmsi_data.full = 0U;
}
ret = ptirq_msix_remap(vm, vdev->bdf.value, pbdf.value, 0U, &info);
ret = ptirq_prepare_msix_remap(vm, vdev->bdf.value, pbdf.value, 0U, &info);
if (ret == 0) {
/* Update MSI Capability structure to physical device */
if ((msgctrl & PCIM_MSICTRL_64BIT) != 0U) {

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

@ -62,7 +62,7 @@ static int32_t vmsix_remap_entry(const struct pci_vdev *vdev, uint32_t index, bo
info.vmsi_addr.full = vdev->msix.table_entries[index].addr;
info.vmsi_data.full = (enable) ? vdev->msix.table_entries[index].data : 0U;
ret = ptirq_msix_remap(vdev->vpci->vm, vdev->bdf.value, vdev->pdev->bdf.value, (uint16_t)index, &info);
ret = ptirq_prepare_msix_remap(vdev->vpci->vm, vdev->bdf.value, vdev->pdev->bdf.value, (uint16_t)index, &info);
if (ret == 0) {
/* Write the table entry to the physical structure */
hva = hpa2hva(vdev->msix.mmio_hpa + vdev->msix.table_offset);

2
hypervisor/include/arch/x86/guest/assign.h
View File

@ -61,7 +61,7 @@ void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_pin, uint32_t vpin_src);
* @pre info != NULL
*
*/
int32_t ptirq_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
uint16_t entry_nr, struct ptirq_msi_info *info);