| Message ID | 20180813124309.2495-1-prarit@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | [v2] x86/ACPI/cstate: Remove Intel from APCI C1 FFH MWAIT cstate description | expand |
On Monday, August 13, 2018 2:43:09 PM CEST Prarit Bhargava wrote: > commit 5209654a46ee ("x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD > systems") allows use of FFH for ACPI C1 but tools like turbostat display > "ACPI FFH INTEL MWAIT 0x0". > > Remove "INTEL" from the ACPI C1 FFH MWAIT cstate description. > > v2: Remove "INTEL" instead of special casing AMD systems. > > Signed-off-by: Prarit Bhargava <prarit@redhat.com> > Cc: Len Brown <lenb@kernel.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: x86@kernel.org > --- > arch/x86/kernel/acpi/cstate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c > index dde437f5d14f..158ad1483c43 100644 > --- a/arch/x86/kernel/acpi/cstate.c > +++ b/arch/x86/kernel/acpi/cstate.c > @@ -108,7 +108,7 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) > cx->type); > } > snprintf(cx->desc, > - ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", > + ACPI_CX_DESC_LEN, "ACPI FFH MWAIT 0x%x", > cx->address); > out: > return retval; > Applied, thanks!
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index dde437f5d14f..158ad1483c43 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -108,7 +108,7 @@ static long acpi_processor_ffh_cstate_probe_cpu(void *_cx) cx->type); } snprintf(cx->desc, - ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", + ACPI_CX_DESC_LEN, "ACPI FFH MWAIT 0x%x", cx->address); out: return retval;
commit 5209654a46ee ("x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD systems") allows use of FFH for ACPI C1 but tools like turbostat display "ACPI FFH INTEL MWAIT 0x0". Remove "INTEL" from the ACPI C1 FFH MWAIT cstate description. v2: Remove "INTEL" instead of special casing AMD systems. Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: Len Brown <lenb@kernel.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org --- arch/x86/kernel/acpi/cstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)