commit 2b1cbcbddca30352031da1b11949b1c85535ecff
author Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> Wed Jan 06 10:23:51 2021 +0100
committer Anas Nashif <anas.nashif@intel.com> Fri Jan 07 10:47:27 2022 -0500
tree 2545b55eeab75371112aba89eab5fd1aa304a20e
parent e2b4f7e50fca3b0066b4bb52b596688d18be5180

drivers/interrupt_controller: Fix VT-D remap destination on XAPIC

CPU-ID is written in a different format in case of XAPIC.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>

drivers/interrupt_controller/intc_intel_vtd.c

diff --git a/drivers/interrupt_controller/intc_intel_vtd.c b/drivers/interrupt_controller/intc_intel_vtd.c
index b7d21aa..87dc0f7 100644
--- a/drivers/interrupt_controller/intc_intel_vtd.c
+++ b/drivers/interrupt_controller/intc_intel_vtd.c
@@ -84,7 +84,13 @@
 	memset(&data->irte[irte_idx], 0, sizeof(struct vtd_irte));
 
 	data->irte[irte_idx].l.vector = vector->arch.vector;
-	data->irte[irte_idx].l.dst_id = arch_curr_cpu()->id;
+
+	if (IS_ENABLED(CONFIG_X2APIC)) {
+		data->irte[irte_idx].l.dst_id = arch_curr_cpu()->id;
+	} else {
+		data->irte[irte_idx].l.dst_id = arch_curr_cpu()->id << 8;
+	}
+
 	data->irte[irte_idx].l.present = 1;
 
 	return 0;