malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

powernow-k8: delay info messages until initialization has succeeded

Browse Source 
powernow-k8 is quite prematurely crying Hooray and outputs diagnostic
messages, although the actual initialization can still fail.
Since now we may have acpi-cpufreq already loaded, we move the
messages at the end of the init routine to avoid confusing output
if the loading of powernow-k8 should not succeed.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Andre Przywara 2012-09-04 08:28:05 +00:00 committed by Rafael J. Wysocki
parent 034be8fd64
commit a206095856
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/cpufreq/powernow-k8.c
View File

@ -1576,9 +1576,6 @@ static int __cpuinit powernowk8_init(void)
if (supported_cpus != num_online_cpus()) if (supported_cpus != num_online_cpus())
return -ENODEV; return -ENODEV;
printk(KERN_INFO PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
num_online_nodes(), boot_cpu_data.x86_model_id, supported_cpus);
if (boot_cpu_has(X86_FEATURE_CPB)) { if (boot_cpu_has(X86_FEATURE_CPB)) {
cpb_capable = true; cpb_capable = true;
@ -1597,16 +1594,23 @@ static int __cpuinit powernowk8_init(void)
struct msr *reg = per_cpu_ptr(msrs, cpu); struct msr *reg = per_cpu_ptr(msrs, cpu);
cpb_enabled |= !(!!(reg->l & BIT(25))); cpb_enabled |= !(!!(reg->l & BIT(25)));
} }
printk(KERN_INFO PFX "Core Performance Boosting: %s.\n",
(cpb_enabled ? "on" : "off"));
} }
rv = cpufreq_register_driver(&cpufreq_amd64_driver); rv = cpufreq_register_driver(&cpufreq_amd64_driver);
if (rv < 0 && boot_cpu_has(X86_FEATURE_CPB)) {
unregister_cpu_notifier(&cpb_nb); if (!rv)
msrs_free(msrs); pr_info(PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
msrs = NULL; num_online_nodes(), boot_cpu_data.x86_model_id,
supported_cpus);
if (boot_cpu_has(X86_FEATURE_CPB)) {
if (rv < 0) {
unregister_cpu_notifier(&cpb_nb);
msrs_free(msrs);
msrs = NULL;
} else
pr_info(PFX "Core Performance Boosting: %s.\n",
(cpb_enabled ? "on" : "off"));
} }
return rv; return rv;
} }