From: "tip-bot2 for Pu Wen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Pu Wen <puwen@hygon.cn>, Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cpu] x86/cstate: Allow ACPI C1 FFH MWAIT use on Hygon systems
Date: Mon, 31 May 2021 08:55:48 -0000 [thread overview]
Message-ID: <162245134873.29796.1219713411989119535.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210528081417.31474-1-puwen@hygon.cn>
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 280b68a3b3b96b027fcdeb5a3916a8e2aaf84d03
Gitweb: https://git.kernel.org/tip/280b68a3b3b96b027fcdeb5a3916a8e2aaf84d03
Author: Pu Wen <puwen@hygon.cn>
AuthorDate: Fri, 28 May 2021 16:14:17 +08:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 31 May 2021 10:47:04 +02:00
x86/cstate: Allow ACPI C1 FFH MWAIT use on Hygon systems
Hygon systems support the MONITOR/MWAIT instructions and these can be
used for ACPI C1 in the same way as on AMD and Intel systems.
The BIOS declares a C1 state in _CST to use FFH and CPUID_Fn00000005_EDX
is non-zero on Hygon systems.
Allow ffh_cstate_init() to succeed on Hygon systems to default using FFH
MWAIT instead of HALT for ACPI C1.
Signed-off-by: Pu Wen <puwen@hygon.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210528081417.31474-1-puwen@hygon.cn
---
arch/x86/kernel/acpi/cstate.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index 49ae4e1..7de599e 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -197,7 +197,8 @@ static int __init ffh_cstate_init(void)
struct cpuinfo_x86 *c = &boot_cpu_data;
if (c->x86_vendor != X86_VENDOR_INTEL &&
- c->x86_vendor != X86_VENDOR_AMD)
+ c->x86_vendor != X86_VENDOR_AMD &&
+ c->x86_vendor != X86_VENDOR_HYGON)
return -1;
cpu_cstate_entry = alloc_percpu(struct cstate_entry);
next prev parent reply other threads:[~2021-05-31 8:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 8:14 [PATCH] x86/cstate: Allow ACPI C1 FFH MWAIT use on Hygon systems Pu Wen
2021-05-31 8:55 ` tip-bot2 for Pu Wen [this message]
2021-06-09 17:30 ` Rafael J. Wysocki
2021-06-09 17:39 ` Rafael J. Wysocki
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=162245134873.29796.1219713411989119535.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=puwen@hygon.cn \
--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).