From: Pu Wen <puwen@hygon.cn>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, thomas.lendacky@amd.com, bp@alien8.de,
pbonzini@redhat.com, rjw@rjwysocki.net, viresh.kumar@linaro.org,
rafael@kernel.org, rafael.j.wysocki@intel.com
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-pm@vger.kernel.org, Pu Wen <puwen@hygon.cn>
Subject: [PATCH v4 14/16] driver/cpufreq: enable Hygon support to cpufreq driver
Date: Mon, 20 Aug 2018 00:14:28 +0800 [thread overview]
Message-ID: <ba12d5ecb16dfb99c7ab99d4305a326880d31b96.1534599097.git.puwen@hygon.cn> (raw)
In-Reply-To: <cover.1534599097.git.puwen@hygon.cn>
Enable ACPI cpufreq driver support for Hygon by adding family ID check
along with AMD.
As Hygon platforms have SMBus device(PCI device ID 0x790b), enable Hygon
support to function amd_freq_sensitivity_init().
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Pu Wen <puwen@hygon.cn>
---
drivers/cpufreq/acpi-cpufreq.c | 5 +++++
drivers/cpufreq/amd_freq_sensitivity.c | 9 +++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index b61f4ec..d62fd37 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -61,6 +61,7 @@ enum {
#define INTEL_MSR_RANGE (0xffff)
#define AMD_MSR_RANGE (0x7)
+#define HYGON_MSR_RANGE (0x7)
#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)
@@ -95,6 +96,7 @@ static bool boost_state(unsigned int cpu)
rdmsr_on_cpu(cpu, MSR_IA32_MISC_ENABLE, &lo, &hi);
msr = lo | ((u64)hi << 32);
return !(msr & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);
+ case X86_VENDOR_HYGON:
case X86_VENDOR_AMD:
rdmsr_on_cpu(cpu, MSR_K7_HWCR, &lo, &hi);
msr = lo | ((u64)hi << 32);
@@ -113,6 +115,7 @@ static int boost_set_msr(bool enable)
msr_addr = MSR_IA32_MISC_ENABLE;
msr_mask = MSR_IA32_MISC_ENABLE_TURBO_DISABLE;
break;
+ case X86_VENDOR_HYGON:
case X86_VENDOR_AMD:
msr_addr = MSR_K7_HWCR;
msr_mask = MSR_K7_HWCR_CPB_DIS;
@@ -225,6 +228,8 @@ static unsigned extract_msr(struct cpufreq_policy *policy, u32 msr)
if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
msr &= AMD_MSR_RANGE;
+ else if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
+ msr &= HYGON_MSR_RANGE;
else
msr &= INTEL_MSR_RANGE;
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
index be926d9..4ac7c3c 100644
--- a/drivers/cpufreq/amd_freq_sensitivity.c
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -111,11 +111,16 @@ static int __init amd_freq_sensitivity_init(void)
{
u64 val;
struct pci_dev *pcidev;
+ unsigned int pci_vendor;
- if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+ if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+ pci_vendor = PCI_VENDOR_ID_AMD;
+ else if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
+ pci_vendor = PCI_VENDOR_ID_HYGON;
+ else
return -ENODEV;
- pcidev = pci_get_device(PCI_VENDOR_ID_AMD,
+ pcidev = pci_get_device(pci_vendor,
PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
if (!pcidev) {
--
2.7.4
next prev parent reply other threads:[~2018-08-19 16:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-19 16:07 [PATCH v4 00/16] Add support for Hygon Dhyana Family 18h processor Pu Wen
2018-08-19 16:08 ` [PATCH v4 01/16] x86/cpu: create Dhyana init file and register new cpu_dev to system Pu Wen
2018-08-19 16:09 ` [PATCH v4 02/16] x86/cache: get cache size/leaves and setup cache cpumap for Dhyana Pu Wen
2018-08-19 16:09 ` [PATCH v4 03/16] x86/mtrr: get MTRR number and support TOP_MEM2 Pu Wen
2018-08-19 16:09 ` [PATCH v4 04/16] x86/smpboot: smp init nodelay and no flush caches before sleep Pu Wen
2018-08-19 16:10 ` [PATCH v4 05/16] x86/pmu: enable Hygon support to PMU infrastructure Pu Wen
2018-08-19 16:10 ` [PATCH v4 06/16] x86/nops: init ideal_nops for Hygon Pu Wen
2018-08-19 16:10 ` [PATCH v4 07/16] x86/pci: add Hygon PCI vendor and northbridge support Pu Wen
2018-08-19 16:11 ` [PATCH v4 08/16] x86/apic: add modern APIC support for Hygon Pu Wen
2018-08-19 16:12 ` [PATCH v4 09/16] x86/bugs: add lfence mitigation to spectre v2 and no meltdown " Pu Wen
2018-08-19 16:12 ` [PATCH v4 10/16] x86/mce: enable Hygon support to MCE infrastructure Pu Wen
2018-08-19 16:13 ` [PATCH v4 11/16] x86/kvm: enable Hygon support to KVM infrastructure Pu Wen
2018-08-19 16:13 ` [PATCH v4 12/16] x86/xen: enable Hygon support to Xen Pu Wen
2018-08-21 1:43 ` [Xen-devel] " Boris Ostrovsky
2018-08-19 16:14 ` [PATCH v4 13/16] driver/acpi: enable Hygon support to ACPI driver Pu Wen
2018-08-19 16:14 ` Pu Wen [this message]
2018-08-19 16:14 ` [PATCH v4 15/16] driver/edac: enable Hygon support to AMD64 EDAC driver Pu Wen
2018-08-21 8:13 ` Borislav Petkov
2018-08-21 11:04 ` Pu Wen
2018-08-21 11:20 ` Borislav Petkov
2018-08-21 11:26 ` Paolo Bonzini
2018-08-21 13:04 ` Borislav Petkov
2018-08-21 18:07 ` Pavel Machek
2018-08-22 13:18 ` Pu Wen
2018-08-22 13:07 ` Pu Wen
2018-08-23 8:27 ` Borislav Petkov
2018-08-19 16:15 ` [PATCH v4 16/16] tools/cpupower: enable Hygon support to cpupower tool Pu Wen
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=ba12d5ecb16dfb99c7ab99d4305a326880d31b96.1534599097.git.puwen@hygon.cn \
--to=puwen@hygon.cn \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=viresh.kumar@linaro.org \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).