drivers/interrupt_controller: Use proper destination mode on VT-D
Let's always use logical Destination ID.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
diff --git a/drivers/interrupt_controller/intc_intel_vtd.c b/drivers/interrupt_controller/intc_intel_vtd.c
index 91a457e..7ba8391 100644
--- a/drivers/interrupt_controller/intc_intel_vtd.c
+++ b/drivers/interrupt_controller/intc_intel_vtd.c
@@ -22,6 +22,7 @@
#include <arch/x86/intel_vtd.h>
#include <drivers/interrupt_controller/intel_vtd.h>
#include <drivers/interrupt_controller/ioapic.h>
+#include <drivers/interrupt_controller/loapic.h>
#include <drivers/pcie/msi.h>
#include <kernel_arch_func.h>
@@ -339,15 +340,17 @@
irte.bits.vector = vector;
if (IS_ENABLED(CONFIG_X2APIC)) {
- irte.bits.dst_id = arch_curr_cpu()->id;
+ /* Getting the logical APIC ID */
+ irte.bits.dst_id = x86_read_loapic(LOAPIC_LDR);
} else {
- irte.bits.dst_id = arch_curr_cpu()->id << 8;
+ /* As for IOAPIC: let's mask all possible IDs */
+ irte.bits.dst_id = 0xFF << 8;
}
irte.bits.trigger_mode = (flags & IOAPIC_TRIGGER_MASK) >> 15;
irte.bits.delivery_mode = (flags & IOAPIC_DELIVERY_MODE_MASK) >> 8;
- irte.bits.dst_mode = 1;
irte.bits.redirection_hint = 1;
+ irte.bits.dst_mode = 1; /* Always logical */
irte.bits.present = 1;
data->irte[irte_idx].parts.low = irte.parts.low;