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

Commit ebe80544 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 patches from Len Brown:
 "A pair of small patches for 3.9-rc7.

  This CPU-id should have been included in the ones that we updated
  earlier in 3.9.  This pair of patches will allow this flavor of
  Haswell to behave like the other flavors."

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: additional Haswell CPU-id
  intel_idle: additional Haswell CPU-id
parents 1ce6ec91 149c2319

drivers/idle/intel_idle.c

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ static const struct x86_cpu_id intel_idle_ids[] = { 
	ICPU(0x3c, idle_cpu_hsw),

	ICPU(0x3f, idle_cpu_hsw),

	ICPU(0x45, idle_cpu_hsw),

	ICPU(0x46, idle_cpu_hsw),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids);

tools/power/x86/turbostat/turbostat.c

+4 −1
Original line number Diff line number Diff line
@@ -1421,6 +1421,7 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model) 
	case 0x3C:	/* HSW */

	case 0x3F:	/* HSW */

	case 0x45:	/* HSW */

	case 0x46:	/* HSW */

		return 1;

	case 0x2E:	/* Nehalem-EX Xeon - Beckton */

	case 0x2F:	/* Westmere-EX Xeon - Eagleton */
@@ -1515,6 +1516,7 @@ void rapl_probe(unsigned int family, unsigned int model) 
	case 0x3C:	/* HSW */

	case 0x3F:	/* HSW */

	case 0x45:	/* HSW */

	case 0x46:	/* HSW */

		do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX;

		break;

	case 0x2D:
@@ -1754,6 +1756,7 @@ int is_snb(unsigned int family, unsigned int model) 
	case 0x3C:	/* HSW */

	case 0x3F:	/* HSW */

	case 0x45:	/* HSW */

	case 0x46:	/* HSW */

		return 1;

	}

	return 0;
@@ -2276,7 +2279,7 @@ int main(int argc, char **argv) 
	cmdline(argc, argv);



	if (verbose)

		fprintf(stderr, "turbostat v3.2 February 11, 2013"

		fprintf(stderr, "turbostat v3.3 March 15, 2013"

			" - Len Brown <lenb@kernel.org>\n");



	turbostat_init();