github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-24 14:33:38 +00:00
Code Issues Projects Releases Wiki Activity

hv: ptdev_intr_info: add support to interrupt from non PCI device

Browse Source 
To indicate interrupt pass through from non PCI device, fill 0xFFFF in
hc_ptdev_irq.phys_bdf and hc_ptdev_irq.virt_bdf as hint.

Tracked-On: #8635
Signed-off-by: Yichong Tang <yichong.tang@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
yichongt 2024-06-28 10:55:53 +08:00 committed by wenlingz
parent b138dd1eaf
commit ff4948cf7d
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hypervisor/common/hypercall.c
View File

@ -996,19 +996,28 @@ int32_t hcall_set_ptdev_intr_info(struct acrn_vcpu *vcpu, struct acrn_vm *target
if (copy_from_gpa(vm, &irq, param2, sizeof(irq)) == 0) { if (copy_from_gpa(vm, &irq, param2, sizeof(irq)) == 0) {
if (irq.type == IRQ_INTX) { if (irq.type == IRQ_INTX) {
struct pci_vdev *vdev; struct pci_vdev *vdev = NULL;
union pci_bdf bdf = {.value = irq.virt_bdf}; union pci_bdf bdf = {.value = irq.virt_bdf};
struct acrn_vpci *vpci = &target_vm->vpci; struct acrn_vpci *vpci = &target_vm->vpci;
/*
* Consider ptdev as non PCI device if hc_ptdev_irq.virt_bdf is 0xFFFF
* No need to find vdev for non PCI device
*/
if (bdf.value != NON_PCI_DEVICE_BDF) {
spinlock_obtain(&vpci->lock); spinlock_obtain(&vpci->lock);
vdev = pci_find_vdev(vpci, bdf); vdev = pci_find_vdev(vpci, bdf);
spinlock_release(&vpci->lock); spinlock_release(&vpci->lock);
}
/* /*
* TODO: Change the hc_ptdev_irq structure member names * TODO: Change the hc_ptdev_irq structure member names
* virt_pin to virt_gsi * virt_pin to virt_gsi
* phys_pin to phys_gsi * phys_pin to phys_gsi
*
* Consider ptdev as non PCI device if hc_ptdev_irq.phys_bdf is 0xFFFF
*/ */
if ((vdev != NULL) && (vdev->pdev->bdf.value == irq.phys_bdf)) { if (((vdev != NULL) && (vdev->pdev->bdf.value == irq.phys_bdf))
|| ((vdev == NULL) && (irq.phys_bdf == NON_PCI_DEVICE_BDF))) {
if ((((!irq.intx.pic_pin) && (irq.intx.virt_pin < get_vm_gsicount(target_vm))) if ((((!irq.intx.pic_pin) && (irq.intx.virt_pin < get_vm_gsicount(target_vm)))
|| ((irq.intx.pic_pin) && (irq.intx.virt_pin < vpic_pincount()))) || ((irq.intx.pic_pin) && (irq.intx.virt_pin < vpic_pincount())))
&& is_gsi_valid(irq.intx.phys_pin)) { && is_gsi_valid(irq.intx.phys_pin)) {
@ -1049,19 +1058,28 @@ int32_t hcall_reset_ptdev_intr_info(struct acrn_vcpu *vcpu, struct acrn_vm *targ
if (copy_from_gpa(vm, &irq, param2, sizeof(irq)) == 0) { if (copy_from_gpa(vm, &irq, param2, sizeof(irq)) == 0) {
if (irq.type == IRQ_INTX) { if (irq.type == IRQ_INTX) {
struct pci_vdev *vdev; struct pci_vdev *vdev = NULL;
union pci_bdf bdf = {.value = irq.virt_bdf}; union pci_bdf bdf = {.value = irq.virt_bdf};
struct acrn_vpci *vpci = &target_vm->vpci; struct acrn_vpci *vpci = &target_vm->vpci;
/*
* Consider ptdev as non PCI device if hc_ptdev_irq.virt_bdf is 0xFFFF
* No need to find vdev for non PCI device
*/
if (bdf.value != NON_PCI_DEVICE_BDF) {
spinlock_obtain(&vpci->lock); spinlock_obtain(&vpci->lock);
vdev = pci_find_vdev(vpci, bdf); vdev = pci_find_vdev(vpci, bdf);
spinlock_release(&vpci->lock); spinlock_release(&vpci->lock);
}
/* /*
* TODO: Change the hc_ptdev_irq structure member names * TODO: Change the hc_ptdev_irq structure member names
* virt_pin to virt_gsi * virt_pin to virt_gsi
* phys_pin to phys_gsi * phys_pin to phys_gsi
*
* Consider ptdev as non PCI device if hc_ptdev_irq.phys_bdf is 0xFFFF
*/ */
if ((vdev != NULL) && (vdev->pdev->bdf.value == irq.phys_bdf)) { if (((vdev != NULL) && (vdev->pdev->bdf.value == irq.phys_bdf))
|| ((vdev == NULL) && (irq.phys_bdf == NON_PCI_DEVICE_BDF))) {
if (((!irq.intx.pic_pin) && (irq.intx.virt_pin < get_vm_gsicount(target_vm))) || if (((!irq.intx.pic_pin) && (irq.intx.virt_pin < get_vm_gsicount(target_vm))) ||
((irq.intx.pic_pin) && (irq.intx.virt_pin < vpic_pincount()))) { ((irq.intx.pic_pin) && (irq.intx.virt_pin < vpic_pincount()))) {
ptirq_remove_intx_remapping(target_vm, irq.intx.virt_pin, irq.intx.pic_pin, false); ptirq_remove_intx_remapping(target_vm, irq.intx.virt_pin, irq.intx.pic_pin, false);

1
hypervisor/include/public/acrn_hv_defs.h
View File

@ -260,6 +260,7 @@ struct hc_ptdev_irq {
/** virtual BDF of the ptdev */ /** virtual BDF of the ptdev */
uint16_t virt_bdf; uint16_t virt_bdf;
#define NON_PCI_DEVICE_BDF 0xFFFF
/** physical BDF of the ptdev */ /** physical BDF of the ptdev */
uint16_t phys_bdf; uint16_t phys_bdf;