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

hv: ptdev: simplify struct ptdev_msi_info

Browse Source 
The virt_vector/phys_vector are only used for debugging.
Rename msix to is_msix.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Li, Fei1 2018-08-21 15:47:39 +08:00 committed by wenlingz
parent 2371839cad
commit da57284ba5
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/assign.c
View File

@ -426,7 +426,7 @@ void ptdev_softirq(__unused uint16_t cpu_id)
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
"dev-assign: irq=0x%x MSI VR: 0x%x-0x%x", "dev-assign: irq=0x%x MSI VR: 0x%x-0x%x",
entry->allocated_pirq, entry->allocated_pirq,
msi->virt_vector, msi->vmsi_data & 0xFFU,
irq_to_vector(entry->allocated_pirq)); irq_to_vector(entry->allocated_pirq));
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
" vmsi_addr: 0x%x vmsi_data: 0x%x", " vmsi_addr: 0x%x vmsi_data: 0x%x",
@ -527,15 +527,13 @@ int ptdev_msix_remap(struct vm *vm, uint16_t virt_bdf,
/* build physical config MSI, update to info->pmsi_xxx */ /* build physical config MSI, update to info->pmsi_xxx */
ptdev_build_physical_msi(vm, info, irq_to_vector(entry->allocated_pirq)); ptdev_build_physical_msi(vm, info, irq_to_vector(entry->allocated_pirq));
entry->msi = *info; entry->msi = *info;
entry->msi.virt_vector = info->vmsi_data & 0xFFU;
entry->msi.phys_vector = irq_to_vector(entry->allocated_pirq);
dev_dbg(ACRN_DBG_IRQ, dev_dbg(ACRN_DBG_IRQ,
"PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d", "PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d",
(virt_bdf >> 8) & 0xFFU, (virt_bdf >> 3) & 0x1FU, (virt_bdf >> 8) & 0xFFU, (virt_bdf >> 3) & 0x1FU,
(virt_bdf) & 0x7U, entry_nr, (virt_bdf) & 0x7U, entry_nr,
entry->msi.virt_vector, info->vmsi_data & 0xFFU,
entry->msi.phys_vector, irq_to_vector(entry->allocated_pirq),
entry->vm->vm_id); entry->vm->vm_id);
END: END:
return 0; return 0;

2
hypervisor/common/hypercall.c
View File

@ -622,7 +622,7 @@ int32_t hcall_remap_pci_msix(struct vm *vm, uint16_t vmid, uint64_t param)
if (!is_vm0(vm)) { if (!is_vm0(vm)) {
ret = -1; ret = -1;
} else { } else {
info.msix = remap.msix; info.is_msix = remap.msix;
info.vmsi_ctl = remap.msi_ctl; info.vmsi_ctl = remap.msi_ctl;
info.vmsi_addr = remap.msi_addr; info.vmsi_addr = remap.msi_addr;
info.vmsi_data = remap.msi_data; info.vmsi_data = remap.msi_data;

4
hypervisor/include/common/ptdev.h
View File

@ -43,9 +43,7 @@ struct ptdev_msi_info {
uint16_t vmsi_ctl; /* virt msi_ctl */ uint16_t vmsi_ctl; /* virt msi_ctl */
uint32_t pmsi_addr; /* phys msi_addr */ uint32_t pmsi_addr; /* phys msi_addr */
uint32_t pmsi_data; /* phys msi_data */ uint32_t pmsi_data; /* phys msi_data */
int msix; /* 0-MSI, 1-MSIX */ int is_msix; /* 0-MSI, 1-MSIX */
uint32_t virt_vector;
uint32_t phys_vector;
}; };
/* entry per each allocated irq/vector /* entry per each allocated irq/vector