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 6c548b0b53d201df8b06341a1654061255a5c8b0..0e54bd14f3c5b516f570c420f33126404d734448 100644 (file)
--- 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);