From mboxrd@z Thu Jan 1 00:00:00 1970 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 D869E3D3BC for ; Mon, 20 May 2024 22:46:36 +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=1716245198; cv=none; b=FxvLuOQurLHOmVkL/TtH8+1Dv6HCMuDotBL6hJ+HAG1tmcVz5SeoVLKV4kpShvMfTrpcQGGHiL5d50BytqGuwJLEcd+nmXST49Oza5CU4OX4jhVGCwU05YwegwS/l43ioL4c7V+kOKeJ/pO0FFgyE8F+NnGcqH6OahzfQalOOJ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245198; c=relaxed/simple; bh=kIehCYoVRHdNFqIBmNYxgDHHhCKlxbzEjpk5eAB0vUE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kdBM/+YdyeiSnXWCWZDCmi+Md0k/EI1Dr6MFBgs/H4ZOkX5qeieAHUedhXjC5SRxKM4T3obO8aonyZJwWg4Uz8auZfYWaI0c0AqmY+QbkaxUezyZMCNJBuzPlwyCOnKbCk7FuQacAj4bF6mm9/5GxzijQukF5DGp2S4GALfqxYk= 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=R1Vo+YKp; 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="R1Vo+YKp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245197; x=1747781197; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kIehCYoVRHdNFqIBmNYxgDHHhCKlxbzEjpk5eAB0vUE=; b=R1Vo+YKpkuofHimMu8nTM0InHiqV+j97L3Te085V3Is7PYmWUEe3UuFm tqyt/NmCXYIeIp+dBE/gHE32QdGEYofnoCsoBWESfFijI1dXrvrYBR1UW pPS4nNRB2wSGRagnjwkYUaoKJ4E26SIg5nJdXHhdT4Bx5KbixTZBIIU3K mywXJD2Utdnn7ih8TR2c9NMleP2xL9OnH0Xl3r4PSL24Y7PKZo4vCa4jJ Ua9qnWfRls6MOglLb0wdnJa5l7QSchqx/ECrIdfEDDfkDp5juZi/GQt/r LjHjpltSaIvhdSqxwYOMNwbQFvVeWIxfOZZ54MN+6YOVLo0JGlAbAfrn1 A==; X-CSE-ConnectionGUID: FmynmhADS+6T8S0zMOAbug== X-CSE-MsgGUID: Vn6CIjk9QnikxX3JP+YJQQ== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12199513" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12199513" 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:35 -0700 X-CSE-ConnectionGUID: 7zCOw3olTjmXtHS6hd08jg== X-CSE-MsgGUID: Uc5pQ15xRMCSMMfd0vta5w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593382" 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:35 -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 01/49] crypto: x86/aes-xts - Switch to new Intel CPU model defines Date: Mon, 20 May 2024 15:45:32 -0700 Message-ID: <20240520224620.9480-2-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: 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/aesni-intel_glue.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 5b25d2a58aeb..ef031655b2d3 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -1223,14 +1223,14 @@ DEFINE_XTS_ALG(vaes_avx10_512, "xts-aes-vaes-avx10_512", 800); * implementation with ymm registers (256-bit vectors) will be used instead. */ static const struct x86_cpu_id zmm_exclusion_list[] = { - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_SKYLAKE_X }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_ICELAKE_X }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_ICELAKE_D }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_ICELAKE }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_ICELAKE_L }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_ICELAKE_NNPI }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_TIGERLAKE_L }, - { .vendor = X86_VENDOR_INTEL, .family = 6, .model = INTEL_FAM6_TIGERLAKE }, + X86_MATCH_VFM(INTEL_SKYLAKE_X, 0), + X86_MATCH_VFM(INTEL_ICELAKE_X, 0), + X86_MATCH_VFM(INTEL_ICELAKE_D, 0), + X86_MATCH_VFM(INTEL_ICELAKE, 0), + X86_MATCH_VFM(INTEL_ICELAKE_L, 0), + X86_MATCH_VFM(INTEL_ICELAKE_NNPI, 0), + X86_MATCH_VFM(INTEL_TIGERLAKE_L, 0), + X86_MATCH_VFM(INTEL_TIGERLAKE, 0), /* Allow Rocket Lake and later, and Sapphire Rapids and later. */ /* Also allow AMD CPUs (starting with Zen 4, the first with AVX-512). */ {}, -- 2.45.0