x86, apic: Get rid of some IPI wrappers
RFC 1/1 x86, apic: Get rid of some IPI wrappers
They just hide the sameness of methods.
Signed-off-by Cyrill Gorcunov <[email protected]>
---
I may be missing something but frankly I don't see the reason for hiding sameness here, the reverse -- if you're going to change something then instead of looking into direct method implementation you are to tear through wrapping calls. Of course if implementation is differ from 'default_' one (as in x2apic, uv) it deserves own method.
No?
arch/x86/kernel/apic/apic_flat_64.c | 17 +++-------------- arch/x86/kernel/apic/bigsmp_32.c | 9 ++------- arch/x86/kernel/apic/es7000_32.c | 11 +++-------- arch/x86/kernel/apic/numaq_32.c | 9 ++------- arch/x86/kernel/apic/summit_32.c | 9 ++------- 5 files changed, 12 insertions(+), 43 deletions(-)
arch/x86/kernel/apic/apic_flat_64.c +3 -14
@@ -261,17 +261,6 @@ static void physflat_vector_allocation_dcpumask_set_cpu (cpu, retmask); } -static void physflat_send_IPI_mask (const struct cpumask *cpumask,int vector) -{ -default_send_IPI_mask_sequence_phys (cpumask, vector); -} - -static void physflat_send_IPI_mask_allbutself (const struct cpumask *cpumask, -int vector) -{ -default_send_IPI_mask_allbutself_phys (cpumask, vector); -} -static void physflat_send_IPI_allbutself (int vector) {default_send_IPI_mask_allbutself_phys (cpu_online_mask, vector);
@@ -279,7 +268,7 @@ static void physflat_send_IPI_allbutselfstatic void physflat_send_IPI_all (int vector) { -physflat_send_IPI_mask (cpu_online_mask, vector); +default_send_IPI_mask_sequence_phys (cpu_online_mask, vector); }static unsigned int physflat_cpu_mask_to_apicid (const struct cpumask *cpumask)
@@ -354,8 +343,8 @@ struct apic apic_physflat = { .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, - .send_IPI_mask = physflat_send_IPI_mask, - .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, + .send_IPI_mask = default_send_IPI_mask_sequence_phys, + .send_IPI_mask_allbutself = default_send_IPI_mask_allbutself_phys, .send_IPI_allbutself = physflat_send_IPI_allbutself, .send_IPI_all = physflat_send_IPI_all, .send_IPI_self = apic_send_IPI_self,
arch/x86/kernel/apic/bigsmp_32.c +2 -7
@@ -139,11 +139,6 @@ static int bigsmp_phys_pkg_id(int cpuid_return cpuid_apic >> index_msb; } -static inline void bigsmp_send_IPI_mask (const struct cpumask *mask,int vector) -{ -default_send_IPI_mask_sequence_phys (mask, vector); -} -static void bigsmp_send_IPI_allbutself (int vector) {default_send_IPI_mask_allbutself_phys (cpu_online_mask, vector);
@@ -151,7 +146,7 @@ static void bigsmp_send_IPI_allbutself(istatic void bigsmp_send_IPI_all (int vector) { -bigsmp_send_IPI_mask (cpu_online_mask, vector); +default_send_IPI_mask_sequence_phys (cpu_online_mask, vector); }static int dmi_bigsmp;/* can be set by dmi scanners */
@@ -236,7 +231,7 @@ struct apic apic_bigsmp = { .cpu_mask_to_apicid = bigsmp_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = bigsmp_cpu_mask_to_apicid_and, - .send_IPI_mask = bigsmp_send_IPI_mask, + .send_IPI_mask = default_send_IPI_mask_sequence_phys, .send_IPI_mask_allbutself = NULL, .send_IPI_allbutself = bigsmp_send_IPI_allbutself, .send_IPI_all = bigsmp_send_IPI_all,
arch/x86/kernel/apic/es7000_32.c +3 -8
@@ -420,11 +420,6 @@ static unsigned int es7000_get_apic_id(ureturn (x >>24 ) &0xFF ; } -static void es7000_send_IPI_mask (const struct cpumask *mask,int vector) -{ -default_send_IPI_mask_sequence_phys (mask, vector); -} -static void es7000_send_IPI_allbutself (int vector) {default_send_IPI_mask_allbutself_phys (cpu_online_mask, vector);
@@ -432,7 +427,7 @@ static void es7000_send_IPI_allbutself(istatic void es7000_send_IPI_all (int vector) { -es7000_send_IPI_mask (cpu_online_mask, vector); +default_send_IPI_mask_sequence_phys (cpu_online_mask, vector); }static int es7000_apic_id_registered (void )
@@ -672,7 +667,7 @@ struct apic __refdata apic_es7000_cluste .cpu_mask_to_apicid = es7000_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = es7000_cpu_mask_to_apicid_and, - .send_IPI_mask = es7000_send_IPI_mask, + .send_IPI_mask = default_send_IPI_mask_sequence_phys, .send_IPI_mask_allbutself = NULL, .send_IPI_allbutself = es7000_send_IPI_allbutself, .send_IPI_all = es7000_send_IPI_all,
@@ -737,7 +732,7 @@ struct apic __refdata apic_es7000 = { .cpu_mask_to_apicid = es7000_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = es7000_cpu_mask_to_apicid_and, - .send_IPI_mask = es7000_send_IPI_mask, + .send_IPI_mask = default_send_IPI_mask_sequence_phys, .send_IPI_mask_allbutself = NULL, .send_IPI_allbutself = es7000_send_IPI_allbutself, .send_IPI_all = es7000_send_IPI_all,
arch/x86/kernel/apic/numaq_32.c +2 -7
@@ -299,11 +299,6 @@ static inline unsigned int numaq_get_apireturn (x >>24 ) &0x0F ; } -static inline void numaq_send_IPI_mask (const struct cpumask *mask,int vector) -{ -default_send_IPI_mask_sequence_logical (mask, vector); -} -static inline void numaq_send_IPI_allbutself (int vector) {default_send_IPI_mask_allbutself_logical (cpu_online_mask, vector);
@@ -311,7 +306,7 @@ static inline void numaq_send_IPI_allbutstatic inline void numaq_send_IPI_all (int vector) { -numaq_send_IPI_mask (cpu_online_mask, vector); +default_send_IPI_mask_sequence_logical (cpu_online_mask, vector); }#define NUMAQ_TRAMPOLINE_PHYS_LOW (0x8)
@@ -525,7 +520,7 @@ struct apic __refdata apic_numaq = { .cpu_mask_to_apicid = numaq_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = numaq_cpu_mask_to_apicid_and, - .send_IPI_mask = numaq_send_IPI_mask, + .send_IPI_mask = default_send_IPI_mask_sequence_logical, .send_IPI_mask_allbutself = NULL, .send_IPI_allbutself = numaq_send_IPI_allbutself, .send_IPI_all = numaq_send_IPI_all,
arch/x86/kernel/apic/summit_32.c +2 -7
@@ -52,11 +52,6 @@ static unsigned summit_get_apic_id(unsigreturn (x >>24 ) &0xFF ; } -static inline void summit_send_IPI_mask (const struct cpumask *mask,int vector) -{ -default_send_IPI_mask_sequence_logical (mask, vector); -} -static void summit_send_IPI_allbutself (int vector) {default_send_IPI_mask_allbutself_logical (cpu_online_mask, vector);
@@ -64,7 +59,7 @@ static void summit_send_IPI_allbutself(istatic void summit_send_IPI_all (int vector) { -summit_send_IPI_mask (cpu_online_mask, vector); +default_send_IPI_mask_sequence_logical (cpu_online_mask, vector); }#include <asm/tsc.h>
@@ -545,7 +540,7 @@ struct apic apic_summit = { .cpu_mask_to_apicid = summit_cpu_mask_to_apicid, .cpu_mask_to_apicid_and = summit_cpu_mask_to_apicid_and, - .send_IPI_mask = summit_send_IPI_mask, + .send_IPI_mask = default_send_IPI_mask_sequence_logical, .send_IPI_mask_allbutself = NULL, .send_IPI_allbutself = summit_send_IPI_allbutself, .send_IPI_all = summit_send_IPI_all,