diff options
| author | Len Brown <len.brown@intel.com> | 2013-03-15 10:58:02 -0400 | 
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-03-15 11:05:26 -0400 | 
| commit | 149c2319c6316d979de90ce2c8665e9c02d5927b (patch) | |
| tree | 6a7a880ef8067c32877631a31df8627fa376c587 | |
| parent | 0b15841b0bbbde75134a777c543dc51fe6187108 (diff) | |
| download | olio-linux-3.10-149c2319c6316d979de90ce2c8665e9c02d5927b.tar.xz olio-linux-3.10-149c2319c6316d979de90ce2c8665e9c02d5927b.zip | |
tools/power turbostat: additional Haswell CPU-id
There is an additional HSW CPU-id, 0x46,
which has C-states exactly like CPU-id 0x45.
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 6f3214ed444..321e066a075 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -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(); |