From patchwork Tue Apr 16 21:22:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632616 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 808CF152DF7; Tue, 16 Apr 2024 21:22:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302545; cv=none; b=kHBpdy35l+qxLVyUoxfrQtIsHkwYX1hcPOZTAEV3tUPTBqQ4SeNv5T3ylo75h0UDZZa3dgKFP7gK8wQ72hxoUsESHh+iL6TWHW8/qurCUcIBJm0hBKlp/80LaIzIocTmIuLreFyEhn773nOTSLGjrkAMgY6NLdrRExInvcx8O6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302545; c=relaxed/simple; bh=GAJ4tXjEN7lQ2UunRHqVUyKqhAXnTvHjZyO58Eg7pVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mYpSqquzL/gUwBidLU56M20P0yJVy+ZO52sDsBfBO7wcqozoEUck+2xANpkW0I4tRPxYI5dBfhGjNFEU6bWxTVgpbIcBhOp6HZcZztqhHsHdvhpdSX7/jG7UNDDRmU+7sSfsW0PqSbig/Kzbgm+klbFoI+/3NkK2ZJKG7ywm5l4= 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=j2otpApf; arc=none smtp.client-ip=198.175.65.10 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="j2otpApf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302545; x=1744838545; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GAJ4tXjEN7lQ2UunRHqVUyKqhAXnTvHjZyO58Eg7pVo=; b=j2otpApf2XSK1qo4zL48ao81F2uLo/xdUrXNNjH9Uj724vh1NfncuVHY h3X9rJ/etCyYMMWoG9abPS5nCi97gplwYtqX75HORCGJU7Zo8VJ7pzUsw ex45ADqfhCB2/dyabfx6SCdF4ea3a0cN8MPxkS2oNUMc3QYiLmp5RK7UP RjbPXZwDdIsQIbEQ6ZsDO0DPuKn7oi2ni2j0BPPwX4TLQ64jaV1ENcI6C 2Y7vZGzJkaFhJ4vRXwTKCNd02E2mj4EDh2U+rQMq38IDqtDj5YsO/eR6V jqn+PMGiEX948Rg9Sop9osbmv4HDstZXW6Vv5t+DU5OcZDaBqGwlwo9jx A==; X-CSE-ConnectionGUID: K7UAsONjS1S+cZC40rEP3Q== X-CSE-MsgGUID: Pg8RHgEFQhGH2rtqybB/Sg== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234927" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234927" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:25 -0700 X-CSE-ConnectionGUID: 8HuaCAnEQ2+bhEqnjgK5OA== X-CSE-MsgGUID: lwRgnZ30SsGhA2NCoUwOSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267098" 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; 16 Apr 2024 14:22:24 -0700 From: Tony Luck To: 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 v3 54/74] x86/cpu/vfm: Update drivers/platform/x86/intel/ifs/core.c Date: Tue, 16 Apr 2024 14:22:23 -0700 Message-ID: <20240416212223.9681-1-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: 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 --- 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 Tue Apr 16 21:22:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632617 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 1A8641534E3; Tue, 16 Apr 2024 21:22:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302547; cv=none; b=KjZm33uqqOoW5fA6pAVjxVrkcdSXn6ayhe6sbWQDLVSwW2OtZWwaOsxz4IasgOcHk3GAsgGkQLiOJkc4Luiqw0LSeGdh1v5vVFbwTHcy7ckH/1Mr6tvwRKrfdbw14BDkpMbytI4X2gL9wq3hv38K0usm13kyX4Aj0jk1Ao8H9MU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302547; c=relaxed/simple; bh=26W7AK4Uyulx7e8OguFS/2MgsGW9fO1MZTL4z9xDJQs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hxk3HuU+pD/uozq4Nn2fN+lgkdMy4idR2OriphZzwHJzFPwF/zwASA5MMmX+sv8RGtpuj4yVnjeJtaQq6Ty+/iF5xVm0HozKc9rCcfDFpax3h98pkWsP4Htz+iN4YSKyzyL8FvVc4uR95U6zUCsO2pezSPmlklMLibExg1QVmwA= 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=TL4SzQK7; arc=none smtp.client-ip=198.175.65.10 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="TL4SzQK7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302547; x=1744838547; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=26W7AK4Uyulx7e8OguFS/2MgsGW9fO1MZTL4z9xDJQs=; b=TL4SzQK7xG806DGfC2ji9bZEGDFiwXqbdEjZpjKttF2IZlJUFaY7e12k WxnknUDNvXaNEkZKnbzxZKhsbgflbTeAtbJj1V7QsI7j0JKHMdeeZUkhg 0J9M+ohUbH8nELsV8scGNwjTc/BlrzwlHgeXzQZmnemSfxSeKA8MJcJf2 3hDcAaAdG3EBS8fzPyPNTNNHZ76gCnXcXlSMrGEg3KR8MXtK5thQVBAqJ HMbTfYKDNSpqmedSxpocCfOX6GtqeCgV0cNR0cIKRCg9pEjvdyA63K71v EJVg6uV6NBI2qR9utUR7Gajc32HW3uu7sX4FqWmRj9rXT/RdfrnmkbLfi A==; X-CSE-ConnectionGUID: dxd8YH6vSbqXbrz7ISfKbQ== X-CSE-MsgGUID: DFYzq6+0Rh+FO24I21yoAQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234930" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234930" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:26 -0700 X-CSE-ConnectionGUID: veC1QxnpTbmIS/izpR8dvA== X-CSE-MsgGUID: 9tVGp7LxT3encNmfEzEh3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267110" 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; 16 Apr 2024 14:22:26 -0700 From: Tony Luck To: 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 v3 55/74] x86/cpu/vfm: Update drivers/platform/x86/intel_ips.c Date: Tue, 16 Apr 2024 14:22:24 -0700 Message-ID: <20240416212224.9700-1-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: 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 Tue Apr 16 21:22:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632618 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 B96661534E1; Tue, 16 Apr 2024 21:22:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302549; cv=none; b=kzgsvVgnrMhttrjeoLz50PEd7P174AFPhfPDwSLjhb+MOv/zETiUjDo1C+YYkzcdwJX8TBJZ+FDJtvhqsIF/zTo/cCi2WmYspv03ygud6g/DeJMqMsai54N1Fqg5cb2J5PJwKbOJMeySPssbQs6CQBRw8Lk/K1MCfiDZKqxynIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302549; c=relaxed/simple; bh=lMiePj5BLeBwTfmhtOWVl7Nr+Y6PBZ2sXOR4c241KGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LbCrWpCrFSVbGtu27NM/MJRW1KpnPMVS/iTlBKunNpgD4+K6WUDBwZuATAk87J7ztcN5RMRq01sd8tmE0HkBAySTKN0qKgD7kQsXM22Pr55E0XRUa1JLdIk6GFTf8QdxVjwX60wL4Do1b6HCpB7gMqI8ospkFbITk+dBN9P45o0= 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=c2grWBHp; arc=none smtp.client-ip=198.175.65.10 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="c2grWBHp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302548; x=1744838548; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lMiePj5BLeBwTfmhtOWVl7Nr+Y6PBZ2sXOR4c241KGg=; b=c2grWBHphFzu8dLHdwda8IFFrj4zB33CD6ITQy3dc5bwmhqWD7NkpRnr kaL3iUrFv+FWUun2HOlelCUp4UyMXmGKTukZ3/9BEDYLOjSVmDVvyo69+ +351YjfawEGhs0SQz1uaxt/F63f/LXNmVvSojkkxltvKV8GyJ7HN+B2Kh CTSLgN4/sglZd4qrriGLkOXZSuEX/vf7w0YvzqSwjNAJp0pjaHxUAoE93 oBS3HypKJbzhjNS/n6OdzFRS5j8Z1ZK0kW+lRRqwJdIg5K9JjfvrQFEdO iuXBSvr8HGemCNOx5VzybcUchMqSZwiHDru3jclQBW+r8aU40BfL4S7Ah A==; X-CSE-ConnectionGUID: hiUS/5l8RsanD8We2gDT4Q== X-CSE-MsgGUID: TsPSvvbnQ4KmaGw28c9PeA== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234933" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234933" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:28 -0700 X-CSE-ConnectionGUID: SytoHrbhQzOyMrJKIVRlJw== X-CSE-MsgGUID: 9f4soZjFRB2LnYC4Dk+1OQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267121" 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; 16 Apr 2024 14:22:27 -0700 From: Tony Luck To: 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 v3 56/74] x86/cpu/vfm: Update drivers/platform/x86/intel/pmc/core.c Date: Tue, 16 Apr 2024 14:22:26 -0700 Message-ID: <20240416212226.9719-1-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: 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 Tue Apr 16 21:22:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632619 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 51A97153563; Tue, 16 Apr 2024 21:22:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302550; cv=none; b=kekjN9oLr8U8Wc28EAtFfPc233o3V2jU1K5aKC1m/T9wetX/vMuk8OTXp8e3C441BXLKEVXIcpXJxOMk1BI9hEcfYA+uQAACRgs2ZEWUyT3eBbMzOgfqZecJrUQW7tEAmBif/WV2OC54sAcJGTaZqBKC6PgYcevMDqLFIiodBR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302550; c=relaxed/simple; bh=8BfI2hjYKf/TtKpPZBR8m4bVwal0XuuMnwSbzdK8eQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iu1FobueeJX8HjOTN41jhqGbDOXQKj1zI/J860zFqB/yVY0HIHnjomZrSKOJjNkORB6s0ktpxPGjo92v2vf2kG2X0HA3Df+vqGZd8XdLvmXWoMyiIFfmvNjrIPC/JhSEZoInRinxEVg+krJUoZsQoUr9BC/xJ8zQmL2Cyf375iI= 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=XQZMBaub; arc=none smtp.client-ip=198.175.65.10 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="XQZMBaub" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302550; x=1744838550; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8BfI2hjYKf/TtKpPZBR8m4bVwal0XuuMnwSbzdK8eQk=; b=XQZMBaubyEdlEWQx3Uz+lbBwoOd+ZBC2rRQO/xTzFcNslQj+jBQWU8KZ DsyENG1R70jLvq1qSpEZu0BNyGM2mxcp25rhpwLEqT4cDZ0UHKt3oCLyM metxldIBwnNEVc2AEUMhYRjkdBRUMhpbUY4ti0X+2ubBDYHLrwiGaJzDd HjKBvCpActoVkaQi9VbOM3y9evs+uMx/0Io+tasiiA8F70QP8S6ceJ5Cu wa0pIRYHWyFjOOmzYyhZHXgdjVJWO1P/q5kdErsE2hQbhCFlZ7NFBMjsU tUMMYxbZPzUfg/3WpV+bXCmtnMXZXZ0Cdr1kN7wtFErRbFYW0SjekBY45 A==; X-CSE-ConnectionGUID: GQKRGoeJTYGkoNAjs+uh/Q== X-CSE-MsgGUID: xe7u8X13SXyBX9XdkShF1A== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234937" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234937" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:30 -0700 X-CSE-ConnectionGUID: BySBqOK3TjO5ZcdsOmpUVA== X-CSE-MsgGUID: 3hsOb6obSVSWJcgRLXWAJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267130" 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; 16 Apr 2024 14:22:29 -0700 From: Tony Luck To: 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 v3 57/74] x86/cpu/vfm: Update drivers/platform/x86/intel/pmc/pltdrv.c Date: Tue, 16 Apr 2024 14:22:28 -0700 Message-ID: <20240416212228.9738-1-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: 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 Tue Apr 16 21:22:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632620 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 00D9715358B; Tue, 16 Apr 2024 21:22:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302552; cv=none; b=X/+pnu8ijuGkB6H7i2l9ZPH7lyKupBpChasGRfKJO7h2LrQ0Xrdyc1PLWN3HzbQSKYWal1/Y7VR88l615Ez0P3DRAxLODpiDHFIfxHsAtqLdHI19ZxuGjT4TP6MDhRRIAXDLvdiW7NEmXs5OgeNsTC0WWUgXtgNumSPrgruN6UY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302552; c=relaxed/simple; bh=WDk3Nytz3rdQKdrZoCkbG+T02Itdm5c/GxoSZ2n45IU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dg9kmgSydmxeKBsZWftfvart1mXdVbLHQUb4M9G7rTevLKdyGQ+qi8djXIDAa9F3ojQZbeSutP30wV/A7l1yeqvwkwCNBT/28T/Odv3SQ3q6Z5nOPobn0SnQU7l2mWs9RlFQy0iyh2yA89xyHrkeDU2xO6LUM9XVwpU0M5AvooI= 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=SxOdgDZP; arc=none smtp.client-ip=198.175.65.10 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="SxOdgDZP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302551; x=1744838551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WDk3Nytz3rdQKdrZoCkbG+T02Itdm5c/GxoSZ2n45IU=; b=SxOdgDZPYzSpUzDtnFYBSUeARh8FBnym19GQ8iraM56Y4JrN9qeUnhav wNSA7K8SdR3geKu5o2ZuTqR4yUy7CTNUA9FBg1aUd6jCbeoKjcLWk/COr boEbZtS0I6SQr1QI0ZIXp3HzHzK5ke5ozU88SoNrJkByKy+T3SZnrjWmj VcIp3D+JgM7rciUuDGoqMhbIwfFufTkNG8qO0BNvESGAtSbVgrUrhCDt/ y9S2r3XwSn1+ygg6iSTQv3L4PNE8GTdJEVzJk9OvgbZxnPa1gfwKD0r0Q GvXv/eVyPYXTaw5rpgYYiDcZs5mI6hOgCzzUR5x5Xl1Ihi4E4fsfeR/cM w==; X-CSE-ConnectionGUID: zfJVlixbRk+sdjCxTFhYCg== X-CSE-MsgGUID: c3t7QMofQ/y0mTvqCnwckw== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234943" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234943" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:31 -0700 X-CSE-ConnectionGUID: t0OERbynTl+B3T30JVGjfw== X-CSE-MsgGUID: oOe4Yg3tRbKuWYPGYiZZaw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267139" 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; 16 Apr 2024 14:22:30 -0700 From: Tony Luck To: 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 v3 58/74] x86/cpu/vfm: Update drivers/platform/x86/intel_scu_wdt.c Date: Tue, 16 Apr 2024 14:22:29 -0700 Message-ID: <20240416212229.9757-1-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: 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_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 Tue Apr 16 21:22:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632621 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 B3311153821; Tue, 16 Apr 2024 21:22:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302554; cv=none; b=i2PqXGHFwC5H5k/DXVVNhrAyPPJotSOMQbB/Ocpj3u0U80W2VtkI+ASmNQi04VfchenUzbA0v/Jo+GUEC5LDxC4vufioMWGxWw84riDjr/KMSQvlt7CKrdwlkf4uUF4Al87hfP/QypamerHCApjKxqfzpS9tMefSpumop9OpkYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302554; c=relaxed/simple; bh=zq3PVQPAcMWcn9vz87aBSrEUPTNktf+avk5R+71nh50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LHjZuflRb5APGqXipsjVWPZP/KbT4LK5y1gHRoXeiDvWqsRBLPlgOVbh3Amn5FLiYY2Pl+eMh9HYmG7yeIid9A+wKIKLOwG1Sh6p+r37zZChvFD2xe/+Xe1IlrSpOlDmFgxmeojymZ2981U9u+ed/UKfWnxNiBij1VwDtM4lzrQ= 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=D5M6rXaz; arc=none smtp.client-ip=198.175.65.10 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="D5M6rXaz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302553; x=1744838553; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zq3PVQPAcMWcn9vz87aBSrEUPTNktf+avk5R+71nh50=; b=D5M6rXazRQuL2ZCanHYD2ihWMrRcVGmyedpZ93lAhiYdupap8zPKMXLI 0at58M/PQgG4r5nLuY4IuBGKNCY8YwjeTSj/f6ZA79gGT0+a7ALaTyPsl KiyYT0Y2XXHBYhccYUkPbiOS5VcJRghECGMTARfOunoRmAyguQi0c9ZLp isZpmMCIpgWagSs6j3yXOuQHgMXwsElr66+PMrWeflHgU7f4nuBNH/l0y +i3ODXzu9qQeLETgTyi7Tjx50myWcMP99enCV91hY8V25Dh6Hc2BtOHJG pdaLR2b9rGwn7L9wUmG940ogdEpc+MOTU6m2fRxUxwOWwoblLngCY8Zsd A==; X-CSE-ConnectionGUID: e2hWXj7mSMOm/6Kg2pSwwA== X-CSE-MsgGUID: tWyf3A90QkKD1U/BFBMKVQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234949" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234949" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:33 -0700 X-CSE-ConnectionGUID: ObrEmu6yRa6ASzq7uV/Y7w== X-CSE-MsgGUID: WltPAPugTKuO/iHxvE2aLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267143" 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; 16 Apr 2024 14:22:32 -0700 From: Tony Luck To: 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 v3 59/74] x86/cpu/vfm: Update drivers/platform/x86/intel/speed_select_if/isst_if_common.c Date: Tue, 16 Apr 2024 14:22:31 -0700 Message-ID: <20240416212231.9776-1-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: 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/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 Tue Apr 16 21:22:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632622 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 2F34A15383A; Tue, 16 Apr 2024 21:22:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302555; cv=none; b=F6MU8NEUTkLjFdHnoztAyvSjeZ9uIAX2agvq7VvJOPa7D3WmQGX3xYAmS5uSWKiPKFMjGfNAIAqY8k1jnJQCyJVKNyVMHI2b3gw/b2rhu7TWAnECRt+7FB1YMtfq8dQRsvibo+vsSwBqQxkzSdtOHNV1WDZu97+Mr1xzg+1cO+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302555; c=relaxed/simple; bh=i5bcoBcmvU7uXKCZja5nQG8SX5zG7nFXavF27vF+S+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R1ZMz0h92K5ep7o636lxUP7cFLvQ55ExXWZ2lZzt7JwX+rJunbbH6uApY9ExbQ7DE2I2JXTlswZAbbycEimnGnz2Fx4teYVZAyd/g4mJfAS0LdBmtUiJeGPSsDhPx1t9nuKJDbyAnCSefoyy0KqX/SMu9ZCrvKsBoNwLjAoJE7s= 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=UmtYdD5r; arc=none smtp.client-ip=198.175.65.10 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="UmtYdD5r" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302555; x=1744838555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i5bcoBcmvU7uXKCZja5nQG8SX5zG7nFXavF27vF+S+o=; b=UmtYdD5rGMWTITiE5X18SCK0Clw4tCis0VhLECzsaf8Z1elhdbtN54kE 4e4hKXRJLSzbpGM2xxR/oV56aZOJNFWFcMsDOMujmI8sa7HFxfNqaRypo vjxGsoaAtRGbWt+0/yh0+RcQRFdcgqacM1f6LJiwNC6yhGAGF0B6++z51 EjU3PNTcRoi5du0L2mnl8+LvKzSAlqxYYKj+z5RcJZD0h127ddI8r+OBe ZeCOLZmCkB/hFJFlZKfLFgkR3MI4V3qrRVsCuefLyAiVCNgunb1wxQnJ5 m9GXXZwggKd7uY6aCrLvbavPLeRvCvK7xt5xixw6tIjmnrAVLTSLBqGXM w==; X-CSE-ConnectionGUID: /IO04sZERMaKK88h7Pb3yQ== X-CSE-MsgGUID: oc6QxcqqTY+/YNvgjeAo2Q== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234954" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234954" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:35 -0700 X-CSE-ConnectionGUID: oJHsGQsVSmuFgveTonn+kg== X-CSE-MsgGUID: 1a4/EYkcQHCPBhbEZD0iUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267148" 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; 16 Apr 2024 14:22:34 -0700 From: Tony Luck To: 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 v3 60/74] x86/cpu/vfm: Update drivers/platform/x86/intel/speed_select_if/isst_if_mbox_msr.c Date: Tue, 16 Apr 2024 14:22:32 -0700 Message-ID: <20240416212232.9795-1-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: 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/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 Tue Apr 16 21:22:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632623 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 C9829153BE4; Tue, 16 Apr 2024 21:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302558; cv=none; b=bLSFBJPA13hvEas/1+5mp2VxF8SQXSCBDBBHz2KBKKEXuYKA/eINVgNUoslGhOfOpS57MmvvqXTGJGYPZK81TQDMbTqhr5MJleBHKe2RCMSabas7CTXdOl/G+eJmMBnnhWJtpyZLcCcRVLo/TeQsTaS+7qBH2u+cPzoU6HFxoT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302558; c=relaxed/simple; bh=xr6bb9OF0NXrEF0HgBC2BNEdfy38NpnLKwUrq7aiRyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bfZCvI3RCL9fazArO0sC+SIqmze2zZ1gf/sVBsCeOK0uIDmRHsLkbC2YVC9spvv+Yo18Zi28RQaBk3iBSc/IJylifKdETfpimPOCXDuMG/wR3Wz6tOzLyQlGLnVHjhvT0hAcHTUWxtGR5PT3chqHDsq0Q8EO3RPSrRJqIrGEvWE= 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=NWc5ICfr; arc=none smtp.client-ip=198.175.65.10 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="NWc5ICfr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302556; x=1744838556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xr6bb9OF0NXrEF0HgBC2BNEdfy38NpnLKwUrq7aiRyk=; b=NWc5ICfrUSYLllACuYrmOk9vUy03k7u3OYZkEkuvsnT9Q7+Snfzi7X/7 wgWUmeE3o/sU/NRU6mnpuyB7oUZm73PuMS3daIOorSc8V1yS+vOCQkq86 mIL9CHWn2RlWrDQ1100ai1Vf3c9B86vFSmYV0kUDD7BzqAsKSRxUmGgBI A6hGj1YJmRLDj5rHTHW+l6Tsah7myTI4CBpEs6n5Yg4wB6wCKAivM9K1o jWYSg9VGpD3sZm8HywuR/BwfhB4fXTeLyB18KX4IDTjIFj5pWs/PbxLZ8 ViUX+OS9M93pGdODkHPAb2dZpIERs5a2O1ejl+InTAiDy4bij9U3kMf33 A==; X-CSE-ConnectionGUID: P/nguXhvS/mOBCQpkcaOpA== X-CSE-MsgGUID: y6Qt85A6QFG1Rn0Kuki4cg== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234960" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234960" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:36 -0700 X-CSE-ConnectionGUID: 9YV+y7AuQsq0MjgeG4ClQQ== X-CSE-MsgGUID: DwaZahe3RaWfWaY39WH22g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267157" 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; 16 Apr 2024 14:22:35 -0700 From: Tony Luck To: 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 v3 61/74] x86/cpu/vfm: Update drivers/platform/x86/intel/telemetry/debugfs.c Date: Tue, 16 Apr 2024 14:22:34 -0700 Message-ID: <20240416212234.9814-1-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: 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 Tue Apr 16 21:22: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: 13632624 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 98536153BFB; Tue, 16 Apr 2024 21:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302558; cv=none; b=Si7BNFm4VhPF5mKgDh8LNqMzR1Y1EaqhFrrNiPT2IhYbsHpmO2ApU3zO3AIxumFSdCQK+vMrYZie3/irR0B0GdV6WKxsTZTzybH6l45KCoSWnDO5v0zOHNCe9jLKZ0kJdIAq2HMQTW7hoGaSsrEI0eRJ8bWkGG1DVt0rhx+zs30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302558; c=relaxed/simple; bh=lGxY6/fpKVjagJiMiQslsjgDFgL5ZPdXodSr7eR0UbE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TQgD9YY70e0sONbeRvfUFqus4buaokoykkxDEYZ3mUsEBH3Hs/QHk3xyihHW1SLWewFVBVBLr3rVQGCYE2dISPgJT+mFuXA8KqJL6k6hQ9iccBlZlaUWMCPsRwSAPWXFxuf4ACLJxUuaN/zCyVH73XR/thWy5ixRUr3M2wbVs+I= 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=NaczheMY; arc=none smtp.client-ip=198.175.65.10 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="NaczheMY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302558; x=1744838558; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lGxY6/fpKVjagJiMiQslsjgDFgL5ZPdXodSr7eR0UbE=; b=NaczheMY6VIdLlpyFFT8VvlR2r6hqVsRS2/epw0vG0Dz2wZHZ2Isc3vl bU49K4/9wO13Np2mngZQzEjErbBkdkhX40fyEKt/9yMgBwRMqt8zRv7Eu lIDZyjoNL0CpjOJcYIrUjBVSeSwRg+Ksyv81nq1fdbZCYSF704zbjAxI6 z4wszAF8LHuxHEp8JWuk7UDLUt/Cjep66mYY3uZbnC++65PaNGf1siJIl uIBqMKA0UINO8BnrLVEXsWhw3aFTqbVEpKQ/d/0OmrCPSyfPDio4Eh0GF B6xc4Oowjf3T8Bz+nj4/5szJsY90R6mSdCZAUuyEjgIVRjO/O51V2VRDi A==; X-CSE-ConnectionGUID: 1tCjNwrATr2crVOypBM9YQ== X-CSE-MsgGUID: JpVC5+iaQf2T2RmBI6fJfg== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234966" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234966" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:38 -0700 X-CSE-ConnectionGUID: U9YR2isZRIqmsi2OYOxMnA== X-CSE-MsgGUID: fRcW4r7DQ92SvU/O4Q18ew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267160" 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; 16 Apr 2024 14:22:37 -0700 From: Tony Luck To: 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 v3 62/74] x86/cpu/vfm: Update drivers/platform/x86/intel/telemetry/pltdrv.c Date: Tue, 16 Apr 2024 14:22:36 -0700 Message-ID: <20240416212236.9833-1-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: 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 Tue Apr 16 21:22: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: 13632625 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 94467154425; Tue, 16 Apr 2024 21:22:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302561; cv=none; b=CW0BVA59bxihVu0i5SqWyic4N8FXUV244SsrpTRh6DO9iHEGyqBgTzstXAL03P8l9taAbK7nY3gt/aW3yPXTv1a/hul6xkJTbWk99KQPPFzbgUvtKB3s1yc/sQePz8jq0Yg1IXS/yQUvTXmxuqgUCteb5x9edcT0RHYeTMd4J3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302561; c=relaxed/simple; bh=UGEw2wLj1K8vQaWrX5dXU0U1OAJhcpCUAILxYE5zspA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M1RgQcdpkOCGWKcDS+EUSH1HOE77u0R3MYf9+i54dmBIXHGuToRj6rwynAYyjerkKe8eV8HRuQ5wDOydb9F1IfQww5wv1rYpP57zvhnYAwVYdHthohJz+m5M/qO5Rs1oUvoLNZSKjSr6zBNe3OiAbLJdJAuN6unnlV3/U+Mp1t0= 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=cykm9dbg; arc=none smtp.client-ip=198.175.65.10 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="cykm9dbg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302561; x=1744838561; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UGEw2wLj1K8vQaWrX5dXU0U1OAJhcpCUAILxYE5zspA=; b=cykm9dbg+q8JQK+bOxs5AWqUlftmYjtg5SN5euUnlAqtsgxOyze/Mowb hMdaGHvqfDtzEd+mt1HdQwPy31LOZgOw0sV7iqH01NzUSnmvODqnunVCP 7A3Pc0DGKBTOa8xtXCSHUWXufGnAUZKVs10a1LVsP+5/7+sid27BssBSj VBhUeQ325YhrlbALz5vVyTHqjfWWQTH+gNIo2lCbAW2UdHdOOk1IR9k8J sC8ezZIE060D65BH4dsjmnqtK+6ntoR02PtRiw3kgdcVN1MmgVxdxJvaD VDpTrnV71BdVBvOWV9ftczblFAuiLBDNgLxbOmVhA/L08oGf1qSP2QeIf Q==; X-CSE-ConnectionGUID: srw1/7WsRt2m0DBblVmH4A== X-CSE-MsgGUID: R0KirWHdTeGijbw1fcVHHQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234972" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234972" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:40 -0700 X-CSE-ConnectionGUID: GYLbcdlJQ3SFVubVqXwIMw== X-CSE-MsgGUID: z5wWVXzGTISjNuHB9wcLFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267166" 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; 16 Apr 2024 14:22:40 -0700 From: Tony Luck To: 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 v3 63/74] x86/cpu/vfm: Update drivers/platform/x86/intel/turbo_max_3.c Date: Tue, 16 Apr 2024 14:22:38 -0700 Message-ID: <20240416212238.9853-1-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: 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 Tue Apr 16 21:22: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: 13632626 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 DDDCF154C0C; Tue, 16 Apr 2024 21:22:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302563; cv=none; b=TqSFTzQ55YfFyqXPSLoWMBa/c+m55VjPNLIJewrmQyIQ454BxJgZyoEQcZTBL0stOFixBuJyJeRwGGSL1aaIGYISCWk+f9//7N+kB2C8ICGyfZAdpBdkTjr4GfdD0zZAtmVzWNjBVpL9e18jmV5TnX+QHAm2/KMqafFQ3VQzs5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302563; c=relaxed/simple; bh=LOzsD5IsD59gKdeksTuIW83sAKQTK/XFVhkG9cKUAsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i1Odx4rpnDEBeMs6/wAQEpkokZkZd5qmlmWa7REv3gr3CuXfSjzJfOgxGdhc9e6MCjsGnvk1+pBQEDdykOTktiEIvYE6hOVKLAckafpt22rxn79EcCW8++Wd39Du7LZ6qCH9PvPb8GpKxitktt3AvRe1xdoHTMfXt4O2a9XbpC8= 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=ac2JBQYj; arc=none smtp.client-ip=198.175.65.10 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="ac2JBQYj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302562; x=1744838562; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LOzsD5IsD59gKdeksTuIW83sAKQTK/XFVhkG9cKUAsU=; b=ac2JBQYjKmkVNte+NaGd5Sm7xA3yVwCxxuIXly2doeQFwYvzbqXg9iEv nsp6wlyimHRlgavqiCEIN8jcYvoI5Vbc/WSJLlYJ/Az7jwDNZzgsKgcaq nZaAdIxyHHBDTEGNbwglXUJUnVSXUIRisdNzcQVpvALxlK2qSBTM1HJq+ Ig4r46Ms9FNLrMb3/MipvvJpGNUzIRUpcX/qYJU5YMUPkR+dwSkrwdaPk XqIF7fEm+Kr96x0GDsX0vE7LPHalPRBZot46MSxAU1Uvs+GQRrw+5mY2K GLmwweXwUQ/f0WPMyc3kHz9rACH2dNETr3bwMwV4kZR/DfHVXJf1oPpVj g==; X-CSE-ConnectionGUID: Qt1vHScUTzq9ls6SY9X+Lg== X-CSE-MsgGUID: bRQz0py+Tpq96YVA8a17RQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234977" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234977" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:42 -0700 X-CSE-ConnectionGUID: UV9GmOVUQk60QprN1Uwptg== X-CSE-MsgGUID: aPh8PptFTwW+6X0ROnlMmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267171" 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; 16 Apr 2024 14:22:41 -0700 From: Tony Luck To: 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 v3 64/74] x86/cpu/vfm: Update drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c Date: Tue, 16 Apr 2024 14:22:40 -0700 Message-ID: <20240416212240.9872-1-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: 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 --- .../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 Tue Apr 16 21:22:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632627 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 A4AFE155308; Tue, 16 Apr 2024 21:22:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302564; cv=none; b=P4HjdnTOUXbvuZhDnM7s5GeuLXG5B1SdoXW70KlNen9HN1M4t7FmCHNI6+kGMzASM09KdSLSYNGch8L5mqtb3Ml983gimWW7v59+MrLVar0jIn4Zm7bqKeXIYPFqyrTH5FpdbYuOuVEhsG+Jx8NTU2G7KAP6A5pRcKSjmYezeE4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302564; c=relaxed/simple; bh=NHkS+PLB8tCqh4PRqBz9xJFe66d4//WHYse1TcAmK38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XllP7+SVcazlMmFvF2B+xuUtVxkPSmTT9zAb6YCFUVdVWJhx65876jZIY92CjtVjTooh7jaK8WBE0G1quOYvEOTaSTDKiNSxT37YYofWOwc2JSwEqfTJimunMrCHwD7RhSng7pG9jTRJRnaU4CRRRAFtEuWGx9BdS863G43uJ1M= 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=KdUMnn7t; arc=none smtp.client-ip=198.175.65.10 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="KdUMnn7t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302564; x=1744838564; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NHkS+PLB8tCqh4PRqBz9xJFe66d4//WHYse1TcAmK38=; b=KdUMnn7tnQDNbmC5V+KSZUKBQ+Yvw1m8Ux6/pv7qAMWKJGus+u+RCUnK 7YxL3/zACc/VDG+OR0JxPTXlPFaX+OMkaJPOMpr0CnI2F0eXL5zR3wTSV 7BDMzoPzwtDflg+tTdWMSEZ+U1t/aHJ/laMPDwschwsHrbzOCTfzyJs9Y /zB6glJXpzVI5KATysjNjmxioI+wl2uj3YNEI7JIbCbB2T5BvUzsfpCTp aKGA5XoNAfnC1tGs944HHQI8RT3/541RTjYQcQW/JvWZZnWfmqElh3N34 fCtM7SW1vcdXR90fL2l9rnyeOAFbn6YVfw50F3BlSv41ftv5tsaoZUpwq g==; X-CSE-ConnectionGUID: 9ixbHLjcTbi22Tmi5JKTAw== X-CSE-MsgGUID: WZh0DlQ7RYGoKdSG+dZsiA== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234985" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234985" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:44 -0700 X-CSE-ConnectionGUID: CWiLvwUlQ3KLEGIfcRl7qg== X-CSE-MsgGUID: I8zxmdTuSDGrL2Y8iU9mxQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267180" 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; 16 Apr 2024 14:22:43 -0700 From: Tony Luck To: 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 v3 65/74] x86/cpu/vfm: Update drivers/platform/x86/p2sb.c Date: Tue, 16 Apr 2024 14:22:42 -0700 Message-ID: <20240416212242.9891-1-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: 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), {} }; From patchwork Tue Apr 16 21:22:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632628 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 C25F8156895; Tue, 16 Apr 2024 21:22:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302574; cv=none; b=ndg219F8g+hkRUZiLSnvFptqdjhnPluzthwakbQzSxFBvEphuqdZWJxetwyv9XI8uMxe/3pc2Wya4IjN9M2nHT+KiTvB5y9oeUivQbrRoJun6NJJD6E/W5jKb9TNeEgISXlqNEbZuOhVXhmPjfWlIJM4Y6eiqkqs9ThKRNJc6Ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302574; c=relaxed/simple; bh=IUM4l0d+HAzrageBnuTfsgyVu/n79Su2Td/OJNGsTIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oO2K5Zo904b5VEM6AFmTqYwooeYa2ijTDZe8ZFFzLbZubGiRtPDGpqWeXvurSZz79cvdYHx2Q9I1FjK8bof7AbQFBQaAgqqprdrjdQtOlT/riqn/QYjPMBYs8lABZq6Q09MLH8Xm7fpZ/0P+3X/sN7l8ag+phBxzU9GwfGzris8= 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=bLSZ4Fgb; arc=none smtp.client-ip=198.175.65.9 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="bLSZ4Fgb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302573; x=1744838573; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IUM4l0d+HAzrageBnuTfsgyVu/n79Su2Td/OJNGsTIg=; b=bLSZ4FgbBGMvU73QXQ98zl0siMkg/FTZ+WrDVZ8S7wg6y1oolfzyNLC7 JnpxvlYNlj7604A4u/RpMIHCDxtFrj8WQmGvE9og+JsavnxJ7AECjYMr9 8L8uHdFmiJbIkP2/av742ytI+Eg4YwB5SrJuX7e0wZd/eXKhnY2bKs2eF bs9jcPNMsgLNkGr15JLV3Mt4gQspTNHEfl4Vbo0aydRFWcuxASZadPVdm sVnhCg6yZVJ5h4Rdeyni2gbj6uDzVZvUzrHc4szgOljxD4lkQxQBXEIo/ i2s7DlRCehuBEh3MDaWt2fJstvz9GOXkfoA1oRxxXGerwqAtsmfntOCyV g==; X-CSE-ConnectionGUID: 0yUp4Y96SZWCnAcUXOUKvQ== X-CSE-MsgGUID: 85ZKYqvUTQS3SPwpXfwE1g== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="31254718" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="31254718" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:53 -0700 X-CSE-ConnectionGUID: j2BIYU25TlKgLgO2PmyICQ== X-CSE-MsgGUID: IdfXabIQQ7isy+ZJ4BIFgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="45677878" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:51 -0700 From: Tony Luck To: 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 Subject: [PATCH v3 69/74] x86/cpu/vfm: Update intel_soc_dts_thermal.c Date: Tue, 16 Apr 2024 14:22:50 -0700 Message-ID: <20240416212250.9969-1-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: 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);