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

HV: remove IRQSTATE_ASSERT/IRQSTATE_DEASSERT/IRQSTATE_PULSE

Browse Source 
- replace vpic/vioapic_xassert_irq() APIs
      with vpic/vioapic_set_irq()

   - unify the description of IRQ/PIN state in vpic. & vioapic.c

Tracked-On: #861
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yonghua Huang
2018-09-28 00:22:18 +08:00
committed by Wang, Minxia
parent 9df8790ffc
commit 9a05fbea78
7 changed files with 51 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,9 +359,11 @@ static void ptdev_intr_handle_irq(struct vm *vm,
}
if (trigger_lvl) {
vioapic_assert_irq(vm, virt_sid->intx_id.pin);
vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_SET_HIGH);
} else {
vioapic_pulse_irq(vm, virt_sid->intx_id.pin);
vioapic_set_irq(vm, virt_sid->intx_id.pin,
GSI_RAISING_PULSE);
}
dev_dbg(ACRN_DBG_PTIRQ,
@@ -378,9 +380,10 @@ static void ptdev_intr_handle_irq(struct vm *vm,
/* VPIN_PIC src means we have vpic enabled */
vpic_get_irq_trigger(vm, virt_sid->intx_id.pin, &trigger);
if (trigger == LEVEL_TRIGGER) {
vpic_assert_irq(vm, virt_sid->intx_id.pin);
vpic_set_irq(vm, virt_sid->intx_id.pin, GSI_SET_HIGH);
} else {
vpic_pulse_irq(vm, virt_sid->intx_id.pin);
vpic_set_irq(vm, virt_sid->intx_id.pin,
GSI_RAISING_PULSE);
}
break;
}
@@ -457,10 +460,10 @@ void ptdev_intx_ack(struct vm *vm, uint8_t virt_pin,
*/
switch (vpin_src) {
case PTDEV_VPIN_IOAPIC:
vioapic_deassert_irq(vm, virt_pin);
vioapic_set_irq(vm, virt_pin, GSI_SET_LOW);
break;
case PTDEV_VPIN_PIC:
vpic_deassert_irq(vm, virt_pin);
vpic_set_irq(vm, virt_pin, GSI_SET_LOW);
default:
/*
* In this switch statement, vpin_src shall either be