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

ptdev: assert/deassert interrupt according to polarity 

add active_polarity to decide what signal to call: GSI_SET_LOW, GSI_SET_HIGH,
GSI_FALLING_PULSE or GSI_RAISING_PULSE.

Tracked-On: #1269
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Jason Chen CJ 2018-09-28 15:20:02 +08:00 committed by Xie, Nanlin
parent e49233ba9b
commit 099203c15a
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,23 @@ ptdev_build_physical_rte(struct vm *vm,
vioapic_get_rte(vm, virt_sid->intx_id.pin, &virt_rte); vioapic_get_rte(vm, virt_sid->intx_id.pin, &virt_rte);
rte = virt_rte; rte = virt_rte;
/* init polarity & pin state */
if ((rte.full & IOAPIC_RTE_INTPOL) != 0UL) {
if (entry->polarity == 0U) {
vioapic_set_irq_nolock(vm,
(uint32_t)virt_sid->intx_id.pin,
GSI_SET_HIGH);
}
entry->polarity = 1U;
} else {
if (entry->polarity == 1U) {
vioapic_set_irq_nolock(vm,
(uint32_t)virt_sid->intx_id.pin,
GSI_SET_LOW);
}
entry->polarity = 0U;
}
/* physical destination cpu mask */ /* physical destination cpu mask */
phys = ((virt_rte.full & IOAPIC_RTE_DESTMOD) == IOAPIC_RTE_DESTPHY); phys = ((virt_rte.full & IOAPIC_RTE_DESTMOD) == IOAPIC_RTE_DESTPHY);
dest = (uint32_t)(virt_rte.full >> IOAPIC_RTE_DEST_SHIFT); dest = (uint32_t)(virt_rte.full >> IOAPIC_RTE_DEST_SHIFT);
@ -359,11 +376,21 @@ static void ptdev_intr_handle_irq(struct vm *vm,
} }
if (trigger_lvl) { if (trigger_lvl) {
vioapic_set_irq(vm, virt_sid->intx_id.pin, if (entry->polarity) {
GSI_SET_HIGH); vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_SET_LOW);
} else {
vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_SET_HIGH);
}
} else { } else {
vioapic_set_irq(vm, virt_sid->intx_id.pin, if (entry->polarity) {
GSI_RAISING_PULSE); vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_FALLING_PULSE);
} else {
vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_RAISING_PULSE);
}
} }
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
@ -460,7 +487,11 @@ void ptdev_intx_ack(struct vm *vm, uint8_t virt_pin,
*/ */
switch (vpin_src) { switch (vpin_src) {
case PTDEV_VPIN_IOAPIC: case PTDEV_VPIN_IOAPIC:
vioapic_set_irq(vm, virt_pin, GSI_SET_LOW); if (entry->polarity) {
vioapic_set_irq(vm, virt_pin, GSI_SET_HIGH);
} else {
vioapic_set_irq(vm, virt_pin, GSI_SET_LOW);
}
break; break;
case PTDEV_VPIN_PIC: case PTDEV_VPIN_PIC:
vpic_set_irq(vm, virt_pin, GSI_SET_LOW); vpic_set_irq(vm, virt_pin, GSI_SET_LOW);

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

@ -58,6 +58,7 @@ struct ptdev_remapping_info {
struct vm *vm; struct vm *vm;
uint32_t active; /* 1=active, 0=inactive and to free*/ uint32_t active; /* 1=active, 0=inactive and to free*/
uint32_t allocated_pirq; uint32_t allocated_pirq;
uint32_t polarity; /* 0=active high, 1=active low*/
struct list_head softirq_node; struct list_head softirq_node;
struct list_head entry_node; struct list_head entry_node;
struct ptdev_msi_info msi; struct ptdev_msi_info msi;