From nobody Fri Dec 19 00:35:30 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 8873B13A250 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=1716245212; cv=none; b=npyGuWqanVzC6UsOi2NesRc1VH1ry0lGiSH0I98S786T2dE/sEiLe92O2151LYa1FWtuuMncR0skMqey6N1QJ8xqVl8wAcnwsOcm2mYswpQhbp5tNI2rRJx2qTGLvc9MMvqutzHyQMDgtnXr9489PUkodUhKnk2J6vKDU/MCs4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716245212; c=relaxed/simple; bh=3WkOU6MGepSbNzlZYklRMkoGMRR4hELasBxQk7ecM/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OpDel/6lZC//cztkKhZgP4C8zsKGQeM7W+UI+oOmbZM0Rsza7qcJOO3/PiuEcw7q8XN/JJeIrfWqJ8CNcMISU8fnhLy6hDNts8It46ST69QKzWA0j0Szm/0zNem1rqbf7XcuUgBnr73aP6vol6zDieFPwmZTmRqi3DrBry06h2M= 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=E3ciYy8L; 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="E3ciYy8L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716245210; x=1747781210; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3WkOU6MGepSbNzlZYklRMkoGMRR4hELasBxQk7ecM/M=; b=E3ciYy8LjO434GafJB1+ZDV/eSDqUukpZjMeEDGeqbDhubk1G+hdedF4 4f3KOrbFPaGFcndZJyGFDqTTx4I2wEJCx1+OjvFZ0KXygoUA7mvKGy6Ex dOjZa0LxLnBfrxdULEFHyRzD9efyB9mV93vJ1ef98CC0GfpJE4oNeLYEq pzlE6VkTX1JvEBSa8PPGT4TPGZ3ubnBDNidIeswTdzTV7yMOnpklfGuGD xeUYrFV6zDOnsWnr8t7cdGyPxLBaA/xzFvG+UVDxe0NRJlEdA+hpwDhUh /sZI/yamzbQniGaxyvVvwpe2OYT7pccemFwv7zRlKliHZcSox5s+uQQp8 w==; X-CSE-ConnectionGUID: qVZ177c+QKW1SvH2FUoaEQ== X-CSE-MsgGUID: qz9WyzemQqWbnHqxOJ4fiw== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12199806" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="12199806" 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: jFJhqsSdRmmykK9g8P5rJQ== X-CSE-MsgGUID: 8mxoelrKRayXkmN67REZ2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32593463" 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 27/49] crypto: x86/twofish - Switch to new Intel CPU model defines Date: Mon, 20 May 2024 15:45:58 -0700 Message-ID: <20240520224620.9480-28-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/twofish_glue_3way.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_= glue_3way.c index 90454cf18e0d..82311249048f 100644 --- a/arch/x86/crypto/twofish_glue_3way.c +++ b/arch/x86/crypto/twofish_glue_3way.c @@ -12,6 +12,8 @@ #include #include =20 +#include + #include "twofish.h" #include "ecb_cbc_helpers.h" =20 @@ -107,10 +109,10 @@ static bool is_blacklisted_cpu(void) if (boot_cpu_data.x86_vendor !=3D X86_VENDOR_INTEL) return false; =20 - if (boot_cpu_data.x86 =3D=3D 0x06 && - (boot_cpu_data.x86_model =3D=3D 0x1c || - boot_cpu_data.x86_model =3D=3D 0x26 || - boot_cpu_data.x86_model =3D=3D 0x36)) { + switch (boot_cpu_data.x86_vfm) { + case INTEL_ATOM_BONNELL: + case INTEL_ATOM_BONNELL_MID: + case INTEL_ATOM_SALTWELL: /* * On Atom, twofish-3way is slower than original assembler * implementation. Twofish-3way trades off some performance in --=20 2.45.0