2013-04-17 22:42:38

by Len Brown

Subject: 2 idle patches for 3.9-rc7

Here are two stragglers for 3.9.
Let me know if you have any troubles with them.

thanks,
Len Brown, Intel Open Source Technology Center

2013-04-17 22:42:57

by Len Brown

Subject: [PATCH 2/2] tools/power turbostat: additional Haswell CPU-id

From: Len Brown <[email protected]>

There is an additional HSW CPU-id, 0x46,
which has C-states exactly like CPU-id 0x45.

Signed-off-by: Len Brown <[email protected]>
---
tools/power/x86/turbostat/turbostat.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 6f3214e..321e066 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 <[email protected]>\n");

turbostat_init();
--
1.8.2.1.422.gdcd8c09

2013-04-17 22:43:02

by Len Brown

Subject: [PATCH 1/2] intel_idle: additional Haswell CPU-id

From: Len Brown <[email protected]>

There is an additional HSW CPU-id, 0x46,
which has C-states exactly like CPU-id 0x45.

Signed-off-by: Len Brown <[email protected]>
---
drivers/idle/intel_idle.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 5d66750..1a38dd7 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -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);
--
1.8.2.1.422.gdcd8c09

2013-04-18 09:11:12

by Daniel Lezcano

Subject: Re: [PATCH 1/2] intel_idle: additional Haswell CPU-id

On 04/18/2013 12:42 AM, Len Brown wrote:
> From: Len Brown <[email protected]>
>
> There is an additional HSW CPU-id, 0x46,
> which has C-states exactly like CPU-id 0x45.
>
> Signed-off-by: Len Brown <[email protected]>
> ---
> drivers/idle/intel_idle.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> index 5d66750..1a38dd7 100644
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -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);

Hi Len,

I jump on the opportunity to remind you, we are waiting for your
ack/nack for the patch:

http://permalink.gmane.org/gmane.linux.ports.tegra/10422

Thanks
-- Daniel



--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog