Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9a7bed4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpuidle' of... 

Merge branch 'cpuidle' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpuidle

Pull an intel_idle update for v4.3 from Len Brown.

* 'cpuidle' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: Skylake Client Support - updated
parents 9ffecb10 135919a3

drivers/idle/intel_idle.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -620,7 +620,7 @@ static struct cpuidle_state skl_cstates[] = { 
		.name = "C6-SKL",

		.name = "C6-SKL",

		.desc = "MWAIT 0x20",

		.desc = "MWAIT 0x20",

		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,

		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 75,

		.exit_latency = 85,

		.target_residency = 200,

		.target_residency = 200,

		.enter = &intel_idle,

		.enter = &intel_idle,

		.enter_freeze = intel_idle_freeze, },

		.enter_freeze = intel_idle_freeze, },
@@ -636,10 +636,18 @@ static struct cpuidle_state skl_cstates[] = { 
		.name = "C8-SKL",

		.name = "C8-SKL",

		.desc = "MWAIT 0x40",

		.desc = "MWAIT 0x40",

		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,

		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 174,

		.exit_latency = 200,

		.target_residency = 800,

		.target_residency = 800,

		.enter = &intel_idle,

		.enter = &intel_idle,

		.enter_freeze = intel_idle_freeze, },

		.enter_freeze = intel_idle_freeze, },

	{

		.name = "C9-SKL",

		.desc = "MWAIT 0x50",

		.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 480,

		.target_residency = 5000,

		.enter = &intel_idle,

		.enter_freeze = intel_idle_freeze, },

	{

	{

		.name = "C10-SKL",

		.name = "C10-SKL",

		.desc = "MWAIT 0x60",

		.desc = "MWAIT 0x60",