Skip to content

Commit 34ae7f3

Browse files
Mark LangsdorfDave Jones
Mark Langsdorf
authored and
Dave Jones
committed
[CPUFREQ][2/2] preregister support for powernow-k8
This patch provides support for the _PSD ACPI object in the Powernow-k8 driver. Although it looks like an invasive patch, most of it is simply the consequence of turning the static acpi_performance_data structure into a pointer. AMD has tested it on several machines over the past few days without issue. [trivial checkpatch warnings fixed up by davej] [X86_POWERNOW_K8_ACPI=n buildfix from Randy Dunlap] Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Tested-by: Frank Arnold <frank.arnold@amd.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Dave Jones <davej@redhat.com>
1 parent 23431b4 commit 34ae7f3

File tree

2 files changed

+75
-37
lines changed

2 files changed

+75
-37
lines changed

‎arch/x86/kernel/cpu/cpufreq/powernow-k8.c

Lines changed: 73 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -737,44 +737,63 @@ static int find_psb_table(struct powernow_k8_data *data)
737737
#ifdef CONFIG_X86_POWERNOW_K8_ACPI
738738
static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index)
739739
{
740-
if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))
740+
if (!data->acpi_data->state_count || (cpu_family == CPU_HW_PSTATE))
741741
return;
742742

743-
data->irt = (data->acpi_data.states[index].control >> IRT_SHIFT) & IRT_MASK;
744-
data->rvo = (data->acpi_data.states[index].control >> RVO_SHIFT) & RVO_MASK;
745-
data->exttype = (data->acpi_data.states[index].control >> EXT_TYPE_SHIFT) & EXT_TYPE_MASK;
746-
data->plllock = (data->acpi_data.states[index].control >> PLL_L_SHIFT) & PLL_L_MASK;
747-
data->vidmvs = 1 << ((data->acpi_data.states[index].control >> MVS_SHIFT) & MVS_MASK);
748-
data->vstable = (data->acpi_data.states[index].control >> VST_SHIFT) & VST_MASK;
743+
data->irt = (data->acpi_data->states[index].control >> IRT_SHIFT) & IRT_MASK;
744+
data->rvo = (data->acpi_data->states[index].control >> RVO_SHIFT) & RVO_MASK;
745+
data->exttype = (data->acpi_data->states[index].control >> EXT_TYPE_SHIFT) & EXT_TYPE_MASK;
746+
data->plllock = (data->acpi_data->states[index].control >> PLL_L_SHIFT) & PLL_L_MASK;
747+
data->vidmvs = 1 << ((data->acpi_data->states[index].control >> MVS_SHIFT) & MVS_MASK);
748+
data->vstable = (data->acpi_data->states[index].control >> VST_SHIFT) & VST_MASK;
749+
}
750+
751+
752+
static struct acpi_processor_performance *acpi_perf_data;
753+
static int preregister_valid;
754+
755+
static int powernow_k8_cpu_preinit_acpi(void)
756+
{
757+
acpi_perf_data = alloc_percpu(struct acpi_processor_performance);
758+
if (!acpi_perf_data)
759+
return -ENODEV;
760+
761+
if (acpi_processor_preregister_performance(acpi_perf_data))
762+
return -ENODEV;
763+
else
764+
preregister_valid = 1;
765+
return 0;
749766
}
750767

