Commit 49899007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull idle update from Len Brown:
 "Two Intel-platform-specific updates to intel_idle, and a cosmetic
  tweak to the turbostat utility"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: tweak whitespace in output format
  intel_idle: Broadwell support
  intel_idle: Disable Baytrail Core and Module C6 auto-demotion
parents 6fedb0ff e7c95ff3

arch/x86/include/uapi/asm/msr-index.h

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ 


#define MSR_CORE_C1_RES			0x00000660



#define MSR_CC6_DEMOTION_POLICY_CONFIG	0x00000668

#define MSR_MC6_DEMOTION_POLICY_CONFIG	0x00000669



#define MSR_AMD64_MC0_MASK		0xc0010044



#define MSR_IA32_MCx_CTL(x)		(MSR_IA32_MC0_CTL + 4*(x))

drivers/idle/intel_idle.c

+76 −1
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct idle_cpu { 
	 * Indicate which enable bits to clear here.

	 */

	unsigned long auto_demotion_disable_flags;

	bool byt_auto_demotion_disable_flag;

	bool disable_promotion_to_c1e;

};
@@ -442,6 +443,66 @@ static struct cpuidle_state hsw_cstates[] = { 
	{

		.enter = NULL }

};

static struct cpuidle_state bdw_cstates[] = {

	{

		.name = "C1-BDW",

		.desc = "MWAIT 0x00",

		.flags = MWAIT2flg(0x00) | CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 2,

		.target_residency = 2,

		.enter = &intel_idle },

	{

		.name = "C1E-BDW",

		.desc = "MWAIT 0x01",

		.flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 10,

		.target_residency = 20,

		.enter = &intel_idle },

	{

		.name = "C3-BDW",

		.desc = "MWAIT 0x10",

		.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 40,

		.target_residency = 100,

		.enter = &intel_idle },

	{

		.name = "C6-BDW",

		.desc = "MWAIT 0x20",

		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 133,

		.target_residency = 400,

		.enter = &intel_idle },

	{

		.name = "C7s-BDW",

		.desc = "MWAIT 0x32",

		.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 166,

		.target_residency = 500,

		.enter = &intel_idle },

	{

		.name = "C8-BDW",

		.desc = "MWAIT 0x40",

		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 300,

		.target_residency = 900,

		.enter = &intel_idle },

	{

		.name = "C9-BDW",

		.desc = "MWAIT 0x50",

		.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 600,

		.target_residency = 1800,

		.enter = &intel_idle },

	{

		.name = "C10-BDW",

		.desc = "MWAIT 0x60",

		.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 2600,

		.target_residency = 7700,

		.enter = &intel_idle },

	{

		.enter = NULL }

};



static struct cpuidle_state atom_cstates[] = {

	{
@@ -613,6 +674,7 @@ static const struct idle_cpu idle_cpu_snb = { 
static const struct idle_cpu idle_cpu_byt = {

	.state_table = byt_cstates,

	.disable_promotion_to_c1e = true,

	.byt_auto_demotion_disable_flag = true,

};



static const struct idle_cpu idle_cpu_ivb = {
@@ -630,6 +692,11 @@ static const struct idle_cpu idle_cpu_hsw = { 
	.disable_promotion_to_c1e = true,

};



static const struct idle_cpu idle_cpu_bdw = {

	.state_table = bdw_cstates,

	.disable_promotion_to_c1e = true,

};



static const struct idle_cpu idle_cpu_avn = {

	.state_table = avn_cstates,

	.disable_promotion_to_c1e = true,
@@ -658,7 +725,10 @@ static const struct x86_cpu_id intel_idle_ids[] = { 
	ICPU(0x3f, idle_cpu_hsw),

	ICPU(0x45, idle_cpu_hsw),

	ICPU(0x46, idle_cpu_hsw),

	ICPU(0x4D, idle_cpu_avn),

	ICPU(0x4d, idle_cpu_avn),

	ICPU(0x3d, idle_cpu_bdw),

	ICPU(0x4f, idle_cpu_bdw),

	ICPU(0x56, idle_cpu_bdw),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);
@@ -814,6 +884,11 @@ static int __init intel_idle_cpuidle_driver_init(void) 
	if (icpu->auto_demotion_disable_flags)

		on_each_cpu(auto_demotion_disable, NULL, 1);



	if (icpu->byt_auto_demotion_disable_flag) {

		wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0);

		wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0);

	}



	if (icpu->disable_promotion_to_c1e)	/* each-cpu is redundant */

		on_each_cpu(c1e_promotion_disable, NULL, 1);

tools/power/x86/turbostat/turbostat.c

+40 −40
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr) 
 * Example Format w/ field column widths:

 *

 *  Package    Core     CPU Avg_MHz Bzy_MHz TSC_MHz     SMI   %Busy CPU_%c1 CPU_%c3 CPU_%c6 CPU_%c7 CoreTmp  PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt

 * 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567

 * 123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678

 */



void print_header(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE