Messages in this thread Patch in this message | | | Date | Mon, 22 Dec 2008 17:33:28 -0800 | From | Suresh Siddha <> | Subject | [patch] x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and() |
| |
From: Suresh Siddha <suresh.b.siddha@intel.com> Subject: x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and()
These commits:
commit 95d313cf1c1ecedc8bec5727b09bdacbf67dfc45 Author: Mike Travis <travis@sgi.com> Date: Tue Dec 16 17:33:54 2008 -0800
x86: Add cpu_mask_to_apicid_and
and commit 6eeb7c5a99434596c5953a95baa17d2f085664e3 Author: Mike Travis <travis@sgi.com> Date: Tue Dec 16 17:33:55 2008 -0800
x86: update add-cpu_mask_to_apicid_and to use struct cpumask*
broke interrupt delivery on x2apic platforms. As x2apic cluster mode uses logical delivery mode, we need to use logical apicid instead of physical apicid in x2apic_cpu_mask_to_apicid_and()
Impact: fixes the broken interrupt delivery issue on generic x2apic platforms.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> ---
Index: tip/arch/x86/kernel/genx2apic_cluster.c =================================================================== --- tip.orig/arch/x86/kernel/genx2apic_cluster.c 2008-12-22 17:15:38.000000000 -0800 +++ tip/arch/x86/kernel/genx2apic_cluster.c 2008-12-22 17:16:17.000000000 -0800 @@ -114,7 +114,7 @@ int cpu; /* - * We're using fixed IRQ delivery, can only return one phys APIC ID. + * We're using fixed IRQ delivery, can only return one logical APIC ID. * May as well be the first. */ cpu = cpumask_first(cpumask); @@ -130,14 +130,14 @@ int cpu; /* - * We're using fixed IRQ delivery, can only return one phys APIC ID. + * We're using fixed IRQ delivery, can only return one logical APIC ID. * May as well be the first. */ for_each_cpu_and(cpu, cpumask, andmask) if (cpumask_test_cpu(cpu, cpu_online_mask)) break; if (cpu < nr_cpu_ids) - return per_cpu(x86_cpu_to_apicid, cpu); + return per_cpu(x86_cpu_to_logical_apicid, cpu); return BAD_APICID; }
| |