From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 10 Mar 2020 14:27:56 +0000 (+0100)
Subject: x86: refine APIC ID restriction
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~561
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=261ef8ccbd28526d69c3a6c5944709f81624741a;p=xen.git

x86: refine APIC ID restriction

Now that we distinguish "restricted" and "full" interrupt remapping
mode, the 8-bit-APIC-ID restriction also needs to be enforced for
"restricted".

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 6c548b0b53..0e54bd14f3 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -1328,7 +1328,7 @@ int __cpu_up(unsigned int cpu)
         return -ENODEV;
 
     if ( (!x2apic_enabled && apicid >= APIC_ALL_CPUS) ||
-         (!iommu_intremap && (apicid >> 8)) )
+         (iommu_intremap != iommu_intremap_full && (apicid >> 8)) )
     {
         printk("Unsupported: APIC ID %#x in xAPIC mode w/o interrupt remapping\n",
                apicid);