From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752572Ab2GaEVQ (ORCPT ); Tue, 31 Jul 2012 00:21:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56013 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751455Ab2GaEVO (ORCPT ); Tue, 31 Jul 2012 00:21:14 -0400 Date: Tue, 31 Jul 2012 14:20:49 +1000 From: NeilBrown To: Suresh Siddha Cc: hpa@zytor.com, james.t.kukunas@linux.intel.com, LKML Subject: Re: [patch] x86, avx: don't use avx instructions with "noxsave" boot param Message-ID: <20120731142049.7d0ab5f9@notabene.brown> In-Reply-To: <1343688375.3696.597.camel@sbsiddha-desk.sc.intel.com> References: <1343688375.3696.597.camel@sbsiddha-desk.sc.intel.com> X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.7; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/_y4eEDpxXJykoB9uikilFv_"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/_y4eEDpxXJykoB9uikilFv_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Mon, 30 Jul 2012 15:46:15 -0700 Suresh Siddha wrote: > Check the kernel has indeed enabled xsave before using AVX instructions. >=20 > Fixes the kernel boot panic with "noxsave" boot parameter. >=20 > Signed-off-by: Suresh Siddha Looks consistent with other usage - thanks. Applied. Should it go in '-stable' kernels too? NeilBrown > --- > arch/x86/include/asm/xor_avx.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_av= x.h > index 2510d35..77987cd 100644 > --- a/arch/x86/include/asm/xor_avx.h > +++ b/arch/x86/include/asm/xor_avx.h > @@ -197,12 +197,12 @@ static struct xor_block_template xor_block_avx =3D { > =20 > #define AVX_XOR_SPEED \ > do { \ > - if (cpu_has_avx) \ > + if (cpu_has_avx && cpu_has_osxsave) \ > xor_speed(&xor_block_avx); \ > } while (0) > =20 > #define AVX_SELECT(FASTEST) \ > - (cpu_has_avx ? &xor_block_avx : FASTEST) > + ((cpu_has_avx && cpu_has_osxsave) ? &xor_block_avx : FASTEST) > =20 > #else > =20 >=20 --Sig_/_y4eEDpxXJykoB9uikilFv_ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQIVAwUBUBddITnsnt1WYoG5AQI2oRAAoPYPQIXPFpvyDG2dRZlSrsWnig0hfoLG bnjkIYTqYBPJpv7SZLDYiSyX84ys882p9RtqWd+SW0H56U+oKMweKMyEHDQGfhL/ hD58dnSicYgI/1XdyjMd1+tAdhMrYbZJHcx6rMqsgTuFIEEx2StqQorucnEVdv/s 3PaKRu4BMLvvFBOD3No1BEyGBid2d0qHqGexyzqbm4Vky5p6JtHKqetj7t3ACn10 TA8iGJLxEzK/AypDO8HFzwqtKq0uMkzAZEO5UkPLDYkMCm+DHq6YmN6sleYd+d0/ eWCrOPUv0RZnrHVMI7/wLXyVbw5aEqe0wsa/0LcR3ERPPHLbmUGkbzW/KnvH2azY N+ARpsqPjbQwlqJZCI5PoydVVL3JU4iTp74CFGk4Z4QHLKZRWrwtlOrp8C6nGTjj zavqe1s5/thFrrbnA/62Q5pZvDyqobWi6iWapuALD3ykbWN2RFF17ejgwkn5AtAH ADQUnXRr7hy0kM1Nw6Z75uLxM4RQ/QvcCcmRX/zRsUN/XsiN/L6zGcVGxoYdpS/n 33gbP11ixPZrAo5JLLMUdm5FXq31rIcusLTUO06kfaJRe0aaAzDkZMb9pcdp0a5N o7pHSKsmESIFmDQX7PgknAu1UiyjiLn/G3hVG88pWTsC7VtggH0vBDtThjcTvdqs VMEYHddZtfg= =9hq5 -----END PGP SIGNATURE----- --Sig_/_y4eEDpxXJykoB9uikilFv_--