From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 430166BFD2 for ; Tue, 16 Apr 2024 21:20:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302402; cv=none; b=b43aec+5ufSzwhaIg64s7F4P7Q9FenIj1MGDYAmFnu5jvvhM3Ly3botLhv2axbun5Uw8NXKflbdu72IYxEWwTfl8aFyZgx/dB7RGCrRpTKRWMO2wnLLXVjQFLmc6emzIgywewdu1V0iDsBKauEfPu/yhX8VNSV4kr+MG2IY48dY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302402; c=relaxed/simple; bh=AAxq3Dn0QuXe2vl7CnrIifkDHLAbXL8hnyPhGpmPU4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFxsleUai0ThzPLlWNMR+DxkLRe259NWug0PP5MJUyPlopQbrA5LnitKBsH/NpsU5SMoEwr3zLeCMcBl2w89Fe9eQTaLdfrOclvhi42Y6BUNW6PvX9e91FYHulgeQIVrZvpNw3+1avE77pYIrcQgWpveoy3ZGlKUrXA4GBqukqQ= 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=machQB9/; arc=none smtp.client-ip=198.175.65.13 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="machQB9/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302400; x=1744838400; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AAxq3Dn0QuXe2vl7CnrIifkDHLAbXL8hnyPhGpmPU4g=; b=machQB9/kGMqfoXA0qXu7wioxaectU29Qk0NrgF6rFYLOnLK1VvBs4az v65ItCuxI6+CNcDJPlOhCfC247kQv2wAinI1T7HMJat6hfK2gc3vLd4fa YGb8pj/xNzhwEA7YpJPsVmhH6hEXu9+mdqHTD/L5s155C2KRsJwvCoNU9 hr1z1dwQ0ZH6Hptp5x+ykTPx9u/MNuqbRzBzqBuXb4B6L2HUnqaea1Fip 9Z5SLi+Z/vr4QcczbEZWlBU37ynxGiWDtgxKYbJnvFakhLkZEmGBtK4Bc Lx8LNvFrNbPJRWE3WBzqFZJ0tBkstkt1ePbOicrzOK4JTRYJpdi5CYxPR w==; X-CSE-ConnectionGUID: 6HM8+pZTR5690SZbcybuVQ== X-CSE-MsgGUID: WwWha83pS+SWjyyB8sidnA== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="19914686" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="19914686" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:19:57 -0700 X-CSE-ConnectionGUID: lfmOZzp3QUakIJxXmm9qBg== X-CSE-MsgGUID: OAv0MYosRCOYhnnAWgnwkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22871883" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:19:57 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v3 04/74] x86/cpu/vfm: Update arch/x86/crypto/poly1305_glue.c Date: Tue, 16 Apr 2024 14:19:06 -0700 Message-ID: <20240416211941.9369-5-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416211941.9369-1-tony.luck@intel.com> References: <20240416211941.9369-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- arch/x86/crypto/poly1305_glue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c index 1dfb8af48a3c..9738995080bc 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -269,7 +270,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_MASK_AVX512, NULL) && /* Skylake downclocks unacceptably much when using zmm, but later generations are fast. */ - boot_cpu_data.x86_model != INTEL_FAM6_SKYLAKE_X) + boot_cpu_data.x86_vfm != INTEL_SKYLAKE_X) static_branch_enable(&poly1305_use_avx512); return IS_REACHABLE(CONFIG_CRYPTO_HASH) ? crypto_register_shash(&alg) : 0; } -- 2.44.0