Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp240373lqb; Tue, 16 Apr 2024 14:22:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWrVRak5FcBMG5T2y/l0a8Fxa7uEMNeCtI9CT4wS6eq4lyajOMvr5z+yrrt4typAAg+bfjaFkIJiYWei1/3YlLfUj/oHjPrR6pbDex3xA== X-Google-Smtp-Source: AGHT+IHUsrQbZp456gi4z290mBYAvMEGrzobi2CpLUFSqYKhtvRtQfS1UuW+I4Vp8Rsn8i0Qb0dg X-Received: by 2002:a17:902:7482:b0:1e5:7216:cfdb with SMTP id h2-20020a170902748200b001e57216cfdbmr16546284pll.35.1713302571759; Tue, 16 Apr 2024 14:22:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713302571; cv=pass; d=google.com; s=arc-20160816; b=Yi7t6jL3AX9KGIXuOCU99peSSeFSJj1WOnWqQPIVNfRFqgrdCiPRJtNxRBV6Sz++FV Gi7NAwm0DlS4Mdkrts5sjD1kuTQDZ829kx0nHv8iFlZJ6wCrtY6WqE5XasLmvyEO2+r+ kdWaGOuZ6vP71uE1hNxzTY999lcy0LlzeB1DLli9gO/X8T3cDNuXr3BvKrQrcRly6pbW RH5dQkkTIsYPnXJbSftmUfWeuNxhzR+YhqbyoWOB+Hgpqy0deaB5MWbCaYXwLATk+RJ7 FgXKAORn0UDg2N2OEbP74aa2zGorrYAvphNLFnnkKuceUI1iA8cccV+ll3WrqDza9Xvv HXxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=wGjXG1m6gP4Ag+wUdDVt4enbuTF5Z2pWIZpBRMxUr44=; fh=fCCNFvJbPqqXo45yXdlgqaDimb/JVSzwDZSVTcpWFog=; b=L2Ji/WrUQ/798kd89qRwWJ1zE0Acef31r1w7/0e6ipO6o9XPzlsLTpL+pcNh8La0Zr /O7AteXBXcUGwXd/GNBT1HuRWGtwKSTWYXSQfqlfVQJo0E5PBlMSiCo7/T2Kk65Y5c+n 0jeTiXdyaggY7N27IxPNEi+v6JZdeJIP7HgUeNB/CcNeAJeanKjFwhIRaBVK76lNFi3K N/0r8cWI8w/K3hNvtWIPK2kALuFXfYJ+lr7Toy7nUpxhUWAJJzvcF+CjYR63qEp/AIkQ 1aHClUFExJdleXkuCv0p0gm/WFnthGNNHg5mDV4eZiosTbWuWkHHtZU1mZ+luUxAZr8J N4cQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IuRTx1Bd; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-147576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147576-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id p23-20020a1709027ed700b001e589306d73si8809140plb.26.2024.04.16.14.22.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 14:22:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-147576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IuRTx1Bd; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-147576-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147576-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2AEF3282AA9 for ; Tue, 16 Apr 2024 21:22:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3AFCD13C3D3; Tue, 16 Apr 2024 21:20:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IuRTx1Bd" 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 D0BA513A403 for ; Tue, 16 Apr 2024 21:20:04 +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=1713302406; cv=none; b=SZcLTDHKUxeaIqB7DRtWOgI9IH2hhypts7MB/a9TMEgySH71YwhDYeIullYpliL2Usy1x0FP7iY+V7WK11Q4H6lzop5oD0fkp4oEfvliCYhfBJx9BlLTsAkNas8Lare+yu3slIRnq0KCDWrPRQHKNKOH9o5M1jU9lz3t6/ukG9o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302406; c=relaxed/simple; bh=eG+ObRK9OWYeF0qpPClL+eIH5Z0ykTXrKTfDIbFpAOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZYkQJBeepb/jbKWPQLnQ+xRAiKPGhYL99MuhgQ1sgrlsHW1uWa4Rp/6jd/haMlTHwW64I0JBMmx7ZRtabdE43ax/k+8/V9HEWUf6542kb/eESjp0Vi9IBfzOlUk5xXQd/vysytPYTrvLd03iTGH72qfuc2pqL2oWEv8MlQnKP1Y= 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=IuRTx1Bd; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302405; x=1744838405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eG+ObRK9OWYeF0qpPClL+eIH5Z0ykTXrKTfDIbFpAOw=; b=IuRTx1BdZwgiUHcyd5YTuY/X42T0uMPalJtmDFzVj+doY+X7TuGMbzBC NHZ0AwBEnG/Mf8u2byOwjkZYQ0i58jXuj4UTxKyW4BQCo7sKytPcVmTHp Rafe3Mswu3BJQisN++26mku0dd4r/DFhNMJsARTRemT6Rw+Nh9Z8CNrKM QENfK7t0LeM3b8UHcZYZZvkFK1iASki+tdYkHZf/E1BtDWu+A1JWiqNQI uzMW/BCqTC/y/5iuLamt4pnwYHLC1VArgzSTuEF0C6fR+7USnP7mmKtDR 3ck39Vq1Muity9Bl/xd02uBD8XJzmTVDHKFOLm4J/7TqrWT+gyPkcnsu1 g==; X-CSE-ConnectionGUID: NMdubsSvT2+j01JG+oBfcA== X-CSE-MsgGUID: FxVNC/0hR76D9XhHCTfKxw== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="19914735" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="19914735" 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:59 -0700 X-CSE-ConnectionGUID: ddUWVdmxTVWRD4LrJ3Svxw== X-CSE-MsgGUID: aveIVrY4ThuRDVMOroWgAg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22871930" 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:59 -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 16/74] x86/cpu/vfm: Update arch/x86/kernel/cpu/bugs.c Date: Tue, 16 Apr 2024 14:19:18 -0700 Message-ID: <20240416211941.9369-17-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: linux-kernel@vger.kernel.org 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/kernel/cpu/bugs.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index ab18185894df..896d4e2150fe 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -2391,20 +2392,20 @@ static void override_cache_bits(struct cpuinfo_x86 *c) if (c->x86 != 6) return; - switch (c->x86_model) { - case INTEL_FAM6_NEHALEM: - case INTEL_FAM6_WESTMERE: - case INTEL_FAM6_SANDYBRIDGE: - case INTEL_FAM6_IVYBRIDGE: - case INTEL_FAM6_HASWELL: - case INTEL_FAM6_HASWELL_L: - case INTEL_FAM6_HASWELL_G: - case INTEL_FAM6_BROADWELL: - case INTEL_FAM6_BROADWELL_G: - case INTEL_FAM6_SKYLAKE_L: - case INTEL_FAM6_SKYLAKE: - case INTEL_FAM6_KABYLAKE_L: - case INTEL_FAM6_KABYLAKE: + switch (c->x86_vfm) { + case INTEL_NEHALEM: + case INTEL_WESTMERE: + case INTEL_SANDYBRIDGE: + case INTEL_IVYBRIDGE: + case INTEL_HASWELL: + case INTEL_HASWELL_L: + case INTEL_HASWELL_G: + case INTEL_BROADWELL: + case INTEL_BROADWELL_G: + case INTEL_SKYLAKE_L: + case INTEL_SKYLAKE: + case INTEL_KABYLAKE_L: + case INTEL_KABYLAKE: if (c->x86_cache_bits < 44) c->x86_cache_bits = 44; break; -- 2.44.0