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

hv: ptdev: simplify ptdev_intx_pin_remap logic

Browse Source 
Since this interrupt pin is passed through to the guest, we could set
it as we like. There's no need a flag to emulate the masked status.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-08-15 13:45:27 +08:00 committed by lijinxia
parent a6c2065b2e
commit f4eef9710d
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,6 +663,7 @@ static void activate_physical_ioapic(struct vm *vm,
{ {
union ioapic_rte rte; union ioapic_rte rte;
uint32_t phys_irq = entry->allocated_pirq; uint32_t phys_irq = entry->allocated_pirq;
uint32_t intr_mask;
bool is_lvl_trigger = false; bool is_lvl_trigger = false;
/* disable interrupt */ /* disable interrupt */
@ -670,10 +671,7 @@ static void activate_physical_ioapic(struct vm *vm,
/* build physical IOAPIC RTE */ /* build physical IOAPIC RTE */
rte = ptdev_build_physical_rte(vm, entry); rte = ptdev_build_physical_rte(vm, entry);
intr_mask = (rte.full & IOAPIC_RTE_INTMASK);
/* set rte entry */
rte.full |= IOAPIC_RTE_INTMSET;
ioapic_set_rte(phys_irq, rte);
/* update irq trigger mode according to info in guest */ /* update irq trigger mode according to info in guest */
if ((rte.full & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL) { if ((rte.full & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL) {
@ -681,8 +679,13 @@ static void activate_physical_ioapic(struct vm *vm,
} }
set_irq_trigger_mode(phys_irq, is_lvl_trigger); set_irq_trigger_mode(phys_irq, is_lvl_trigger);
/* enable interrupt */ /* set rte entry when masked */
rte.full |= IOAPIC_RTE_INTMSET;
ioapic_set_rte(phys_irq, rte);
if (intr_mask == IOAPIC_RTE_INTMCLR) {
GSI_UNMASK_IRQ(phys_irq); GSI_UNMASK_IRQ(phys_irq);
}
} }
/* Main entry for PCI/Legacy device assignment with INTx, calling from vIOAPIC /* Main entry for PCI/Legacy device assignment with INTx, calling from vIOAPIC
@ -691,7 +694,6 @@ static void activate_physical_ioapic(struct vm *vm,
int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info) int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
{ {
struct ptdev_remapping_info *entry; struct ptdev_remapping_info *entry;
union ioapic_rte rte;
uint32_t phys_irq; uint32_t phys_irq;
uint8_t phys_pin; uint8_t phys_pin;
bool need_switch_vpin_src = false; bool need_switch_vpin_src = false;
@ -800,41 +802,7 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
intx->vpin_src = info->vpin_src; intx->vpin_src = info->vpin_src;
intx->virt_pin = info->virt_pin; intx->virt_pin = info->virt_pin;
} }
if (is_entry_active(entry)
&& (intx->vpin_src
== PTDEV_VPIN_IOAPIC)) {
vioapic_get_rte(vm, intx->virt_pin, &rte);
if (rte.u.lo_32 == 0x10000U) {
/* disable interrupt */
GSI_MASK_IRQ(phys_irq);
dev_dbg(ACRN_DBG_IRQ,
"IOAPIC pin=%hhu pirq=%u deassigned ",
phys_pin, phys_irq);
dev_dbg(ACRN_DBG_IRQ, "from vm%d vIOAPIC vpin=%d",
entry->vm->vm_id,
intx->virt_pin);
goto END;
} else {
/*update rte*/
activate_physical_ioapic(vm, entry); activate_physical_ioapic(vm, entry);
}
} else if (is_entry_active(entry)
&& (intx->vpin_src == PTDEV_VPIN_PIC)) {
/* only update here
* deactive vPIC entry when IOAPIC take it over
*/
activate_physical_ioapic(vm, entry);
} else {
activate_physical_ioapic(vm, entry);
dev_dbg(ACRN_DBG_IRQ,
"IOAPIC pin=%hhu pirq=%u assigned to vm%d %s vpin=%d",
phys_pin, phys_irq, entry->vm->vm_id,
intx->vpin_src == PTDEV_VPIN_PIC ?
"vPIC" : "vIOAPIC",
intx->virt_pin);
}
END: END:
return 0; return 0;
} }