lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, apic: unify phys_pkg_id()

Browse Source 
- unify the call signature of 64-bit to that of 32-bit

 - clean up the types all around

 - clean up namespace contamination

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-01-28 13:31:22 +01:00
parent b0b20e5a3a
commit d4c9a9f3d4
12 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/bigsmp/apic.h
View File

@@ -133,7 +133,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,
return BAD_APICID; return BAD_APICID;
} }
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) static inline int phys_pkg_id(int cpuid_apic, int index_msb)
{ {
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }

2
arch/x86/include/asm/es7000/apic.h
View File

@@ -221,7 +221,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,
return apicid; return apicid;
} }
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) static inline int phys_pkg_id(int cpuid_apic, int index_msb)
{ {
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }

6
arch/x86/include/asm/genapic.h
View File

@@ -48,11 +48,7 @@ struct genapic {
void (*setup_portio_remap)(void); void (*setup_portio_remap)(void);
int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
void (*enable_apic_mode)(void); void (*enable_apic_mode)(void);
#ifdef CONFIG_X86_32 int (*phys_pkg_id)(int cpuid_apic, int index_msb);
u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
#else
unsigned int (*phys_pkg_id)(int index_msb);
#endif
/* /*
* When one of the next two hooks returns 1 the genapic * When one of the next two hooks returns 1 the genapic

2
arch/x86/include/asm/mach-default/mach_apic.h
View File

@@ -65,7 +65,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,
return (unsigned int)(mask1 & mask2 & mask3); return (unsigned int)(mask1 & mask2 & mask3);
} }
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) static inline int phys_pkg_id(int cpuid_apic, int index_msb)
{ {
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }

2
arch/x86/include/asm/numaq/apic.h
View File

@@ -113,7 +113,7 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,
} }
/* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */ /* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) static inline int phys_pkg_id(int cpuid_apic, int index_msb)
{ {
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }

5
arch/x86/include/asm/summit/apic.h
View File

@@ -175,13 +175,14 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,
return apicid; return apicid;
} }
/* cpuid returns the value latched in the HW at reset, not the APIC ID /*
* cpuid returns the value latched in the HW at reset, not the APIC ID
* register's value. For any box whose BIOS changes APIC IDs, like * register's value. For any box whose BIOS changes APIC IDs, like
* clustered APIC systems, we must use hard_smp_processor_id. * clustered APIC systems, we must use hard_smp_processor_id.
* *
* See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID.
*/ */
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) static inline int phys_pkg_id(int cpuid_apic, int index_msb)
{ {
return hard_smp_processor_id() >> index_msb; return hard_smp_processor_id() >> index_msb;
} }

10
arch/x86/kernel/cpu/addon_cpuid_features.c
View File

@@ -116,7 +116,6 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width;
#ifdef CONFIG_X86_32
c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width) c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width)
& core_select_mask; & core_select_mask;
c->phys_proc_id = phys_pkg_id(c->initial_apicid, core_plus_mask_width); c->phys_proc_id = phys_pkg_id(c->initial_apicid, core_plus_mask_width);
@@ -124,14 +123,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
* Reinit the apicid, now that we have extended initial_apicid. * Reinit the apicid, now that we have extended initial_apicid.
*/ */
c->apicid = phys_pkg_id(c->initial_apicid, 0); c->apicid = phys_pkg_id(c->initial_apicid, 0);
#else
c->cpu_core_id = phys_pkg_id(ht_mask_width) & core_select_mask;
c->phys_proc_id = phys_pkg_id(core_plus_mask_width);
/*
* Reinit the apicid, now that we have extended initial_apicid.
*/
c->apicid = phys_pkg_id(0);
#endif
c->x86_max_cores = (core_level_siblings / smp_num_siblings); c->x86_max_cores = (core_level_siblings / smp_num_siblings);

11
arch/x86/kernel/cpu/common.c
View File

