Skip to contentSkip to conversation

x86, apic: x2apic - Move common bits to a header file

PATCH New Cyrill Gorcunov 1 participant 1 message Nov 26, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, apic: x2apic - Move common bits to a header file

CC Suresh Siddha <[email protected]>
CC Yinghai Lu <[email protected]>
CC Thomas Gleixner <[email protected]>

---

Suresh, I didn't managed still to implement smart cluster mode,
but I guess even such code folding is a good thing, right? Please review.

 arch/x86/include/asm/x2apic.h         |   59 ++++++++++++++++++++++++++++
 arch/x86/kernel/apic/x2apic_cluster.c |   70 +---------------------------------
 arch/x86/kernel/apic/x2apic_phys.c    |   59 +---------------------------
 3 files changed, 66 insertions(+), 122 deletions(-)
arch/x86/include/asm/x2apic.h new file +59 -0
Index: linux-2.6.git/arch/x86/include/asm/x2apic.h
=====================================================================
@@ -0,0 +1,59 @@
+#ifndef _ASM_X86_X2APIC_H
+#define _ASM_X86_X2APIC_H
+
+#include <asm/apic.h>
+#include <asm/ipi.h>
+#include <linux/cpumask.h>
+
+/*
+ * need to use more than cpu 0, because we need more vectors
+ * when MSI-X are used
+ */
+static const struct cpumask *x2apic_target_cpus(void)
+{
+	return cpu_online_mask;
+}
+
+static int x2apic_apic_id_registered(void)
+{
+	return 1;
+}
+
+/*
+ * for now each logical cpu is in its own vector allocation domain.
+ */
+static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask)
+{
+	cpumask_clear(retmask);
+	cpumask_set_cpu(cpu, retmask);
+}
+
+static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest)
+{
+	unsigned long cfg = __prepare_ICR(0, vector, dest);
+
+	/* we're ready to send the IPI */
+	native_x2apic_icr_write(cfg, apicid);
+}
+
+static unsigned int x2apic_get_apic_id(unsigned long x)
+{
+	return x;
+}
+
+static unsigned long x2apic_set_apic_id(unsigned int id)
+{
+	return id;
+}
+
+static int x2apic_phys_pkg_id(int initial_apicid, int index_msb)
+{
+	return initial_apicid >> index_msb;
+}
+
+static void x2apic_send_IPI_self(int vector)
+{
+	apic_write(APIC_SELF_IPI, vector);
+}
+
+#endif /* _ASM_X86_X2APIC_H */
arch/x86/kernel/apic/x2apic_cluster.c +4 -66

108 lines not on this page · raw message

arch/x86/kernel/apic/x2apic_phys.c +3 -56

94 lines not on this page · raw message