Commit bc83cccc authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, mwait: Move mwait constants to a common header file 



We have MWAIT constants spread across three different .c files, for no
good reason.  Move them all into a common header file.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Reviewed-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Len Brown <lenb@kernel.org>
LKML-Reference: <tip-*@git.kernel.org>
parent 49553c2e

arch/x86/include/asm/mwait.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MWAIT_H

#define _ASM_X86_MWAIT_H



#define MWAIT_SUBSTATE_MASK		0xf

#define MWAIT_CSTATE_MASK		0xf

#define MWAIT_SUBSTATE_SIZE		4

#define MWAIT_MAX_NUM_CSTATES		8



#define CPUID_MWAIT_LEAF		5

#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1

#define CPUID5_ECX_INTERRUPT_BREAK	0x2



#define MWAIT_ECX_INTERRUPT_BREAK	0x1



#endif /* _ASM_X86_MWAIT_H */

arch/x86/kernel/acpi/cstate.c

+1 −10
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <acpi/processor.h>

#include <asm/acpi.h>

#include <asm/mwait.h>



/*

 * Initialize bm_flags based on the CPU cache properties
@@ -65,16 +66,6 @@ static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */ 


static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];



#define MWAIT_SUBSTATE_MASK	(0xf)

#define MWAIT_CSTATE_MASK	(0xf)

#define MWAIT_SUBSTATE_SIZE	(4)



#define CPUID_MWAIT_LEAF (5)

#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1)

#define CPUID5_ECX_INTERRUPT_BREAK	(0x2)



#define MWAIT_ECX_INTERRUPT_BREAK	(0x1)



#define NATIVE_CSTATE_BEYOND_HALT	(2)



static long acpi_processor_ffh_cstate_probe_cpu(void *_cx)

drivers/acpi/acpi_pad.c

+1 −6
Original line number Diff line number Diff line
@@ -30,18 +30,13 @@ 
#include <linux/slab.h>

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

#include <asm/mwait.h>



#define ACPI_PROCESSOR_AGGREGATOR_CLASS	"acpi_pad"

#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"

#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80

static DEFINE_MUTEX(isolated_cpus_lock);



#define MWAIT_SUBSTATE_MASK	(0xf)

#define MWAIT_CSTATE_MASK	(0xf)

#define MWAIT_SUBSTATE_SIZE	(4)

#define CPUID_MWAIT_LEAF (5)

#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1)

#define CPUID5_ECX_INTERRUPT_BREAK	(0x2)

static unsigned long power_saving_mwait_eax;



static unsigned char tsc_detected_unstable;

drivers/idle/intel_idle.c

+1 −8
Original line number Diff line number Diff line
@@ -59,18 +59,11 @@ 
#include <linux/hrtimer.h>	/* ktime_get_real() */

#include <trace/events/power.h>

#include <linux/sched.h>

#include <asm/mwait.h>



#define INTEL_IDLE_VERSION "0.4"

#define PREFIX "intel_idle: "



#define MWAIT_SUBSTATE_MASK	(0xf)

#define MWAIT_CSTATE_MASK	(0xf)

#define MWAIT_SUBSTATE_SIZE	(4)

#define MWAIT_MAX_NUM_CSTATES	8

#define CPUID_MWAIT_LEAF (5)

#define CPUID5_ECX_EXTENSIONS_SUPPORTED (0x1)

#define CPUID5_ECX_INTERRUPT_BREAK	(0x2)



static struct cpuidle_driver intel_idle_driver = {

	.name = "intel_idle",

	.owner = THIS_MODULE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE