[PATCH 0/5] Clean up x86 CPU auto-loading

[PATCH 0/5] Clean up x86 CPU auto-loading

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

This series fixes a number of apparent bugs in the recent changes to
enable auto-loading by x86 CPU ID.

Ben.

Ben Hutchings (5):
  x86/cpu: Fix overrun check in arch_print_cpu_modalias()
  x86/cpu: Clean up modalias feature matching
  intel_idle: Fix ID for Nehalem-EX Xeon in device ID table
  intel_idle: Revert change of auto_demotion_flags for Nehalem
  powernow-k7: Fix CPU family number

 arch/x86/kernel/cpu/match.c   |    5 ++---
 drivers/cpufreq/powernow-k7.c |    2 +-
 drivers/idle/intel_idle.c     |   12 ++++--------
 scripts/mod/file2alias.c      |    5 +++--
 4 files changed, 10 insertions(+), 14 deletions(-)

-- 
1.7.9



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

[PATCH 5/5] powernow-k7: Fix CPU family number

[Ben Hutchings]

Commit fa8031aefec0cf7ea6c2387c93610d99d9659aa2 ('cpufreq: Add support
for x86 cpuinfo auto loading v4') seems to have inadvertently changed
the matched CPU family number from 6 to 7.  Change it back.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/cpufreq/powernow-k7.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 501d167..cf7e1ee 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -112,7 +112,7 @@ static int check_fsb(unsigned int fsbspeed)
 }
 
 static const struct x86_cpu_id powernow_k7_cpuids[] = {
-	{ X86_VENDOR_AMD, 7, },
+	{ X86_VENDOR_AMD, 6, },
 	{}
 };
 MODULE_DEVICE_TABLE(x86cpu, powernow_k7_cpuids);
-- 
1.7.9

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[Thomas Renninger]

On Saturday 11 February 2012 23:44:16 Ben Hutchings wrote:
> This series fixes a number of apparent bugs in the recent changes to
> enable auto-loading by x86 CPU ID.

These all look correct.
I should have spotted the intel_idle modifications myself.
Good catch(es).

Greg: I expect these should get queued in your driver-core-next branch?

Thanks,

    Thomas
> 
> Ben.
> 
> Ben Hutchings (5):
>   x86/cpu: Fix overrun check in arch_print_cpu_modalias()
>   x86/cpu: Clean up modalias feature matching
>   intel_idle: Fix ID for Nehalem-EX Xeon in device ID table
>   intel_idle: Revert change of auto_demotion_flags for Nehalem
>   powernow-k7: Fix CPU family number
> 
>  arch/x86/kernel/cpu/match.c   |    5 ++---
>  drivers/cpufreq/powernow-k7.c |    2 +-
>  drivers/idle/intel_idle.c     |   12 ++++--------
>  scripts/mod/file2alias.c      |    5 +++--
>  4 files changed, 10 insertions(+), 14 deletions(-)
> 
> -- 
> 1.7.9
> 
> 
> 

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[H. Peter Anvin]

On 02/12/2012 03:10 PM, Thomas Renninger wrote:
> On Saturday 11 February 2012 23:44:16 Ben Hutchings wrote:
>> This series fixes a number of apparent bugs in the recent changes to
>> enable auto-loading by x86 CPU ID.
> 
> These all look correct.
> I should have spotted the intel_idle modifications myself.
> Good catch(es).
> 
> Greg: I expect these should get queued in your driver-core-next branch?
> 

Either that or we can carry them in -tip as x86 patches, since there
isn't a pending conflict this time.

	-hpa


-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[Greg KH]

On Mon, Feb 13, 2012 at 12:10:56AM +0100, Thomas Renninger wrote:
> On Saturday 11 February 2012 23:44:16 Ben Hutchings wrote:
> > This series fixes a number of apparent bugs in the recent changes to
> > enable auto-loading by x86 CPU ID.
> 
> These all look correct.
> I should have spotted the intel_idle modifications myself.
> Good catch(es).
> 
> Greg: I expect these should get queued in your driver-core-next branch?

I can take them, unless the x86 maintainers object and want to take them
through their tree.

thanks,

greg k-h

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[H. Peter Anvin]

On 02/12/2012 06:18 PM, Greg KH wrote:
> I can take them, unless the x86 maintainers object and want to take them
> through their tree.

Why don't we take them... I think it makes more sense long-term.

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[Greg KH]

On Sun, Feb 12, 2012 at 07:00:31PM -0800, H. Peter Anvin wrote:
> On 02/12/2012 06:18 PM, Greg KH wrote:
> > I can take them, unless the x86 maintainers object and want to take them
> > through their tree.
> 
> Why don't we take them... I think it makes more sense long-term.

Ok, but for some reason I thought they depended on the patches already
in my driver-core-next tree.  If that's not the case, please feel free
to take them through yours.

greg k-h

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[Greg KH]

On Sun, Feb 12, 2012 at 05:26:44PM -0800, H. Peter Anvin wrote:
> On 02/12/2012 03:10 PM, Thomas Renninger wrote:
> > On Saturday 11 February 2012 23:44:16 Ben Hutchings wrote:
> >> This series fixes a number of apparent bugs in the recent changes to
> >> enable auto-loading by x86 CPU ID.
> > 
> > These all look correct.
> > I should have spotted the intel_idle modifications myself.
> > Good catch(es).
> > 
> > Greg: I expect these should get queued in your driver-core-next branch?
> > 
> 
> Either that or we can carry them in -tip as x86 patches, since there
> isn't a pending conflict this time.

Ok, if there are no dependancies on the driver-core-next tree, please
take this through the x86 trees.

thanks,

greg k-h

Re: [PATCH 0/5] Clean up x86 CPU auto-loading

[H. Peter Anvin]

On 02/13/2012 02:26 PM, Greg KH wrote:
> On Sun, Feb 12, 2012 at 05:26:44PM -0800, H. Peter Anvin wrote:
> 
> Ok, if there are no dependancies on the driver-core-next tree, please
> take this through the x86 trees.
> 

My mistake; I thought these changes were upstream already.  So yes,
please take them.

Acked-by: H. Peter Anvin <hpa@zytor.com>

	-hpa
-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.