From: Matthew Garrett <mjg@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: borislav.petkov@amd.com, davej@redhat.com,
mark.langsdorf@amd.com, cpufreq@vger.kernel.org,
andreas.herrmann3@amd.com, Matthew Garrett <mjg@redhat.com>
Subject: [PATCH V2 5/6] cpufreq: Add compatibility hack to powernow-k8
Date: Fri, 17 Jun 2011 15:50:56 -0400 [thread overview]
Message-ID: <1308340257-10117-5-git-send-email-mjg@redhat.com> (raw)
In-Reply-To: <1308340257-10117-1-git-send-email-mjg@redhat.com>
cpufreq modules are often loaded from init scripts that assume that all
recent AMD systems will use powernow-k8, so we should ensure that loading
it triggers a load of acpi-cpufreq if the latter is built as a module.
This avoids the problem of users ending up without any cpufreq support
after the transition.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
drivers/cpufreq/powernow-k8.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 83479b6..8591ec8 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1545,8 +1545,12 @@ static int __cpuinit powernowk8_init(void)
supported_cpus++;
}
- if (supported_cpus != num_online_cpus())
+ if (supported_cpus != num_online_cpus()) {
+ if (cpu_has(0, X86_FEATURE_HW_PSTATE))
+ request_module("acpi_cpufreq");
+
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);
--
1.7.5.2
next prev parent reply other threads:[~2011-06-17 19:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-17 19:50 [PATCH V2 1/6] x86: Add AMD HW_PSTATE cpu feature bit and MSRs Matthew Garrett
2011-06-17 19:50 ` [PATCH V2 2/6] acpi-cpufreq: Add support for modern AMD CPUs Matthew Garrett
2011-06-17 19:50 ` [PATCH V2 3/6] acpi-cpufreq: Add support for disabling dynamic overclocking Matthew Garrett
2011-06-18 11:28 ` Borislav Petkov
2011-06-17 19:50 ` [PATCH V2 4/6] ACPI: Add fixups for AMD P-state figures Matthew Garrett
2011-06-18 11:28 ` Borislav Petkov
2011-06-17 19:50 ` Matthew Garrett [this message]
2011-06-18 11:28 ` [PATCH V2 5/6] cpufreq: Add compatibility hack to powernow-k8 Borislav Petkov
2011-06-17 19:50 ` [PATCH V2 6/6] cpufreq: Remove support for hardware P-state chips from powernow-k8 Matthew Garrett
2011-06-18 11:25 ` [PATCH V2 1/6] x86: Add AMD HW_PSTATE cpu feature bit and MSRs Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308340257-10117-5-git-send-email-mjg@redhat.com \
--to=mjg@redhat.com \
--cc=andreas.herrmann3@amd.com \
--cc=borislav.petkov@amd.com \
--cc=cpufreq@vger.kernel.org \
--cc=davej@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.langsdorf@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®