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

ACPI: change processors from array to per_cpu variable

Browse Source 
Change processors from an array sized by NR_CPUS to a per_cpu variable.

Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Mike Travis
2008-06-09 16:22:23 -07:00
committed by Andi Kleen
parent 5411552c70
commit 706546d023
5 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/processor_core.c
View File

@@ -118,7 +118,7 @@ static const struct file_operations acpi_processor_info_fops = {
.release = single_release, .release = single_release,
}; };
struct acpi_processor *processors[NR_CPUS]; DEFINE_PER_CPU(struct acpi_processor *, processors);
struct acpi_processor_errata errata __read_mostly; struct acpi_processor_errata errata __read_mostly;
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
@@ -614,7 +614,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
return 0; return 0;
} }
static void *processor_device_array[NR_CPUS]; static DEFINE_PER_CPU(void *, processor_device_array);
static int __cpuinit acpi_processor_start(struct acpi_device *device) static int __cpuinit acpi_processor_start(struct acpi_device *device)
{ {
@@ -638,15 +638,15 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
* ACPI id of processors can be reported wrongly by the BIOS. * ACPI id of processors can be reported wrongly by the BIOS.
* Don't trust it blindly * Don't trust it blindly
*/ */
if (processor_device_array[pr->id] != NULL && if (per_cpu(processor_device_array, pr->id) != NULL &&
processor_device_array[pr->id] != device) { per_cpu(processor_device_array, pr->id) != device) {
printk(KERN_WARNING "BIOS reported wrong ACPI id " printk(KERN_WARNING "BIOS reported wrong ACPI id "
"for the processor\n"); "for the processor\n");
return -ENODEV; return -ENODEV;
} }
processor_device_array[pr->id] = device; per_cpu(processor_device_array, pr->id) = device;
processors[pr->id] = pr; per_cpu(processors, pr->id) = pr;
result = acpi_processor_add_fs(device); result = acpi_processor_add_fs(device);
if (result) if (result)
@@ -753,7 +753,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
unsigned int cpu = (unsigned long)hcpu; unsigned int cpu = (unsigned long)hcpu;
struct acpi_processor *pr = processors[cpu]; struct acpi_processor *pr = per_cpu(processors, cpu);
if (action == CPU_ONLINE && pr) { if (action == CPU_ONLINE && pr) {
acpi_processor_ppc_has_changed(pr); acpi_processor_ppc_has_changed(pr);
@@ -825,8 +825,8 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
pr->cdev = NULL; pr->cdev = NULL;
} }
processors[pr->id] = NULL; per_cpu(processors, pr->id) = NULL;
processor_device_array[pr->id] = NULL; per_cpu(processor_device_array, pr->id) = NULL;
kfree(pr); kfree(pr);
return 0; return 0;
@@ -1074,8 +1074,6 @@ static int __init acpi_processor_init(void)
{ {
int result = 0; int result = 0;
memset(&processors, 0, sizeof(processors));
memset(&errata, 0, sizeof(errata)); memset(&errata, 0, sizeof(errata));
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

8
drivers/acpi/processor_idle.c
View File

@@ -401,7 +401,7 @@ static void acpi_processor_idle(void)
*/ */
local_irq_disable(); local_irq_disable();
pr = processors[smp_processor_id()]; pr = __get_cpu_var(processors);
if (!pr) { if (!pr) {
local_irq_enable(); local_irq_enable();
return; return;
@@ -1431,7 +1431,7 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
struct acpi_processor *pr; struct acpi_processor *pr;
struct acpi_processor_cx *cx = cpuidle_get_statedata(state); struct acpi_processor_cx *cx = cpuidle_get_statedata(state);
pr = processors[smp_processor_id()]; pr = __get_cpu_var(processors);
if (unlikely(!pr)) if (unlikely(!pr))
return 0; return 0;
@@ -1471,7 +1471,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
u32 t1, t2; u32 t1, t2;
int sleep_ticks = 0; int sleep_ticks = 0;
pr = processors[smp_processor_id()]; pr = __get_cpu_var(processors);
if (unlikely(!pr)) if (unlikely(!pr))
return 0; return 0;
@@ -1549,7 +1549,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
u32 t1, t2; u32 t1, t2;
int sleep_ticks = 0; int sleep_ticks = 0;
pr = processors[smp_processor_id()]; pr = __get_cpu_var(processors);
if (unlikely(!pr)) if (unlikely(!pr))
return 0; return 0;

18
drivers/acpi/processor_perflib.c
View File

@@ -89,7 +89,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb,
if (event != CPUFREQ_INCOMPATIBLE) if (event != CPUFREQ_INCOMPATIBLE)
goto out; goto out;
pr = processors[policy->cpu]; pr = per_cpu(processors, policy->cpu);
if (!pr || !pr->performance) if (!pr || !pr->performance)
goto out; goto out;
@@ -572,7 +572,7 @@ int acpi_processor_preregister_performance(
/* Call _PSD for all CPUs */ /* Call _PSD for all CPUs */
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) { if (!pr) {
/* Look only at processors in ACPI namespace */ /* Look only at processors in ACPI namespace */
continue; continue;
@@ -603,7 +603,7 @@ int acpi_processor_preregister_performance(
* domain info. * domain info.
*/ */
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) if (!pr)
continue; continue;
@@ -624,7 +624,7 @@ int acpi_processor_preregister_performance(
cpus_clear(covered_cpus); cpus_clear(covered_cpus);
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) if (!pr)
continue; continue;
@@ -651,7 +651,7 @@ int acpi_processor_preregister_performance(
if (i == j) if (i == j)
continue; continue;
match_pr = processors[j]; match_pr = per_cpu(processors, j);
if (!match_pr) if (!match_pr)
continue; continue;
@@ -680,7 +680,7 @@ int acpi_processor_preregister_performance(
if (i == j) if (i == j)
continue; continue;
match_pr = processors[j]; match_pr = per_cpu(processors, j);
if (!match_pr) if (!match_pr)
continue; continue;
@@ -697,7 +697,7 @@ int acpi_processor_preregister_performance(
err_ret: err_ret:
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr || !pr->performance) if (!pr || !pr->performance)
continue; continue;
@@ -728,7 +728,7 @@ acpi_processor_register_performance(struct acpi_processor_performance
mutex_lock(&performance_mutex); mutex_lock(&performance_mutex);
pr = processors[cpu]; pr = per_cpu(processors, cpu);
if (!pr) { if (!pr) {
mutex_unlock(&performance_mutex); mutex_unlock(&performance_mutex);
return -ENODEV; return -ENODEV;
@@ -766,7 +766,7 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
mutex_lock(&performance_mutex); mutex_lock(&performance_mutex);
pr = processors[cpu]; pr = per_cpu(processors, cpu);
if (!pr) { if (!pr) {
mutex_unlock(&performance_mutex); mutex_unlock(&performance_mutex);
return; return;

14
drivers/acpi/processor_throttling.c
View File

@@ -71,7 +71,7 @@ static int acpi_processor_update_tsd_coord(void)
* coordination between all CPUs. * coordination between all CPUs.
*/ */
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) if (!pr)
continue; continue;
@@ -93,7 +93,7 @@ static int acpi_processor_update_tsd_coord(void)
cpus_clear(covered_cpus); cpus_clear(covered_cpus);
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) if (!pr)
continue; continue;
@@ -119,7 +119,7 @@ static int acpi_processor_update_tsd_coord(void)
if (i == j) if (i == j)
continue; continue;
match_pr = processors[j]; match_pr = per_cpu(processors, j);
if (!match_pr) if (!match_pr)
continue; continue;
@@ -152,7 +152,7 @@ static int acpi_processor_update_tsd_coord(void)
if (i == j) if (i == j)
continue; continue;
match_pr = processors[j]; match_pr = per_cpu(processors, j);
if (!match_pr) if (!match_pr)
continue; continue;
@@ -172,7 +172,7 @@ static int acpi_processor_update_tsd_coord(void)
err_ret: err_ret:
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
pr = processors[i]; pr = per_cpu(processors, i);
if (!pr) if (!pr)
continue; continue;
@@ -214,7 +214,7 @@ static int acpi_processor_throttling_notifier(unsigned long event, void *data)
struct acpi_processor_throttling *p_throttling; struct acpi_processor_throttling *p_throttling;
cpu = p_tstate->cpu; cpu = p_tstate->cpu;
pr = processors[cpu]; pr = per_cpu(processors, cpu);
if (!pr) { if (!pr) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Invalid pr pointer\n")); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Invalid pr pointer\n"));
return 0; return 0;
@@ -1035,7 +1035,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state)
* cpus. * cpus.
*/ */
for_each_cpu_mask(i, online_throttling_cpus) { for_each_cpu_mask(i, online_throttling_cpus) {
match_pr = processors[i]; match_pr = per_cpu(processors, i);
/* /*
* If the pointer is invalid, we will report the * If the pointer is invalid, we will report the
* error message and continue. * error message and continue.

2
include/acpi/processor.h
View File

@@ -255,7 +255,7 @@ extern void acpi_processor_unregister_performance(struct
int acpi_processor_notify_smm(struct module *calling_module); int acpi_processor_notify_smm(struct module *calling_module);
/* for communication between multiple parts of the processor kernel module */ /* for communication between multiple parts of the processor kernel module */
extern struct acpi_processor *processors[NR_CPUS]; DECLARE_PER_CPU(struct acpi_processor *, processors);
extern struct acpi_processor_errata errata; extern struct acpi_processor_errata errata;
void arch_acpi_processor_init_pdc(struct acpi_processor *pr); void arch_acpi_processor_init_pdc(struct acpi_processor *pr);