From patchwork Wed Apr 24 18:14:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642322 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 3C6F116D9D8; Wed, 24 Apr 2024 18:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982490; cv=none; b=MPinb3uPWD99aAz/n2QtKDcrrnsM1iKuqMjTZU8T3Iki3mjWtmm/4F5YOtVPm5qH9I3mXO2gCEg+kA127RigVV/WkhhcdCEfZ7bNKdt096pWAbEmk5XpCI5mBS7/DClEjtH/rKWNcD+JeaRyfxXukTAsr1fAk5HJjgED8hv4BdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982490; c=relaxed/simple; bh=yQ5L+dbNHtvkAp/pj5zzra7nuxWzgvQKIkDpzo8Sudc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DtVkeZqv2gDfdJDwSyY7LitSTwwyt1OK3Tjik3Mrm66zjjeZVlhmFlaqLP+8L6dLV/E0attbJuW3F9uEAdMg1wJ7RNZfSlEChv1xexfycgPFwctZ08UN6ND2qffygZStsa3zwzmK+f6H4OGGtIuMvmUVVjpNrwU0ruQBZySTENc= 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=j2YH92De; arc=none smtp.client-ip=192.198.163.19 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="j2YH92De" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982488; x=1745518488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yQ5L+dbNHtvkAp/pj5zzra7nuxWzgvQKIkDpzo8Sudc=; b=j2YH92DerdBsb3j2CULYHy6xGiznmxpCkIUbkRTODj0lmdYCglH8fuG7 ZbSH8mm0KJvCtFL092gbtwibGfqA17bPjSQHCULZdtGYHFiG1ujcZFPPE UMWxSwlRfKOJB9wV5Ih6HATNUOJ+8EFJ+LISiYhLRhzzgqBI0r8g3KVc3 Kdk+KR0iLDEWdjzO58FFddm5KlctBZrLqFow9264sKloLbT/Ej+RPx8Fg YQF2DwK+TKe+3fTLUkId0JT1by2aCFYLGxpqe5GceyVg8K5hBQAwdyB8r 2BJiZnwxdzIUebt0MpMw9pTR0if7FSugLCXOhdW87DL/HjJh1Hl5njGH4 Q==; X-CSE-ConnectionGUID: Y05e2gROSh66M3N7mTXVlA== X-CSE-MsgGUID: vspZE9jjSHqK3qMPnpoRbA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503368" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503368" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:46 -0700 X-CSE-ConnectionGUID: mb43gOObTESWrDtc6+X6xA== X-CSE-MsgGUID: NiRwbu/jRtevqmqHDB1oEg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="24683653" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:46 -0700 From: Tony Luck To: Borislav Petkov , Jithu Joseph , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: Ashok Raj , Tony Luck , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 02/71] platform/x86/intel/ifs: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:14:45 -0700 Message-ID: <20240424181445.41193-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Jithu Joseph Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/platform/x86/intel/ifs/core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c index 7b11198d85a1..33412a584836 100644 --- a/drivers/platform/x86/intel/ifs/core.c +++ b/drivers/platform/x86/intel/ifs/core.c @@ -11,16 +11,15 @@ #include "ifs.h" -#define X86_MATCH(model, array_gen) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, \ - INTEL_FAM6_##model, X86_FEATURE_CORE_CAPABILITIES, array_gen) +#define X86_MATCH(vfm, array_gen) \ + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_CORE_CAPABILITIES, array_gen) static const struct x86_cpu_id ifs_cpu_ids[] __initconst = { - X86_MATCH(SAPPHIRERAPIDS_X, ARRAY_GEN0), - X86_MATCH(EMERALDRAPIDS_X, ARRAY_GEN0), - X86_MATCH(GRANITERAPIDS_X, ARRAY_GEN0), - X86_MATCH(GRANITERAPIDS_D, ARRAY_GEN0), - X86_MATCH(ATOM_CRESTMONT_X, ARRAY_GEN1), + X86_MATCH(INTEL_SAPPHIRERAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_EMERALDRAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_GRANITERAPIDS_X, ARRAY_GEN0), + X86_MATCH(INTEL_GRANITERAPIDS_D, ARRAY_GEN0), + X86_MATCH(INTEL_ATOM_CRESTMONT_X, ARRAY_GEN1), {} }; MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids); From patchwork Wed Apr 24 18:14:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642323 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 ADC2E16DEC5; Wed, 24 Apr 2024 18:15:08 +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=1713982510; cv=none; b=CZ470SctNwhAKaQfLQ6EtEKfhV1N2XeSXPc5nLY5KGhemX5hdzN8h4DOeY7XvPkBXRL5MMLee9ZOX5YO4ql5OE37V3zfgzd0XlwGhCksOhx06jy3HBQp3OfxxD5ZVLhv2zCTXLwObTHyr2EFxi4AqGoYS71NSqypf32zEWyJ5yA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982510; c=relaxed/simple; bh=7eZ3KCFeL78AbH6r5Dbnh9EHFylKrjKmvHvWxMZrAck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uABz70W54W/E29vWr3SIva6icevlCESLEd3ZVBFW4JQxRgRmH13qHVCYBP+Ng5fTQsc/tnT2g1sniisa0zcWeVtOcj0FDWik1pFJY+4wX42e/w4NG8r764vLM65lXjehXiYBxX9eZIrGDxMwnyFNCTZh15TcVb2seFE4ZCLhsWI= 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=CezJ7gAS; 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="CezJ7gAS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982508; x=1745518508; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7eZ3KCFeL78AbH6r5Dbnh9EHFylKrjKmvHvWxMZrAck=; b=CezJ7gASKigrsvMgxSgGDhIyGE19axf/iT0ijVUAry/n6C6civ3blzti DvKnTkAsdzZZs1CNnCzE1qnk3cJdeunEq8TJwBLw9NoE1BvB1+lK+fF/B kSaUVHWmVGPYefNSvkzC/5A0rboCd5vo7DGODGN/WV4AUS+bs+UiW4PNd UFZLQoxb7zLBekzF7CGNVGhYwN/ShEllY1dxRMlTWutkIjkUTxlQtfNeN 3qHHA/eiXOaDH7DINfJjhCPH2O6r4PJi/3U/4IgGd5iSNKXOowBebTRH6 9QptTkW8pLcBk7aTV41Ly8KZDigzkq/TaP3jP5Y5Wq4wit3QpZz3scNvB A==; X-CSE-ConnectionGUID: zal8ltlATqqPdPqz71pQeQ== X-CSE-MsgGUID: eEzAp0vfSuyfykgDyEssXg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9481805" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9481805" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:55 -0700 X-CSE-ConnectionGUID: B8SdKDfGSY6gXIMIt+bcpg== X-CSE-MsgGUID: amjNfRc4REOPlm9CAg1B7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="29262597" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:14:56 -0700 From: Tony Luck To: Borislav Petkov , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Srinivas Pandruvada , Tony Luck , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@lists.linux.dev, "Rafael J . Wysocki" Subject: [PATCH v4 13/71] ASoC: Intel: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:14:55 -0700 Message-ID: <20240424181455.41404-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Rafael J. Wysocki --- include/linux/platform_data/x86/soc.h | 12 ++++++------ drivers/thermal/intel/intel_soc_dts_thermal.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index a5705189e2ac..f981907a5cb0 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -20,7 +20,7 @@ static inline bool soc_intel_is_##soc(void) \ { \ static const struct x86_cpu_id soc##_cpu_ids[] = { \ - X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ + X86_MATCH_VFM(type, NULL), \ {} \ }; \ const struct x86_cpu_id *id; \ @@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ return false; \ } -SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); -SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); -SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); -SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); -SOC_INTEL_IS_CPU(cml, KABYLAKE_L); +SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT); +SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT); +SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT); +SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS); +SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L); #undef SOC_INTEL_IS_CPU diff --git a/drivers/thermal/intel/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c index 9c825c6e1f38..718c6326eaf4 100644 --- a/drivers/thermal/intel/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel/intel_soc_dts_thermal.c @@ -36,7 +36,7 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) } static const struct x86_cpu_id soc_thermal_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, BYT_SOC_DTS_APIC_IRQ), {} }; MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids); From patchwork Wed Apr 24 18:15:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642324 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 6163F16EC1E; Wed, 24 Apr 2024 18:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982537; cv=none; b=BG5NHY4fdC56F8oSvndZ4ISIlWWklF5UDupyH2HsAm6y5aIOwZvP08+CvJqB98XEdkzf/tX6nRxChQcfuQXinz/RNdfyQqdWFdwOpbdLFEx0hlhxRzHcU1wUWKA1Dp/bCOeU9dK5smz6COy8GFuTlr27yjb7y75KdJ++Pb9kwkE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982537; c=relaxed/simple; bh=26W7AK4Uyulx7e8OguFS/2MgsGW9fO1MZTL4z9xDJQs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cJJNp8gpErDfDhMKZqw862cd/Pgad+zViv1n7enkffRcK45wdH6txSPXgL+ty6RZzN1cgQo3Ultyizj3ecuUZtnRNa9QNuKGW8hwS9S9SDEziQnyrf1xCW2F6pPWg+Fakj+uT7bzEAaekN0xEE9AWZGjqBdoePmpLjGe7B2yhUk= 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=LZmNV8vB; arc=none smtp.client-ip=192.198.163.19 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="LZmNV8vB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982536; x=1745518536; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=26W7AK4Uyulx7e8OguFS/2MgsGW9fO1MZTL4z9xDJQs=; b=LZmNV8vBqNBfcy9eQhepdO/nx4e8sMDeKoDCQePPPIsDHa/8fcsSmjo8 y+/uVSRf8Hsh8iIQU4nYU4D/Wn5Qk4lkFReRFFZlsw8EniBIRv+dTeKhJ wL6gQHoFlRd1/1yxMySV98Nu3Cep9KiNtWkuq28msy+DflsRaEx7LMym3 sF5DKyM7BYTH50dVbuEOVeskdZihQ0wQBUONn8NdIr94fZu9tX+cfPo7m fBwv39+cpgNOEUG7K64p6g/k5gaJR+svTgpSrNaemKM3rh+2vkvhE88qj E1DdFTTUe6POt4dECIRBBDZ41rjj7sTFIxbpqgYR7TRV7KUoUrrJ8GLz1 w==; X-CSE-ConnectionGUID: 9TsKiSfHTC2uItNPwX0IWA== X-CSE-MsgGUID: /Roi13xRTXKXlqS7ZteNwA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503662" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503662" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:36 -0700 X-CSE-ConnectionGUID: TpvtKG0xTJ2uPfmB6lYM4Q== X-CSE-MsgGUID: KiS/7+AmRAGQhXgz8JQpYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750258" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:35 -0700 From: Tony Luck To: Borislav Petkov , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 56/71] platform/x86: intel_ips: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:35 -0700 Message-ID: <20240424181535.42235-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel_ips.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index ba38649cc142..d95f686e0515 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -62,6 +62,7 @@ #include #include #include +#include #include "intel_ips.h" #include @@ -1284,7 +1285,7 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips) struct ips_mcp_limits *limits = NULL; u16 tdp; - if (!(boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 37)) { + if (!(boot_cpu_data.x86_vfm == INTEL_WESTMERE)) { dev_info(ips->dev, "Non-IPS CPU detected.\n"); return NULL; } From patchwork Wed Apr 24 18:15:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642325 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 35F9116F0C1; Wed, 24 Apr 2024 18:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982538; cv=none; b=HGifzU/YElS2YUToKgOI/c+5ENDuQsK+MJmTfrjtr1HIR3xCkCAgUnTlx0pUac5p5ud51pDZIJoVG3G0VeeV1R5g4gGvEhLU3IxJOAM9Tw0JDG6gEwA7RKYLQtX5IE6uQFrbgAwbljBtp1zBrTkaFokT7qhssdEtTjrtYgFPHVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982538; c=relaxed/simple; bh=lMiePj5BLeBwTfmhtOWVl7Nr+Y6PBZ2sXOR4c241KGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAdvOee6YSIO/75aUCxZBx7IeKSsa08s9Ij7e0ZlVqgCcCHtNXgTN6N4Qq+d7tBnDECLymGeZA+zagvqM6yIV4+n0uv9rejvOXZCSQz95H83kZoknQSmBM1s0kkccymtFn33hXkeJEc2gH7feZ3Bm9kfDtyZV+Z70BFlAIW2fRc= 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=GoNyV2VL; arc=none smtp.client-ip=192.198.163.19 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="GoNyV2VL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982537; x=1745518537; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lMiePj5BLeBwTfmhtOWVl7Nr+Y6PBZ2sXOR4c241KGg=; b=GoNyV2VLtPQ8Py6GUFzIvcL7iushJBBV/rDNwHuGx2jZKtPaBK/eMQYv kpFwpWhSu2nf0MkWVydvvf3vQicKW0uJP3LfZEMo6vpRA7YRHHr0rRksc g3IWgyOQTOOsNJ6ODwxTXFsBakA+ibtlBOwRqYQsGaDnCDnCBONOeXVJK TAygUstHILnzUAPacIB7OE202v0XqFqqVFRD5xHIw2aqFPhWnI48ZlLw9 4QGiUOIqv7CKSYLWWp5+r2FSoFeLxByp2wuppkYbuKjTIydMJ4N5OMxX9 kv0fHkGg8GEirMJZLtMWSmqPDYaf5dyVo85nfsESWZtTzOjUH6IVItHPp A==; X-CSE-ConnectionGUID: +gU+dEzjQu+EYiiS8480aw== X-CSE-MsgGUID: R/iStO+YSpilWMHtGnkXXg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503665" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503665" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:37 -0700 X-CSE-ConnectionGUID: ieBqzDj+RyiG+d8oDjUmsQ== X-CSE-MsgGUID: eaYmgGRrQpCoSm0wRmwGBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750286" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:36 -0700 From: Tony Luck To: Borislav Petkov , Rajneesh Bhardwaj , David E Box , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 57/71] platform/x86/intel/pmc: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:36 -0700 Message-ID: <20240424181536.42254-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel/pmc/core.c | 46 +++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 10c96c1a850a..054a56532e23 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -1255,29 +1255,29 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev) } static const struct x86_cpu_id intel_pmc_core_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, spt_core_init), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, spt_core_init), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, spt_core_init), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, spt_core_init), - X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, cnp_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, icl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, icl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, cnp_core_init), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, cnp_core_init), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, tgl_l_core_init), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, tgl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, tgl_l_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L, icl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, tgl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, tgl_l_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, tgl_l_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, adl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, tgl_l_core_init), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, adl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, adl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, arl_core_init), - X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, lnl_core_init), + X86_MATCH_VFM(INTEL_SKYLAKE_L, spt_core_init), + X86_MATCH_VFM(INTEL_SKYLAKE, spt_core_init), + X86_MATCH_VFM(INTEL_KABYLAKE_L, spt_core_init), + X86_MATCH_VFM(INTEL_KABYLAKE, spt_core_init), + X86_MATCH_VFM(INTEL_CANNONLAKE_L, cnp_core_init), + X86_MATCH_VFM(INTEL_ICELAKE_L, icl_core_init), + X86_MATCH_VFM(INTEL_ICELAKE_NNPI, icl_core_init), + X86_MATCH_VFM(INTEL_COMETLAKE, cnp_core_init), + X86_MATCH_VFM(INTEL_COMETLAKE_L, cnp_core_init), + X86_MATCH_VFM(INTEL_TIGERLAKE_L, tgl_l_core_init), + X86_MATCH_VFM(INTEL_TIGERLAKE, tgl_core_init), + X86_MATCH_VFM(INTEL_ATOM_TREMONT, tgl_l_core_init), + X86_MATCH_VFM(INTEL_ATOM_TREMONT_L, icl_core_init), + X86_MATCH_VFM(INTEL_ROCKETLAKE, tgl_core_init), + X86_MATCH_VFM(INTEL_ALDERLAKE_L, tgl_l_core_init), + X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, tgl_l_core_init), + X86_MATCH_VFM(INTEL_ALDERLAKE, adl_core_init), + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, tgl_l_core_init), + X86_MATCH_VFM(INTEL_RAPTORLAKE, adl_core_init), + X86_MATCH_VFM(INTEL_RAPTORLAKE_S, adl_core_init), + X86_MATCH_VFM(INTEL_METEORLAKE_L, mtl_core_init), + X86_MATCH_VFM(INTEL_ARROWLAKE, arl_core_init), + X86_MATCH_VFM(INTEL_LUNARLAKE_M, lnl_core_init), {} }; From patchwork Wed Apr 24 18:15:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642326 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 C90761C6890; Wed, 24 Apr 2024 18:15:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982540; cv=none; b=DhOxbNzYPjUQ/Hn+gherBObr6sWq7SXX+q7NeVcR4q2x5cgntlYxWLhPBYq9YlaIaV3NfPUvCFBy3SWNCphXZQzRSXrX+1Qy8Rnopue3Y5V495a65tJmp46mCKKJf02JjDSQC0V9/3HlYGX23NjVwFM2PtT2oi/yOL1w3zLHGBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982540; c=relaxed/simple; bh=8BfI2hjYKf/TtKpPZBR8m4bVwal0XuuMnwSbzdK8eQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qhvNwp8+/sjVEs0+DGGw5fNETyiJjb0Wqnd2xGQgPA5oGokweRmPopOYAbcaS+ZWJrKOsMi3WBBL7Hum9U3E57HZm6Y7u/+uqb6nvo/hda00pQhm1nHRKhlGOu+QwOyNO66U22raJ+gQXAugXK7WkubkemmJGPmxtEm4dBsyV24= 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=ZwHh7fcK; arc=none smtp.client-ip=192.198.163.19 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="ZwHh7fcK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982538; x=1745518538; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8BfI2hjYKf/TtKpPZBR8m4bVwal0XuuMnwSbzdK8eQk=; b=ZwHh7fcKQ02l6fEz2TDJPUTxXLpzMks+y3VpQyZBRvw1rrVJfqaKaYdO 4NOWCegUVyYfxbtbBuY2RgNqt/m6STXaGmzlJas1BQKCBmWWXlkf/CoBS 83Cd9UfifUBuvns0jN1gQDPbmazpizu/ET9T4bvtcd6j3ytoDGEtIiCWG Nt5vfRTLJpYgb0TNVs8KKwBQF48iq76ZO4QGzS/dMI8SrGWHOTwRoemDn nzvNgNN1jHrPLW5SNfJeu/GFE+0rgeqvJI8TaJegagbdL9Noqf9chZaAe SOYXHa79JcPWryBtVB8/3cBsNoWcIM99MJLNPduKnHqBml9kj6LNwnzXj w==; X-CSE-ConnectionGUID: PDFIXGeWTsO4TGwzFt9h7g== X-CSE-MsgGUID: uqNAoPHKQmqyVQ7m3kj5tQ== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503672" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503672" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:38 -0700 X-CSE-ConnectionGUID: 0lQNemMKRlO8JoaKAvPz6g== X-CSE-MsgGUID: dsz4QLp2TnG9LXqqTh0Nzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750293" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:37 -0700 From: Tony Luck To: Borislav Petkov , Rajneesh Bhardwaj , David E Box , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 58/71] platform/x86/intel: pmc: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:37 -0700 Message-ID: <20240424181537.42273-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel/pmc/pltdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/pmc/pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c index ddfba38c2104..22cfcd431987 100644 --- a/drivers/platform/x86/intel/pmc/pltdrv.c +++ b/drivers/platform/x86/intel/pmc/pltdrv.c @@ -35,14 +35,14 @@ static struct platform_device *pmc_core_device; * other list may grow, but this list should not. */ static const struct x86_cpu_id intel_pmc_core_platform_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &pmc_core_device), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &pmc_core_device), + X86_MATCH_VFM(INTEL_SKYLAKE_L, &pmc_core_device), + X86_MATCH_VFM(INTEL_SKYLAKE, &pmc_core_device), + X86_MATCH_VFM(INTEL_KABYLAKE_L, &pmc_core_device), + X86_MATCH_VFM(INTEL_KABYLAKE, &pmc_core_device), + X86_MATCH_VFM(INTEL_CANNONLAKE_L, &pmc_core_device), + X86_MATCH_VFM(INTEL_ICELAKE_L, &pmc_core_device), + X86_MATCH_VFM(INTEL_COMETLAKE, &pmc_core_device), + X86_MATCH_VFM(INTEL_COMETLAKE_L, &pmc_core_device), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids); From patchwork Wed Apr 24 18:15:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642327 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 105EC1C689D; Wed, 24 Apr 2024 18:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982540; cv=none; b=M8Ca0uOoUSjTq2B6s1/Rg1b2RNsoXKHTfEPNx1wLoiF3FgY8m8beqkqMYuwfEiecXklP6RKZelUGy0qj/xw524sdQ3A4L2H5eCjKDF0ivWv/36Acg1EJ/jtxft/VyRhudEy/RDWeManSgVmNJ5WROuttHnOvOw+NxumxcMEFb7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982540; c=relaxed/simple; bh=WDk3Nytz3rdQKdrZoCkbG+T02Itdm5c/GxoSZ2n45IU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bm6r+FMANisNa0yeQXzmRhVMs3jwu+2yx+FUo0wuKXlGSl8Dn7F8Qdfns/K6UQk3pjP5foIBLoeGQOfs3NmePBgAq2uvVTlkmuUke1OYZzo97WId66EVHm+C9UAjvYKMIeyZARQMjP+NZAs0fD4iEs0RfvB+CtgBr46S9vvXUNE= 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=Ad6zUTS+; arc=none smtp.client-ip=192.198.163.19 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="Ad6zUTS+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982539; x=1745518539; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WDk3Nytz3rdQKdrZoCkbG+T02Itdm5c/GxoSZ2n45IU=; b=Ad6zUTS+N1H3WIWlBZ8ijcmN3ndTpWBWMnhpFvKYgPeXFVgkkjOJlCO8 Kvoo9dVv9G4p34H8xsAmqG1AGOaWiXBwoOOk/xJ5+l55EzCQNYF05TPwT SoBBupFAgG6x7SnOZEEnzcRNIZQKZrvQBqsR9ZouDN0UR8UjS+ah0SGXY Bc+7Q9xwWWjAwe5TjA5zWkcZ4rsABmWgQoTV2MLFnQpD3qRWPKTN2xMuN ezFjbSbsAy1XCUdO3SxHjGTYlRcUigvQk0hVQ9tQpvB1z8j85vVB5GDXK TzkAZmpiusZyRuFEJ13q53SfltOtvlwsALPnm72JJwIgwV963Xl7wpn52 A==; X-CSE-ConnectionGUID: dfJRNtIlS0C+wx+WdSSKBA== X-CSE-MsgGUID: kEtqkbaARriqT7FHLVLmrg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503679" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503679" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:38 -0700 X-CSE-ConnectionGUID: eYYxRhxXS5eZvp1tM9t8tw== X-CSE-MsgGUID: /Pcz3vEuSeGMbovUk5PfpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750299" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:38 -0700 From: Tony Luck To: Borislav Petkov , Mika Westerberg , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 59/71] platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:38 -0700 Message-ID: <20240424181538.42292-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/platform/x86/intel_scu_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel_scu_wdt.c index a5031a25632e..d0b6637861d3 100644 --- a/drivers/platform/x86/intel_scu_wdt.c +++ b/drivers/platform/x86/intel_scu_wdt.c @@ -50,7 +50,7 @@ static struct intel_mid_wdt_pdata tangier_pdata = { }; static const struct x86_cpu_id intel_mid_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &tangier_pdata), + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &tangier_pdata), {} }; From patchwork Wed Apr 24 18:15:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642328 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 64AB61C8FAE; Wed, 24 Apr 2024 18:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982541; cv=none; b=WPNgx9ewSssahaccjIjuPOrqHyYrb21qZJYrzZfBxFq8VyXBgE1eXUk2LHn7iC/vUPEbcyGRSFpumYRsp9MgvKnW/UZyh2bXLlCPDkGn8/4I7nH16znSezqcJfQLTk1dWqOZ3kKORg00sQTyLkx6LiWf+7KkDDVlbiTclRkoW0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982541; c=relaxed/simple; bh=zq3PVQPAcMWcn9vz87aBSrEUPTNktf+avk5R+71nh50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qcKyVNZTPfvERqLkBKk2oUYnrnr86RrG6WfQgXhBno6cMru+OdoTQqIs3Cjtb1z8XcVATg3oH+AO5XSPp9e3qyd1PrcenTvSoGrOI66BNz2nJ89PiJ33eKwqhPRdIh20WaPsNd/uCtPeBxgid9B5S4X6+V8dWEwiWM2638nNxwI= 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=J4ROe+QE; arc=none smtp.client-ip=192.198.163.19 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="J4ROe+QE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982540; x=1745518540; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zq3PVQPAcMWcn9vz87aBSrEUPTNktf+avk5R+71nh50=; b=J4ROe+QEUDlTYkQOBf2b6e+XC/sRAFCkm8h7OO9mmN39ALdLPH48TDO7 6jDEoCxzYw8rQpvVa57fLCQ8YeiCKGrJturf6P9CJmJbkxbxpSrUjeJuF 0xvWRrF1wEBsRHAp7KTQ7lHbwVLxNLeE80/TCG/XY+wGkhf6FdcwbqzH0 GtM22Eey29plslbl059Y97ai6q3qx985UK5erTUq03kaYFkyyyGJWDGqw 7+m0Vnjz9NtW9JJqfi16pJZ2EDBYd6kkl5L/o+cByKS/5439HDOZSaLH6 4o8Imw8HsuhUOsNC9jZhXDplV/iL+IZHofcWbr+BVg56Qkb5Qu9xSuqtJ g==; X-CSE-ConnectionGUID: O7AAwozaSgaCS2d6UShNaA== X-CSE-MsgGUID: 6To1xjM9SK6oShmHlkysvA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503685" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503685" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:39 -0700 X-CSE-ConnectionGUID: oVdKoGGKQtaObO59uusIfQ== X-CSE-MsgGUID: 1/zjBpQ8SWGxLILHsjFVdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750304" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:39 -0700 From: Tony Luck To: Borislav Petkov , Srinivas Pandruvada , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 60/71] platform/x86: ISST: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:39 -0700 Message-ID: <20240424181539.42311-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Srinivas Pandruvada --- drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c index 08df9494603c..96f3b221b6c8 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c @@ -719,8 +719,8 @@ static struct miscdevice isst_if_char_driver = { }; static const struct x86_cpu_id hpm_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL), + X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, NULL), + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, NULL), {} }; From patchwork Wed Apr 24 18:15:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642329 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 F124C1C9EA2; Wed, 24 Apr 2024 18:15:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982543; cv=none; b=N249SdG3vxs+TSmZkCP0HW59NI+uXpWy9zQhxMx0UKxUMUMMZmF8mgoO+POT6usQUOZONaz0R2CYAGdoYaIjeJKLF/ZFXD3Y/qBLbDt8JLwDrSP7G7gYtVMIcG/3r1KXaolrH+XOOwW8EwzcMrhOqhViTAANLUr4EM4a3utmXgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982543; c=relaxed/simple; bh=i5bcoBcmvU7uXKCZja5nQG8SX5zG7nFXavF27vF+S+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrUCRz+I6XnF4KnozuWJCgyiMt0WG0oXh/TvtQG7F5b9D7vVHt5rivBGuxGVGmDtj4PfivYn9IgHB+N5brpravRzoTlY4xOixW5fku2XlGi0fjn0VnzqW4gEycwc1P9vtqbbfl0cy2tKNMe52OKME/14K21G71xrAJF0FrBgp/o= 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=T2Af/BWh; arc=none smtp.client-ip=192.198.163.19 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="T2Af/BWh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982542; x=1745518542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i5bcoBcmvU7uXKCZja5nQG8SX5zG7nFXavF27vF+S+o=; b=T2Af/BWhZ4pPZskSkHzLcZmzVJAEyYfG0bcQilEnhP+u6x5m9WdAndOW s2GsuMwca3TfXCQC3gcji+zxTEnHhY+v6mUOqgPzqOThnZjY8FC2oT2sz njij/CurHVI1j8eknz8oSBk6m9eEjVJr8RuaoEo1MwpSzMsu+AIozbO1Y 4VShgrhD0w2R+cA7QkAPVE8WhMu3JJ6atEdYwi+YcYerZ4hChGHgLFdvq jaT9lkrTOqiNrogsd2AdbTtDYnxe9x6i20vTENWcNJuzFi/QAIr4FlPpT cDEDs7GfvVYZJKsDzA2FlRDxIqDlvYnEI7OtIP3N4/bf1/vipSBud7KSG Q==; X-CSE-ConnectionGUID: fGsLIN9BTg+9bNPQEYZUjQ== X-CSE-MsgGUID: tlSXBgrWRM2/iwvoMJrRJQ== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503691" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503691" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:40 -0700 X-CSE-ConnectionGUID: vv4dO+6LShGBxGm3l8f26A== X-CSE-MsgGUID: LP9lbvWLTHC4cdj+nEcVww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750309" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:40 -0700 From: Tony Luck To: Borislav Petkov , Srinivas Pandruvada , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 61/71] platform/x86: intel_speed_select_if: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:40 -0700 Message-ID: <20240424181540.42330-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Srinivas Pandruvada --- drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c index 1b6eab071068..6c36f7704fe7 100644 --- a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c +++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c @@ -161,7 +161,7 @@ static struct notifier_block isst_pm_nb = { }; static const struct x86_cpu_id isst_if_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), + X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, isst_if_cpu_ids); From patchwork Wed Apr 24 18:15:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642330 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 25C4416F0CE; Wed, 24 Apr 2024 18:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982543; cv=none; b=MF+urVn528l+2unrPOO9Oy5FpyKSLN/rRTI7gVkxlCAyk8zVIwEkbMK8/zOWfm3/q/sawiEiYJvzQW6RMMDNHip0lHFO/T2xds5+A0s5OOFCtKA7bc5FG4+G18hLPI1fc+++OV10dRExKNO2aWgDY73L46F1H2EhVYfNFNnA5PA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982543; c=relaxed/simple; bh=xr6bb9OF0NXrEF0HgBC2BNEdfy38NpnLKwUrq7aiRyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qDWuyRd11bZ7KiYGB3Bo+bIg2Hu+FSHHpYFdn3Qsvy52WDJ/p2yAp6tyEYylLxW9W9EuCnFJFRHahC1brM1HsTjrXZa1JpkBnoVWdXe6BHvTpAEMgKehor9ap0heRI0nYB2DAb8lW6tlzpFhnxgq/bKSM0pNNHirPKpNmaESBCs= 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=LKqJttDK; arc=none smtp.client-ip=192.198.163.19 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="LKqJttDK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982542; x=1745518542; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xr6bb9OF0NXrEF0HgBC2BNEdfy38NpnLKwUrq7aiRyk=; b=LKqJttDK9oNJhYMFvlFQRa4mF1/21CDCRBR+ZA06nC537UE4QmKhtZnf dxVvK4jA5dqMR9iXBtG3aYVSkJNWTbYWJ0bYYrxUx53u7WnGbLt+Wo5dY dxH3hQnuhl4GAYVrpPOixsuB11lloaqn6VoUSgiwee2cZyfJgA4lOIIRV 24yYURx2oprU7tUKIGudiPmmxvAA9gKMk7uyc9Zjbjr0Tcoz0vCeTfQ9I redWSoRsJE7IkdQLTKfAwHwGKq1iJZrTFTCTkVpH47pUn8lMQUQPP0z+l bR7t0QXzOpnolEgKvlyhmIuFpIOvwKRE66SjGc/KqJlLZpTlGaVa2+msd g==; X-CSE-ConnectionGUID: roFs/0MQSf6jKwXYXOxZkg== X-CSE-MsgGUID: BTvwKCOKT72p29IY2+RrOg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503700" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503700" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:41 -0700 X-CSE-ConnectionGUID: DFM+7oIXQaqCWdjnsJ+Khg== X-CSE-MsgGUID: fmDO2iL+S5aakTboRJ4C9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750313" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:41 -0700 From: Tony Luck To: Borislav Petkov , Rajneesh Bhardwaj , "David E. Box" , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 62/71] platform/x86: intel_telemetry: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:41 -0700 Message-ID: <20240424181541.42349-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel/telemetry/debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/telemetry/debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c index 1d4d0fbfd63c..70e5736c44c7 100644 --- a/drivers/platform/x86/intel/telemetry/debugfs.c +++ b/drivers/platform/x86/intel/telemetry/debugfs.c @@ -308,8 +308,8 @@ static struct telemetry_debugfs_conf telem_apl_debugfs_conf = { }; static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_debugfs_conf), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &telem_apl_debugfs_conf), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf), {} }; MODULE_DEVICE_TABLE(x86cpu, telemetry_debugfs_cpu_ids); From patchwork Wed Apr 24 18:15:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642332 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 6E6021C8FDA; Wed, 24 Apr 2024 18:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982545; cv=none; b=D9gjaUtyv3uC+tmOwAEdAz0nL8ptVUgOW+8UPsYbJu28Qerq8/8/eOUoGe9kEo0q1bjJO7n/AKmQHtb0UERQ5ILfaRpcZFsXb2WbCO4QRFcMz/kzSq27vZhQ4j2RXatNiBYtZ9MRR8RqOy1AD12oUjOCXDtJgJKqBk7WHQZf00A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982545; c=relaxed/simple; bh=lGxY6/fpKVjagJiMiQslsjgDFgL5ZPdXodSr7eR0UbE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fDs/54858fiaRr6HDQTXT+vFaQFK8oHF8zv+JPTJWOegqXpRAaBs8o+FHhiT4q4VmiOab+MWdhmRDMQIsh/1JT11DbHDe/a99POKrX8U1GkiLzijgmyF+G0arwY7IxGdiwrmzwQDJAj2u+TTdNnj1Ju2xqjDXetQTYRroe7ccfU= 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=e8LnyUJO; arc=none smtp.client-ip=192.198.163.19 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="e8LnyUJO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982543; x=1745518543; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGxY6/fpKVjagJiMiQslsjgDFgL5ZPdXodSr7eR0UbE=; b=e8LnyUJOEhhs7Iuow34O40EgnBvNbvdePbMtPl2b7qOCsFP7LCFOOche 52VVr7GqQEPZB3WouC61jKZHVTEpY601buw4Pg5QNXvioE7WMKQe7N7Q5 reVcuaPU2pRpGeXtfFl5z04fq9gDYFfu6k9j11RtVM4jPqxSCEUvrKKxc UICiqLzcZ1h5QlI3Us6k8p3THvIyXomL1vgFOUSl+r3/Is8p+8bjpLl2l Y7kjAz39jT6+mdj8m0SgsqAV+qd7W/c0KNmonhb3vHJ5Iq4jkUErnYukl F25MkB7THKxO8T6KatdRhS3ExZpOcgnECOL5VlNLt0674JGzrJq1oRN4t A==; X-CSE-ConnectionGUID: 3mLzCEvTQ8qlYhHK/vf4KQ== X-CSE-MsgGUID: 7KlF1o++ToG+3blqcDznpQ== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503708" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503708" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:42 -0700 X-CSE-ConnectionGUID: Cad7/xTSRxy05dj+edwlJg== X-CSE-MsgGUID: MPlg/ATjQAixgaR1TFMaIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750330" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:42 -0700 From: Tony Luck To: Borislav Petkov , Rajneesh Bhardwaj , "David E. Box" , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 63/71] platform/x86: intel: telemetry: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:41 -0700 Message-ID: <20240424181541.42368-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel/telemetry/pltdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/telemetry/pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c index 06311d0e9451..767a0bc6c7ad 100644 --- a/drivers/platform/x86/intel/telemetry/pltdrv.c +++ b/drivers/platform/x86/intel/telemetry/pltdrv.c @@ -177,8 +177,8 @@ static struct telemetry_plt_config telem_glk_config = { }; static const struct x86_cpu_id telemetry_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_config), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_glk_config), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &telem_apl_config), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_PLUS, &telem_glk_config), {} }; From patchwork Wed Apr 24 18:15:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642331 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 5328B1CB307; Wed, 24 Apr 2024 18:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982545; cv=none; b=rBFoGIsHTmErr1nqHkig0oQZ9oeXICMcZnr8g0jNn7Z/ydcibfXydJMGnt2sw+pIxLBsV0lkE6L5Es33hKNM54un8euFfhPDZdjsy4ymkZ9Zt2EtIttD9tbouK361XUx5NfE4NVsqkCGG0ZIMBARDyvpYZWwT3O13XrcD01zvI8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982545; c=relaxed/simple; bh=UGEw2wLj1K8vQaWrX5dXU0U1OAJhcpCUAILxYE5zspA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c1A3/Oz/XFrqRYlRSBnj8Q6vkM5yr3m4QI+WdqrYfdh1uZ3Nq296LUKD2/UBQ4wFJTeMHWxpHbdg+OCRZYWhmReTOMfe6iiRLHSEdSOWrM6nV5wN3pIUiNI72/8v4x7QJRYdbSCVYK1nXICMIxDi68VxKp8UadQ6fwk/jN2fBYA= 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=lWOA1poa; arc=none smtp.client-ip=192.198.163.19 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="lWOA1poa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982544; x=1745518544; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UGEw2wLj1K8vQaWrX5dXU0U1OAJhcpCUAILxYE5zspA=; b=lWOA1poaodkueGqKxqom+5jFzvxFPtKIW4TpriDMil46fd+WU4Y3CCiE /CvpMk2KID3V9HaCd3z4Buu9pOT2mGco9Ze+SwyQLP0J9Dn/77U1TycWh LvmJg6IZPHF76W844ZzNN8wwiPCjfqZhqhQNMfwMvGQL128W49ITyC2uw ZZjDgVcPUGLsTb62+NFFXVQbM7K5LfbdVMpB9MMNJOXfr6oZ6N4EYIZ9d rkJWQS6Y9GnPrYSwaQ6Xqp4IDZsFidCtMSbv54afybemsJ4qh6Idesbk6 qBAHxihAPef3fjbhW0uzeEB0yokcCrrEBznG40IjuwTGrtBI7/lX3sioG g==; X-CSE-ConnectionGUID: tMhfhN7dRruO7r+HrKkdvw== X-CSE-MsgGUID: EK3BsloQS1+FSGmQlqz9fA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503718" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503718" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:44 -0700 X-CSE-ConnectionGUID: 2fZ4DXG3TNSfHvPL4RcxTA== X-CSE-MsgGUID: DsC274P2QNG8L8Iv02HxVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750343" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:43 -0700 From: Tony Luck To: Borislav Petkov , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: Tony Luck , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v4 64/71] platform/x86: intel_turbo_max_3: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:43 -0700 Message-ID: <20240424181543.42388-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/intel/turbo_max_3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3.c index 892140b62898..79a0bcdeffb8 100644 --- a/drivers/platform/x86/intel/turbo_max_3.c +++ b/drivers/platform/x86/intel/turbo_max_3.c @@ -114,8 +114,8 @@ static int itmt_legacy_cpu_online(unsigned int cpu) } static const struct x86_cpu_id itmt_legacy_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), + X86_MATCH_VFM(INTEL_BROADWELL_X, NULL), + X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL), {} }; From patchwork Wed Apr 24 18:15:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642333 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 A45FE1CB32C; Wed, 24 Apr 2024 18:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982547; cv=none; b=D8mofyi3dVshNC5R/R8el9RrSOtKVQqFDzOqb89J4smoEuKLsJPuXcW48kXqmvBSQ+b6BNFY6FfIBOFXE1zjvd986ErMArT4CBMqzD1UJuNjuDLEoZeNFK1fvFCuI/AVS+Cqqtxmui/FJElg3/3cXtNuEUddZQ1ozhpyil0p6Bk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982547; c=relaxed/simple; bh=LOzsD5IsD59gKdeksTuIW83sAKQTK/XFVhkG9cKUAsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gg3xesxRqq8fAi+ndyLPUO3LfsKrg+vbmhfZP3K+pjoqofvTMLUcN6HFPz/3TGiUNIXJOs9Mo5ezhHCeWAyWaQXzEXmF+6h4SlLAw3LRmyWhQWm9lXL7QGpu4rHqoGBxGWf0Apb0CATnM+nYZCLLZNfVQhPJn+fBrjXVd2C9YI4= 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=fgUp1svT; arc=none smtp.client-ip=192.198.163.19 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="fgUp1svT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982545; x=1745518545; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LOzsD5IsD59gKdeksTuIW83sAKQTK/XFVhkG9cKUAsU=; b=fgUp1svTlQRcY/tmqdjudGBuDK9Rcd/UAPtX/8ZW28uazaIzOxbLqa91 goT49f7RyZ1FJHnMF77TDmOV0KAnhZ4yYI457FBPoBRSw4TIbiEhiqpWR cqzlsVHLMi9UmoP7vNo8AjsUucJ974gvgVJw48xpD3yhF8kzAHoBb4EK/ igkq0jFRvYdtxTzJx12DkJFHatO5eX7aoNRqQYDVKQTkDKs3Fr4Q5Ly+d W75+d8F2X0n1K8HVY2JpCeYSRhy+iMnGLVXFYsLuYa918aYsuQRBY80oT AQSFCKqMMCypkrqTBPqPDAHCeYrRbpE4hSi8XFLjO0TxkeDZ/ESL4o4sN A==; X-CSE-ConnectionGUID: IqaPb8niS+C+DzghPLYc4A== X-CSE-MsgGUID: eZy/ZMKSQaSnnwst38AM5g== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503724" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503724" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:45 -0700 X-CSE-ConnectionGUID: Sg/B6JySS/y51w8cThk6ug== X-CSE-MsgGUID: WSHipiGrRDa3mP6dHc/fFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750350" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:44 -0700 From: Tony Luck To: Borislav Petkov , Srinivas Pandruvada , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 65/71] platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:44 -0700 Message-ID: <20240424181544.42407-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck Acked-by: Srinivas Pandruvada --- .../intel/uncore-frequency/uncore-frequency.c | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c index b89c0dda9e5d..b80feaf5828f 100644 --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c @@ -197,34 +197,34 @@ static struct notifier_block uncore_pm_nb = { }; static const struct x86_cpu_id intel_uncore_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL), - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL), - X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, NULL), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL), - X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, NULL), - X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, NULL), + X86_MATCH_VFM(INTEL_BROADWELL_G, NULL), + X86_MATCH_VFM(INTEL_BROADWELL_X, NULL), + X86_MATCH_VFM(INTEL_BROADWELL_D, NULL), + X86_MATCH_VFM(INTEL_SKYLAKE_X, NULL), + X86_MATCH_VFM(INTEL_ICELAKE_X, NULL), + X86_MATCH_VFM(INTEL_ICELAKE_D, NULL), + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL), + X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, NULL), + X86_MATCH_VFM(INTEL_KABYLAKE, NULL), + X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL), + X86_MATCH_VFM(INTEL_COMETLAKE, NULL), + X86_MATCH_VFM(INTEL_COMETLAKE_L, NULL), + X86_MATCH_VFM(INTEL_CANNONLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ICELAKE, NULL), + X86_MATCH_VFM(INTEL_ICELAKE_L, NULL), + X86_MATCH_VFM(INTEL_ROCKETLAKE, NULL), + X86_MATCH_VFM(INTEL_TIGERLAKE, NULL), + X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE, NULL), + X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), + X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL), + X86_MATCH_VFM(INTEL_METEORLAKE, NULL), + X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ARROWLAKE, NULL), + X86_MATCH_VFM(INTEL_ARROWLAKE_H, NULL), + X86_MATCH_VFM(INTEL_LUNARLAKE_M, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_uncore_cpu_ids); From patchwork Wed Apr 24 18:15:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13642334 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 C4AFD200133; Wed, 24 Apr 2024 18:15:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982549; cv=none; b=AYI18x8l9qg2OdeGaaRKp5zU5JOBmIjzIGipKfrYN5mL2iroxeqJdi+IqtbjTxwFEk6b4sdmvRzOEdTOCkYnpAU9WPWF8lvIPGLL5BGFtgNSJq1b+s9mRNftQri/xAj38hIRth8sdaPEGyG5AXzFz3kf1rbA9W+Vb6Y1TveWPTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713982549; c=relaxed/simple; bh=NHkS+PLB8tCqh4PRqBz9xJFe66d4//WHYse1TcAmK38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPM7VGEqOMOp63HhYOHW86p1J7RLXqyDACXeTBaXQdKhIbyaNMOjRbINrEu9+VEUa2FpSw7c8uzSVGxV3L4YR532uv89o7GD3243neoj1t18pston89oWjT4szwG/FgMOZ24UGUemWg1KMrvPpFJM6fMHTJ55L3sQh/pz2Zjpm4= 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=Ravdf/jN; arc=none smtp.client-ip=192.198.163.19 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="Ravdf/jN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713982547; x=1745518547; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NHkS+PLB8tCqh4PRqBz9xJFe66d4//WHYse1TcAmK38=; b=Ravdf/jNxi2EP7URQVv32z+yD3tsyPCLTWHWcscsHnH+z4VBvRy/IrEm sh6QvuyzUkaYq+e5q/O4p++NURUGl1k+xOc/cnkxVJWV+ItCZZJkBlohj GwDwl5n7OZ5bc2riZWtNx3iu6U4XSfD5XL3CV2gXnG6fvJS9cxqj6KtQm QYZN5OyN5QYxOZ88fha/tHYNr7ZKdik3lOOD6qTPBD2ow70Ml+PM3OvvT TWzw9Y3UdSwig2zbSbotl0zqR7R13K2MmlJo7hW39jfa+jA3+/w6C+JEY H+4IjVnRfhn/aFHDFbwvU4Ye8Qlq8vKVGVgQL1nrEnlpgwSpKo3PAotOj w==; X-CSE-ConnectionGUID: iEo6PAHLRj6nxVJZxlIJhQ== X-CSE-MsgGUID: wA+ZRRdYSDi1MmjK0Q2Epg== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="9503728" X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="9503728" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:45 -0700 X-CSE-ConnectionGUID: 1cjMMjg4Rli3jg+Vz0SoNA== X-CSE-MsgGUID: K0SEcFSdQnaSOJ0+wWee3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,226,1708416000"; d="scan'208";a="55750355" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 11:15:45 -0700 From: Tony Luck To: Borislav Petkov , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v4 66/71] platform/x86: p2sb: Switch to new Intel CPU model defines Date: Wed, 24 Apr 2024 11:15:45 -0700 Message-ID: <20240424181545.42426-1-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424181245.41141-1-tony.luck@intel.com> References: <20240424181245.41141-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/platform/x86/p2sb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/p2sb.c b/drivers/platform/x86/p2sb.c index 3d66e1d4eb1f..8cfbf0bbd346 100644 --- a/drivers/platform/x86/p2sb.c +++ b/drivers/platform/x86/p2sb.c @@ -24,7 +24,7 @@ #define SPI_DEVFN_GOLDMONT PCI_DEVFN(13, 2) static const struct x86_cpu_id p2sb_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, P2SB_DEVFN_GOLDMONT), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, P2SB_DEVFN_GOLDMONT), {} };