@@ -442,11 +442,7 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
} }
index_msb = get_count_order(smp_num_siblings); index_msb = get_count_order(smp_num_siblings);
#ifdef CONFIG_X86_64
c->phys_proc_id = phys_pkg_id(index_msb);
#else
c->phys_proc_id = phys_pkg_id(c->initial_apicid, index_msb); c->phys_proc_id = phys_pkg_id(c->initial_apicid, index_msb);
#endif
smp_num_siblings = smp_num_siblings / c->x86_max_cores; smp_num_siblings = smp_num_siblings / c->x86_max_cores;
@@ -454,13 +450,8 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
core_bits = get_count_order(c->x86_max_cores); core_bits = get_count_order(c->x86_max_cores);
#ifdef CONFIG_X86_64
c->cpu_core_id = phys_pkg_id(index_msb) &
((1 << core_bits) - 1);
#else
c->cpu_core_id = phys_pkg_id(c->initial_apicid, index_msb) & c->cpu_core_id = phys_pkg_id(c->initial_apicid, index_msb) &
((1 << core_bits) - 1); ((1 << core_bits) - 1);
#endif
} }
out: out:
@@ -742,7 +733,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
this_cpu->c_identify(c); this_cpu->c_identify(c);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
c->apicid = phys_pkg_id(0); c->apicid = phys_pkg_id(c->initial_apicid, 0);
#endif #endif
/* /*

6
arch/x86/kernel/genapic_flat_64.c
View File

@@ -169,7 +169,7 @@ static unsigned int flat_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
return mask1 & mask2; return mask1 & mask2;
} }
static unsigned int phys_pkg_id(int index_msb) static int flat_phys_pkg_id(int initial_apic_id, int index_msb)
{ {
return hard_smp_processor_id() >> index_msb; return hard_smp_processor_id() >> index_msb;
} }
@@ -202,7 +202,7 @@ struct genapic apic_flat = {
.setup_portio_remap = NULL, .setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = phys_pkg_id, .phys_pkg_id = flat_phys_pkg_id,
.mps_oem_check = NULL, .mps_oem_check = NULL,
.get_apic_id = get_apic_id, .get_apic_id = get_apic_id,
@@ -346,7 +346,7 @@ struct genapic apic_physflat = {
.setup_portio_remap = NULL, .setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = phys_pkg_id, .phys_pkg_id = flat_phys_pkg_id,
.mps_oem_check = NULL, .mps_oem_check = NULL,
.get_apic_id = get_apic_id, .get_apic_id = get_apic_id,

4
arch/x86/kernel/genx2apic_cluster.c
View File

@@ -157,7 +157,7 @@ static unsigned long set_apic_id(unsigned int id)
return x; return x;
} }
static unsigned int phys_pkg_id(int index_msb) static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb)
{ {
return current_cpu_data.initial_apicid >> index_msb; return current_cpu_data.initial_apicid >> index_msb;
} }
@@ -204,7 +204,7 @@ struct genapic apic_x2apic_cluster = {
.setup_portio_remap = NULL, .setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = phys_pkg_id, .phys_pkg_id = x2apic_cluster_phys_pkg_id,
.mps_oem_check = NULL, .mps_oem_check = NULL,
.get_apic_id = get_apic_id, .get_apic_id = get_apic_id,

4
arch/x86/kernel/genx2apic_phys.c
View File

@@ -156,7 +156,7 @@ static unsigned long set_apic_id(unsigned int id)
return x; return x;
} }
static unsigned int phys_pkg_id(int index_msb) static int x2apic_phys_pkg_id(int initial_apicid, int index_msb)
{ {
return current_cpu_data.initial_apicid >> index_msb; return current_cpu_data.initial_apicid >> index_msb;
} }
@@ -200,7 +200,7 @@ struct genapic apic_x2apic_phys = {
.setup_portio_remap = NULL, .setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = phys_pkg_id, .phys_pkg_id = x2apic_phys_pkg_id,
.mps_oem_check = NULL, .mps_oem_check = NULL,
.get_apic_id = get_apic_id, .get_apic_id = get_apic_id,

4
arch/x86/kernel/genx2apic_uv_x.c
View File

@@ -226,7 +226,7 @@ static unsigned int uv_read_apic_id(void)
return get_apic_id(apic_read(APIC_ID)); return get_apic_id(apic_read(APIC_ID));
} }
static unsigned int phys_pkg_id(int index_msb) static int uv_phys_pkg_id(int initial_apicid, int index_msb)
{ {
return uv_read_apic_id() >> index_msb; return uv_read_apic_id() >> index_msb;
} }
@@ -265,7 +265,7 @@ struct genapic apic_x2apic_uv_x = {
.setup_portio_remap = NULL, .setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = phys_pkg_id, .phys_pkg_id = uv_phys_pkg_id,
.mps_oem_check = NULL, .mps_oem_check = NULL,
.get_apic_id = get_apic_id, .get_apic_id = get_apic_id,