From nobody Fri Dec 19 00:34:45 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 550F413BC2F for ; Mon, 20 May 2024 22:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245211; cv=none; b=aPplTXm57pGtg/vtdkr7plHhEK3B4qsM9EW5C6Bngc0V2jrndEZDIZaSXGkyDp419DvLvt6vByY/zkLmi5bmv4GElvrMRriF5Upns4sak5aZzKO75xnfeGFZKWL88vxsATEXHyOeddYJp+yEXr5xe8FsuYR5T2fnFOinhYPRaKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245211; c=relaxed/simple; bh=3xWAckKLedIRwhhdnl1v4yxZLvPVQHJ+27f28hvh3oU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pmcsDCcqmb17Q9r+gn0LfbSJrq+ddLcJ1TSjyZusxKdWMrxaQK0yMS+al9qWUndGEXCpXULiRx7Luz2FGh+Pdu7QTHq4EWwjuXpk/X7prBNeh6Ndx2gLxfuaZLcVpyeiUUD6g2upNemUws7BtP06fWxFenGLuWgLua5QbEAU9Nc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=NDIPZWCc; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="NDIPZWCc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245209; x=1747781209; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3xWAckKLedIRwhhdnl1v4yxZLvPVQHJ+27f28hvh3oU=; b=NDIPZWCcq2FfOTuFzkRC/7emjTspGRQl6EQuD6zNJVdKD4gcRn3eJEvJ +QUWa40yAH5phNbLo2AeXtjXRJfuK4sKSf6i9j34m+8KkZh2moG7W1yw0 CiaGIQ2EQxRXwrQShig2Ela4IRpJr5m1wuumY9kMQ+GifAGTLhojf1axF n5q+uj6GGeMXJ21h8aFCKR/uyFBsYRfzIx25huSVNgXnTVfYeanCAsynt mX0Ifhw8rbDxLg4bmGODBqOFA+JEN2DMtq2tK6y01yrJFocKwCyLiOJPq uYGbxHeTfVVxT16GW57ugHDOSQycMT/Ud+HQrLwmG7dFqX09hlJvu5Yn1 w==; X-CSE-ConnectionGUID: gacjDGHCRRqwYhdSOiP2Cg== X-CSE-MsgGUID: BInRG8LdRCKH1jwwfahLRw== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12199789" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12199789" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:38 -0700 X-CSE-ConnectionGUID: E2xYQU4GSbqWd4uI7Ldm0w== X-CSE-MsgGUID: CP8JBdBpRDyt4+UbVW5oMQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593460" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 15:46:38 -0700 From: Tony Luck To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , "Peter Zijlstra (Intel)" , Uros Bizjak , Rick Edgecombe , Arnd Bergmann , Tony Luck , Mateusz Guzik , Thomas Renninger , Andi Kleen , linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v6 26/49] crypto: x86/poly1305 - Switch to new Intel CPU model defines Date: Mon, 20 May 2024 15:45:57 -0700 Message-ID: <20240520224620.9480-27-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240520224620.9480-1-tony.luck@intel.com> References: <20240520224620.9480-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- arch/x86/crypto/poly1305_glue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glu= e.c index 1dfb8af48a3c..08ff4b489f7e 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include =20 asmlinkage void poly1305_init_x86_64(void *ctx, @@ -269,7 +269,7 @@ static int __init poly1305_simd_mod_init(void) boot_cpu_has(X86_FEATURE_AVX2) && boot_cpu_has(X86_FEATURE_AVX512F) && cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | XFEATURE_MA= SK_AVX512, NULL) && /* Skylake downclocks unacceptably much when using zmm, but later gen= erations are fast. */ - boot_cpu_data.x86_model !=3D INTEL_FAM6_SKYLAKE_X) + boot_cpu_data.x86_vfm !=3D INTEL_SKYLAKE_X) static_branch_enable(&poly1305_use_avx512); return IS_REACHABLE(CONFIG_CRYPTO_HASH) ? crypto_register_shash(&alg) : 0; } --=20 2.45.0