[Fwd: FW: linux-next: manual merge of the crypto tree]

[Fwd: FW: linux-next: manual merge of the crypto tree]

[Austin Zhang]

A standalone patch to add sse42 flags.
(But, Ingo, I thought this would still make conflicts when Stephen want to merge into crypto tree, right?)
---
 cpufeature.h |    2 ++
 1 file changed, 2 insertions(+)

diff -Naurp linux-2.6-tip/include/asm-x86/cpufeature.h linux-2.6-tip-patch/include/asm-x86/cpufeature.h
--- linux-2.6-tip/include/asm-x86/cpufeature.h	2008-08-25 13:38:30.000000000 -0400
+++ linux-2.6-tip-patch/include/asm-x86/cpufeature.h	2008-08-25 06:17:07.000000000 -0400
@@ -92,6 +92,7 @@
 #define X86_FEATURE_CX16	(4*32+13) /* CMPXCHG16B */
 #define X86_FEATURE_XTPR	(4*32+14) /* Send Task Priority Messages */
 #define X86_FEATURE_DCA		(4*32+18) /* Direct Cache Access */
+#define X86_FEATURE_XMM4_2	(4*32+20) /* Streaming SIMD Extensions-4.2 */
 #define X86_FEATURE_X2APIC	(4*32+21) /* x2APIC */
 #define X86_FEATURE_XSAVE	(4*32+26) /* XSAVE */
 
@@ -192,6 +193,7 @@ extern const char * const x86_power_flag
 #define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)
 #define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
 #define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)
+#define cpu_has_xmm4_2		boot_cpu_has(X86_FEATURE_XMM4_2)
 #define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)
 #define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)
 


-----Original Message-----
From: Zhang, Austin 
Sent: 2008年8月25日 16:05
To: 'Ingo Molnar'; Herbert Xu
Cc: Stephen Rothwell; linux-next@vger.kernel.org; Siddha, Suresh B; Thomas Gleixner; H. Peter Anvin
Subject: RE: linux-next: manual merge of the crypto tree

>> new x86 feature bits should definitely show up in the x86 tree too
So can we add sse4.1 into this patch also as: 
#define X86_FEATURE_XMM4_1	(4*32+19)
even though now no obvious user is asking it in kernel. 

-----Original Message-----
From: Ingo Molnar [mailto:mingo@elte.hu] 
Sent: 2008年8月25日 15:39
To: Herbert Xu
Cc: Stephen Rothwell; linux-next@vger.kernel.org; Siddha, Suresh B; Zhang, Austin; Thomas Gleixner; H. Peter Anvin
Subject: Re: linux-next: manual merge of the crypto tree


* Herbert Xu <herbert@gondor.apana.org.au> wrote:

> On Mon, Aug 25, 2008 at 04:44:18PM +1000, Stephen Rothwell wrote:
> > 
> > On Thu, 7 Aug 2008 13:35:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the crypto tree got a conflict in
> > > include/asm-x86/cpufeature.h between commit
> > > 32e1d0a0651004f5fe47f85a2a5c725ad579a90c ("x64, x2apic/intr-remap: cpuid
> > > bits for x2apic feature") from the x86 tree and commit
> > > 1f4f8a5d7935c81b5b3c7601ec9ac021db30ba4f ("crypto: crc32c - Use Intel
> > > CRC32 instruction") from the crypto tree.
> > > 
> > > Just simple overlapping additions.  I added both of them and can carry
> > > the fixup.
> > 
> > This now also conflicts with commit
> > a648bf4632628c787abb0514277f2a231fca39ca ("x86, xsave: xsave cpuid
> > feature bits") from the x86 tree.
> > 
> > The fixup looks like below.  Maybe the X86_FEATURE_XMM4_2 bits could also
> 
> Yep looks good.
> 
> > be added in the x86 tree.
> 
> Sure that sounds like a good idea.

new x86 feature bits should definitely show up in the x86 tree too. 
Could you please send a standalone patch that only touches the .h file, 
which could be applied to v2.6.27 as well? Thanks,

	Ingo

Re: [Fwd: FW: linux-next: manual merge of the crypto tree]

[Ingo Molnar]

* Austin Zhang <austin_zhang@linux.intel.com> wrote:

> A standalone patch to add sse42 flags.

a proper changelog with signoffs, etc. would be nice.

> (But, Ingo, I thought this would still make conflicts when Stephen 
> want to merge into crypto tree, right?)

i can make the commit a separate branch that you can pull. (without 
pulling anything else)

(as long as the crypto tree is git based, which i assume it is.)

	Ingo

Re: [Fwd: FW: linux-next: manual merge of the crypto tree]

[Herbert Xu]

On Mon, Aug 25, 2008 at 02:32:46PM +0200, Ingo Molnar wrote:
>
> i can make the commit a separate branch that you can pull. (without 
> pulling anything else)
> 
> (as long as the crypto tree is git based, which i assume it is.)

Yes that would be very nice.  Thanks Ingo!
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [Fwd: FW: linux-next: manual merge of the crypto tree]

[Austin Zhang]

Added Intel processor SSE4.2 feature flag.

Signed-off-by: Austin Zhang <austin.zhang@intel.com>
---
 cpufeature.h |    2 ++
 1 file changed, 2 insertions(+)

diff -Naurp linux-2.6-tip/include/asm-x86/cpufeature.h linux-2.6-tip-patch/include/asm-x86/cpufeature.h
--- linux-2.6-tip/include/asm-x86/cpufeature.h	2008-08-25 13:38:30.000000000 -0400
+++ linux-2.6-tip-patch/include/asm-x86/cpufeature.h	2008-08-25 06:17:07.000000000 -0400
@@ -92,6 +92,7 @@
 #define X86_FEATURE_CX16	(4*32+13) /* CMPXCHG16B */
 #define X86_FEATURE_XTPR	(4*32+14) /* Send Task Priority Messages */
 #define X86_FEATURE_DCA		(4*32+18) /* Direct Cache Access */
+#define X86_FEATURE_XMM4_2	(4*32+20) /* Streaming SIMD Extensions-4.2 */
 #define X86_FEATURE_X2APIC	(4*32+21) /* x2APIC */
 #define X86_FEATURE_XSAVE	(4*32+26) /* XSAVE */
 
@@ -192,6 +193,7 @@ extern const char * const x86_power_flag
 #define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)
 #define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
 #define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)
+#define cpu_has_xmm4_2		boot_cpu_has(X86_FEATURE_XMM4_2)
 #define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)
 #define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)
 

On Mon, 2008-08-25 at 14:32 +0200, Ingo Molnar wrote:
> * Austin Zhang <austin_zhang@linux.intel.com> wrote:
> 
> > A standalone patch to add sse42 flags.
> 
> a proper changelog with signoffs, etc. would be nice.
> 
> > (But, Ingo, I thought this would still make conflicts when Stephen 
> > want to merge into crypto tree, right?)
> 
> i can make the commit a separate branch that you can pull. (without 
> pulling anything else)
> 
> (as long as the crypto tree is git based, which i assume it is.)
> 
> 	Ingo

Re: [Fwd: FW: linux-next: manual merge of the crypto tree]

[Ingo Molnar]

* Austin Zhang <austin_zhang@linux.intel.com> wrote:

> Added Intel processor SSE4.2 feature flag.

applied to tip/x86/urgent, thanks Austin.

	Ingo