751768
static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
752769
{
753770
struct cpufreq_frequency_table *powernow_table;
754771
int ret_val;
772+
int cpu = 0;
755773

756-
if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {
774+
data->acpi_data = percpu_ptr(acpi_perf_data, cpu);
775+
if (acpi_processor_register_performance(data->acpi_data, data->cpu)) {
757776
dprintk("register performance failed: bad ACPI data\n");
758777
return -EIO;
759778
}
760779

761780
/* verify the data contained in the ACPI structures */
762-
if (data->acpi_data.state_count <= 1) {
781+
if (data->acpi_data->state_count <= 1) {
763782
dprintk("No ACPI P-States\n");
764783
goto err_out;
765784
}
766785

767-
if ((data->acpi_data.control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
768-
(data->acpi_data.status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
786+
if ((data->acpi_data->control_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
787+
(data->acpi_data->status_register.space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
769788
dprintk("Invalid control/status registers (%x - %x)\n",
770-
data->acpi_data.control_register.space_id,
771-
data->acpi_data.status_register.space_id);
789+
data->acpi_data->control_register.space_id,
790+
data->acpi_data->status_register.space_id);
772791
goto err_out;
773792
}
774793

775794
/* fill in data->powernow_table */
776795
powernow_table = kmalloc((sizeof(struct cpufreq_frequency_table)
777-
* (data->acpi_data.state_count + 1)), GFP_KERNEL);
796+
* (data->acpi_data->state_count + 1)), GFP_KERNEL);
778797
if (!powernow_table) {
779798
dprintk("powernow_table memory alloc failure\n");
780799
goto err_out;
@@ -787,29 +806,44 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
787806
if (ret_val)
788807
goto err_out_mem;
789808

790-
powernow_table[data->acpi_data.state_count].frequency = CPUFREQ_TABLE_END;
791-
powernow_table[data->acpi_data.state_count].index = 0;
809+
powernow_table[data->acpi_data->state_count].frequency = CPUFREQ_TABLE_END;
810+
powernow_table[data->acpi_data->state_count].index = 0;
792811
data->powernow_table = powernow_table;
793812

794813
/* fill in data */
795-
data->numps = data->acpi_data.state_count;
814+
data->numps = data->acpi_data->state_count;
796815
if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu)
797816
print_basics(data);
798817
powernow_k8_acpi_pst_values(data, 0);
799818

800819
/* notify BIOS that we exist */
801820
acpi_processor_notify_smm(THIS_MODULE);
802821

822+
/* determine affinity, from ACPI if available */
823+
if (preregister_valid) {
824+
if ((data->acpi_data->shared_type == CPUFREQ_SHARED_TYPE_ALL) ||
825+
(data->acpi_data->shared_type == CPUFREQ_SHARED_TYPE_ANY))
826+
data->starting_core_affinity = data->acpi_data->shared_cpu_map;
827+
else
828+
data->starting_core_affinity = cpumask_of_cpu(data->cpu);
829+
} else {
830+
/* best guess from family if not */
831+
if (cpu_family == CPU_HW_PSTATE)
832+
data->starting_core_affinity = cpumask_of_cpu(data->cpu);
833+
else
834+
data->starting_core_affinity = per_cpu(cpu_core_map, data->cpu);
835+
}
836+
803837
return 0;
804838

805839
err_out_mem:
806840
kfree(powernow_table);
807841

808842
err_out:
809-
acpi_processor_unregister_performance(&data->acpi_data, data->cpu);
843+
acpi_processor_unregister_performance(data->acpi_data, data->cpu);
810844

811845
/* data->acpi_data.state_count informs us at ->exit() whether ACPI was used */
812-
data->acpi_data.state_count = 0;
846+
data->acpi_data->state_count = 0;
813847

814848
return -ENODEV;
815849
}
@@ -821,10 +855,10 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpuf
821855
rdmsr(MSR_PSTATE_CUR_LIMIT, hi, lo);
822856
data->max_hw_pstate = (hi & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT;
823857

824-
for (i = 0; i < data->acpi_data.state_count; i++) {
858+
for (i = 0; i < data->acpi_data->state_count; i++) {
825859
u32 index;
826860

827-
index = data->acpi_data.states[i].control & HW_PSTATE_MASK;
861+
index = data->acpi_data->states[i].control & HW_PSTATE_MASK;
828862
if (index > data->max_hw_pstate) {
829863
printk(KERN_ERR PFX "invalid pstate %d - bad value %d.\n", i, index);
830864
printk(KERN_ERR PFX "Please report to BIOS manufacturer\n");
@@ -840,7 +874,7 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpuf
840874

841875
powernow_table[i].index = index;
842876

843-
powernow_table[i].frequency = data->acpi_data.states[i].core_frequency * 1000;
877+
powernow_table[i].frequency = data->acpi_data->states[i].core_frequency * 1000;
844878
}
845879
return 0;
846880
}
@@ -849,16 +883,16 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf
849883
{
850884
int i;
851885
int cntlofreq = 0;
852-
for (i = 0; i < data->acpi_data.state_count; i++) {
886+
for (i = 0; i < data->acpi_data->state_count; i++) {
853887
u32 fid;
854888
u32 vid;
855889

856890
if (data->exttype) {
857-
fid = data->acpi_data.states[i].status & EXT_FID_MASK;
858-
vid = (data->acpi_data.states[i].status >> VID_SHIFT) & EXT_VID_MASK;
891+
fid = data->acpi_data->states[i].status & EXT_FID_MASK;
892+
vid = (data->acpi_data->states[i].status >> VID_SHIFT) & EXT_VID_MASK;
859893
} else {
860-
fid = data->acpi_data.states[i].control & FID_MASK;
861-
vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK;
894+
fid = data->acpi_data->states[i].control & FID_MASK;
895+
vid = (data->acpi_data->states[i].control >> VID_SHIFT) & VID_MASK;
862896
}
863897

864898
dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid);
@@ -899,10 +933,10 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf
899933
cntlofreq = i;
900934
}
901935

902-
if (powernow_table[i].frequency != (data->acpi_data.states[i].core_frequency * 1000)) {
936+
if (powernow_table[i].frequency != (data->acpi_data->states[i].core_frequency * 1000)) {
903937
printk(KERN_INFO PFX "invalid freq entries %u kHz vs. %u kHz\n",
904938
powernow_table[i].frequency,
905-
(unsigned int) (data->acpi_data.states[i].core_frequency * 1000));
939+
(unsigned int) (data->acpi_data->states[i].core_frequency * 1000));
906940
powernow_table[i].frequency = CPUFREQ_ENTRY_INVALID;
907941
continue;
908942
}
@@ -912,11 +946,12 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpuf
912946

913947
static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data)
914948
{
915-
if (data->acpi_data.state_count)
916-
acpi_processor_unregister_performance(&data->acpi_data, data->cpu);
949+
if (data->acpi_data->state_count)
950+
acpi_processor_unregister_performance(data->acpi_data, data->cpu);
917951
}
918952

919953
#else
954+
static int powernow_k8_cpu_preinit_acpi(void) { return -ENODEV; }
920955
static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) { return -ENODEV; }
921956
static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) { return; }
922957
static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) { return; }
@@ -1101,7 +1136,7 @@ static int powernowk8_verify(struct cpufreq_policy *pol)
11011136
static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
11021137
{
11031138
struct powernow_k8_data *data;
1104-
cpumask_t oldmask;
1139+
cpumask_t oldmask = CPU_MASK_ALL;
11051140
int rc;
11061141

11071142
if (!cpu_online(pol->cpu))
@@ -1174,10 +1209,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
11741209
/* run on any CPU again */
11751210
set_cpus_allowed_ptr(current, &oldmask);
11761211

1177-
if (cpu_family == CPU_HW_PSTATE)
1178-
pol->cpus = cpumask_of_cpu(pol->cpu);
1179-
else
1180-
pol->cpus = per_cpu(cpu_core_map, pol->cpu);
1212+
pol->cpus = data->starting_core_affinity;
11811213
data->available_cores = &(pol->cpus);
11821214

11831215
/* Take a crude guess here.
@@ -1300,6 +1332,7 @@ static int __cpuinit powernowk8_init(void)
13001332
}
13011333

13021334
if (supported_cpus == num_online_cpus()) {
1335+
powernow_k8_cpu_preinit_acpi();
13031336
printk(KERN_INFO PFX "Found %d %s "
13041337
"processors (%d cpu cores) (" VERSION ")\n",
13051338
num_online_nodes(),
@@ -1316,6 +1349,10 @@ static void __exit powernowk8_exit(void)
13161349
dprintk("exit\n");
13171350

13181351
cpufreq_unregister_driver(&cpufreq_amd64_driver);
1352+
1353+
#ifdef CONFIG_X86_POWERNOW_K8_ACPI
1354+
free_percpu(acpi_perf_data);
1355+
#endif
13191356
}
13201357

13211358
MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and Mark Langsdorf <mark.langsdorf@amd.com>");

‎arch/x86/kernel/cpu/cpufreq/powernow-k8.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ struct powernow_k8_data {
3333
#ifdef CONFIG_X86_POWERNOW_K8_ACPI
3434
/* the acpi table needs to be kept. it's only available if ACPI was
3535
* used to determine valid frequency/vid/fid states */
36-
struct acpi_processor_performance acpi_data;
36+
struct acpi_processor_performance *acpi_data;
3737
#endif
3838
/* we need to keep track of associated cores, but let cpufreq
3939
* handle hotplug events - so just point at cpufreq pol->cpus
4040
* structure */
4141
cpumask_t *available_cores;
42+
cpumask_t starting_core_affinity;
4243
};
4344

4445

0 commit comments

Comments
 (0)