Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[linux-6.6.y] Add MWAIT Cx support for Zhaoxin CPUs #267

Merged
merged 2 commits into from
Jun 13, 2024
Merged

[linux-6.6.y] Add MWAIT Cx support for Zhaoxin CPUs #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e79735
Add MWAIT Cx support for Zhaoxin CPUs
leoliu-oc Jun 13, 2024
9b18dbb
Merge branch 'linux-6.6.y' into linux-6.6.y-37-mwait
opsiff Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arch/x86/include/asm/acpi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ static inline bool arch_has_acpi_pdc(void)
{
struct cpuinfo_x86 *c = &cpu_data(0);
return (c->x86_vendor == X86_VENDOR_INTEL ||
c->x86_vendor == X86_VENDOR_CENTAUR);
c->x86_vendor == X86_VENDOR_CENTAUR ||
c->x86_vendor == X86_VENDOR_ZHAOXIN);
}

static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
Expand Down
4 changes: 3 additions & 1 deletion arch/x86/kernel/acpi/cstate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ static int __init ffh_cstate_init(void)

if (c->x86_vendor != X86_VENDOR_INTEL &&
c->x86_vendor != X86_VENDOR_AMD &&
c->x86_vendor != X86_VENDOR_HYGON)
c->x86_vendor != X86_VENDOR_HYGON &&
c->x86_vendor != X86_VENDOR_CENTAUR &&
c->x86_vendor != X86_VENDOR_ZHAOXIN)
return -1;

cpu_cstate_entry = alloc_percpu(struct cstate_entry);
Expand Down
Loading