From patchwork Fri May 31 20:36:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682147 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 8255582866; Fri, 31 May 2024 20:37:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187834; cv=none; b=oKinT5F2w755iIkUWfEMjX+5NttXezoRdHJWfD5VoDHWTiS2GvdmwlW5QRaIpXQ2fN0Fm/NkhbcwzoPJDXZMliStx3Y2XSow9uUpFBdXrHbdTRt6ytuR9YOiw27GZU95vSuwCwMsMX3OKJOVzdRLPN5uDbEI7JJ8Cs7EHxQQv2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187834; c=relaxed/simple; bh=FfeANi/aX8lTWIYdqfaGTSFqvYCgBVvixGLxtNlg0Pg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JhCUBgD4ZvkkH0Xytf09K4C8gqDl/4obasRa09FsiGfVmiOuLOMztc3OrDbVjsmywws8gWAkEz9SU+QRRYDQWpxv6BTrwTpYzhF6vsqzfoDzkWx9COOfd3/g5XpODq3+KYEJoLeRFVzDQ93k6ejhtIAbxHWs+q/fZ9Ih/P2cybU= 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=CEWNJICp; arc=none smtp.client-ip=198.175.65.17 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="CEWNJICp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187832; x=1748723832; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FfeANi/aX8lTWIYdqfaGTSFqvYCgBVvixGLxtNlg0Pg=; b=CEWNJICp++nyIKcefpsHT+Rry40ERC17bX62GB4Hl/uNAlLxSvGMs4mQ RDTkdarceZBoaWBJS1uHDoHlMBygOZRYJkodvV1NGQo6wqkdp10oCKaqb 7ssEdpYnfLsVSLx44MHrkUZg5xEyFh0LZCQh7vQi7qaZ1g+ph4hcd1NSK j8gVx1YRrqiewQ3Z0czemHWsGxDz5YF4/41QNSirtrH50rJ4L84d9cUkk xvUWWpVRzB7meE/KO9M119SfbDxGFx3Rqv6hmXEqvY+X6XDzudYTirhMc +PG+MXLSsXIZuKSGIE+ZqGMklbH6A3dAvX9MC4d+B8b/r5cuSsAwWcRaI g==; X-CSE-ConnectionGUID: 5DeZNwbhQdGFcSuHvHpqUQ== X-CSE-MsgGUID: omhxhpM9QJGBLBq/dLUKDw== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871821" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871821" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:11 -0700 X-CSE-ConnectionGUID: +HrKgBRjRQuinUm4p0vBFg== X-CSE-MsgGUID: RhSU8KmFSQeJNSoZzZXIsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355364" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:11 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 01/11] platform/x86/intel/pmc: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:36:57 -0700 Message-ID: <20240531203706.233365-2-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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: Hans de Goede --- drivers/platform/x86/intel/pmc/core.c | 46 ++++++++++++------------- drivers/platform/x86/intel/pmc/pltdrv.c | 16 ++++----- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c index 2ad2f8753e5d..65eb09c7af6a 100644 --- a/drivers/platform/x86/intel/pmc/core.c +++ b/drivers/platform/x86/intel/pmc/core.c @@ -1293,29 +1293,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), {} }; 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 Fri May 31 20:36:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682148 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 0EF0A17D8B3; Fri, 31 May 2024 20:37:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187834; cv=none; b=A0v83/y9qNH2uW0s6KfVtLHgeItZxL/6WApOq+UGV9xFmwqGyK/34oojnQi3Ksjs/aOeOtl3F8fUPPxnfVZZaQcnhh6Jp2TWPx2SOvXAg4flfngO1O8qSs88S5OdhmIUFn4ln5H4qg5XESgmhWQYYgkK8gKUtVUPOKi6DocG7cg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187834; c=relaxed/simple; bh=sOqZyHOaT5a0l8XCc8dAZljiRy7fauzwISe5OXzMWko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u9VUh3eFPM+ZXHZhdl8nKoR1nUJcK14tq+bTugFSPyxx+QhZ8kCktdXX04iSnV+Qmc1JLTTQQC2BJ1Q2yVagx+WJaDaSY1Y+MYW9ZaMsbJsrgxGk9jl9qEcKxs8dWI8ktHxYeemI75MrDGeAoi2KvJgtuPUuVIiocCSj1m1uP5o= 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=YNp9HAgo; arc=none smtp.client-ip=198.175.65.17 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="YNp9HAgo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187833; x=1748723833; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sOqZyHOaT5a0l8XCc8dAZljiRy7fauzwISe5OXzMWko=; b=YNp9HAgojvmP22LFuCMEhufXVuQJHQ7Fxjri9VoBTqCUqlXMRNgH0pPK NPHaYFjeVvDqcCcgzUu1DteWXLOs9uTRpIfGoS00CT+sUY8rnZOIimZWl aj0vkKERjVP54bmYqtSmcivLx2VnshlKcOH47Vf4vpHYG5YkpIPKAvMSf 4jFixIr/rxvxUurHIIzlV5jS/f9TYvjIvlSA4M8Tr4ED4xr/ayKRdVrOT 2hdfWjPWOKw3/Tt6I/WyCt31VpggJZxOfAetpuQipxnEQc/gL6vt15GaC zx+XdT6DKY/sKegeXkZmov5riStaxX7ntq8bQ3sgFJrD3lYAdsD2N2Mvg Q==; X-CSE-ConnectionGUID: BXx4m3hoQlSRTZ+uoGDwZg== X-CSE-MsgGUID: sAx5tW8rR8OOuQjHBUbLKg== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871825" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871825" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:11 -0700 X-CSE-ConnectionGUID: heBKNJT+QL2CKT+2huO8ng== X-CSE-MsgGUID: Z8CZGAMUTta+zyMZ61VfJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355367" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 02/11] platform/x86: intel_telemetry: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:36:58 -0700 Message-ID: <20240531203706.233365-3-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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: Hans de Goede --- drivers/platform/x86/intel/telemetry/debugfs.c | 4 ++-- drivers/platform/x86/intel/telemetry/pltdrv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 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); 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 Fri May 31 20:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682149 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 1D91817E46B; Fri, 31 May 2024 20:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187835; cv=none; b=nO8yeUhQRnCAZf4ClUsOj0gijFrnT1ehGCdd2PVQ8HH4P7bpSdAwJ+98eLEwWJ33dt2xPLJ97yMcD/gMripYe7MZjW9e9b9kYk6jIPnARL5XVHsRN+SD88Qgh3Ab0SaMfkAGmULCJQuch6D0OFRd0vL0Hqm+regmIF+amOlQ7CY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187835; c=relaxed/simple; bh=fYJHYz8V9kimHRbxD5uVEAotpDMXkQsRHlaEWk/P2XA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W4Sy6fXj1KEESFuefAkn9Y263dSCQmjETPycHhw26JY0N0YXRovHAHfuM93iVFcwXNH7208xS+Cys32X6gpK/oIho0Ukg6Of0JjY25oBQwvvXi1DgftCwmOFqSoGG7VKOTo5HScj0l+0WqQ9nUU3uG9sghyCiecUYRcBeEbK+1g= 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=IhxbrwBp; arc=none smtp.client-ip=198.175.65.17 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="IhxbrwBp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187834; x=1748723834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fYJHYz8V9kimHRbxD5uVEAotpDMXkQsRHlaEWk/P2XA=; b=IhxbrwBp6oNwE3HsRARz+ta7fux+EMRiXzbylkNlG21sdYUmouZq6jg3 EmUfYEqLuCfdf6cN8P3d+J851+35bBrdtLndBV1awvOGbOApyTHxVImuL xCUu7PmRKITUpJgK5JLrrUvUjlw4bJrRX3JJ2Fd8ITS3yH5zmi/KaYkN+ LuXYheMaeONMgROcOT/Y1q0xyuKhfqj2O++BuJqOG5Q8fYdU8+Q/pTEb0 s/Wu518Sk8hcsPjA4AhtQ5gWkOfdkY5Gl+4URVIlF6J6ZzQGagTwspo0n VWcbkZsX0/Ere8DBrkZ4q9osT6g57iu77lEA3bku//boVvzB4n7aPSOgE g==; X-CSE-ConnectionGUID: tFKItjkQT3WVHRz5YZ+Bzw== X-CSE-MsgGUID: suPmOhceQnuAcO1RZnadUQ== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871829" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871829" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 X-CSE-ConnectionGUID: jlutvOQKQTeichxkEJghtg== X-CSE-MsgGUID: HXsIpmIITtKI0awIz129Tw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355371" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 03/11] x86/platform/atom: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:36:59 -0700 Message-ID: <20240531203706.233365-4-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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 --- arch/x86/platform/atom/punit_atom_debug.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c index 6b9c6deca8ba..44c30ce6360a 100644 --- a/arch/x86/platform/atom/punit_atom_debug.c +++ b/arch/x86/platform/atom/punit_atom_debug.c @@ -165,14 +165,13 @@ static void punit_s2idle_check_register(struct punit_device *punit_device) {} static void punit_s2idle_check_unregister(void) {} #endif -#define X86_MATCH(model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_##model, \ - X86_FEATURE_MWAIT, data) +#define X86_MATCH(vfm, data) \ + X86_MATCH_VFM_FEATURE(vfm, X86_FEATURE_MWAIT, data) static const struct x86_cpu_id intel_punit_cpu_ids[] = { - X86_MATCH(ATOM_SILVERMONT, &punit_device_byt), - X86_MATCH(ATOM_SILVERMONT_MID, &punit_device_tng), - X86_MATCH(ATOM_AIRMONT, &punit_device_cht), + X86_MATCH(INTEL_ATOM_SILVERMONT, &punit_device_byt), + X86_MATCH(INTEL_ATOM_SILVERMONT_MID, &punit_device_tng), + X86_MATCH(INTEL_ATOM_AIRMONT, &punit_device_cht), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids); From patchwork Fri May 31 20:37:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682150 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 5E82717E477; Fri, 31 May 2024 20:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187835; cv=none; b=PWWo7P2w+FBnxcEvD2CkRObDu6NNWMm7BlmrX6rGzf7bOauCpCN6uTi9k5RwA9RxdzWCbqKNTG68e0sMIEdUtvtUb+RdDCnPL7Dvm8aHzZNiJVblHOU8Oo/+TeLtrMw9Q28c/3vMKW/xIzSfROviYC2qHK/F+qI7vsyms0ZiNA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187835; c=relaxed/simple; bh=PQHhBRWTyJ7lXAnwUF6T1t71Eh1K9Um/FsP12CRYfhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dvV0tSD6PuAZnFhWbdXAkPrb6U/xhNCNq6SCqq1MTz3pbcNJs/jT1Yf2w+AoREbM0oBM/zAHNjqDiEDK9zsySUIIRWYNbD1/wcVCLSkBlVqQeHt3YO20e3wwkJv56qR4hsNmhNhSNNVFmxLJM2njEEPs4DaY4S6ln7+a3luYoz0= 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=PIidtctR; arc=none smtp.client-ip=198.175.65.17 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="PIidtctR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187834; x=1748723834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PQHhBRWTyJ7lXAnwUF6T1t71Eh1K9Um/FsP12CRYfhs=; b=PIidtctRBdYxKT2/ct1G5p4ZsjizYA+jyDtHFFzgVGDE5TT38wkCnhct 2fBoQ4ZgYtNMyoCmPZQCskVV3okpS5BbVc/VHW0YUNV6SftB7og83VXjO M0rllS+/E187xOz5TbVxejmG+DnIx/on/vuawbH+jAjYyScEWlYLDhvG7 hDaZ27mI8fdVNQa3vwGrkn3ERhSoSUEwwlWloBeGO3ARkhJqVXm+Y09r1 LLjbdaAy4CALXN/lkX2y7L4cWh4uybW2UtNxFY18TxGBueDFdc4EGQwZ8 vnVncTP1W7+5t6N3FfIw0vjsP4NpWuHcfZSullp2ncak0ybQx5IuSmsCS A==; X-CSE-ConnectionGUID: rhV6yxjlQ7ie4vP71pPWfw== X-CSE-MsgGUID: sDfCuWK5QBuv1m0yMr2tYw== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871833" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871833" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 X-CSE-ConnectionGUID: EGw/odp1QjyARxLl2l8KHg== X-CSE-MsgGUID: Z+S6GtXRQTymbrEgYf5zJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355381" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 04/11] platform/x86: p2sb: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:00 -0700 Message-ID: <20240531203706.233365-5-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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: Hans de Goede --- 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 3bf5d2243491..31f38309b389 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 Fri May 31 20:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682152 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 7C8ED17F4E6; Fri, 31 May 2024 20:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; cv=none; b=jkF6pk6gdUyBOQhjcfswPxmKu9isJWlplwxTv8NNTkLxz4x7IrDYszN+PoYLrfaxu7oett65d/Fr0hVvY9xuKSjg513c/q27AtzoOLsh2nm17UEAJnsmEZpNQ1hAY2Uvt08UYd17dkukenorrc+jxLzwvHsCQUWShxJ+vqolcNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; c=relaxed/simple; bh=WB9IrZhQaBiWvCtxLVin3lFQLCeXldDe0NZh3MqrvXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oa4NPFvC75AOrhJpzzIn8fLUjCt2IBAGTcvdVCVB+J/2SmXl1KbtactXXpVvuNskWNEkblJT5KMOzEd/HOatfXmPJ2TCM1G4hC5eT6Jn1Dx9JTty52ZyutX57atttmBzu2EzBw2QZ4oPjT+XQxU6QJBnVAjI9ZLU7ixSO1Wo4FU= 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=CaU5VZ86; arc=none smtp.client-ip=198.175.65.17 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="CaU5VZ86" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187834; x=1748723834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WB9IrZhQaBiWvCtxLVin3lFQLCeXldDe0NZh3MqrvXI=; b=CaU5VZ86xuJA8vAQJkH6ABH5xqWJZQ/Mlwjbicbo2tEqOPXHi3LwOLnk 7fsi7oTUfz3O2k71jWTeD2ZY9TDBsna6mzyJvrAd9Cjjd3lOIZjb5IXUa byM5x0DH2e+fsIx2PY9DjnYhYF8pY3avinehhflWW1hHrC/ubrnBDzYZq WU2GtxjIhk0c7axrPjIKkEHm7wNi2aSpiGuf63++1KjE1OB42oFmmA959 DQsyCZJPCoPFTy9a6NOBLwUeeZzQ4jxIUm3qiTLorKCS7bbAO0dUvzL2B y1+sYv9RYowIoXBsrltGPNOE+ITvACrFO6Hz5gP+rOPhVxvT8iWpoVjkZ Q==; X-CSE-ConnectionGUID: Q2yMlXGsQ46WXMPcpFRe1w== X-CSE-MsgGUID: ZfGUuEKBQl6Zttj5rgfolA== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871837" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871837" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 X-CSE-ConnectionGUID: gX6ewXi+QAOe88AJ0eEeNw== X-CSE-MsgGUID: puFRbaN9R+W99loEwhSs+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355384" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 05/11] platform/x86: intel_turbo_max_3: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:01 -0700 Message-ID: <20240531203706.233365-6-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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: Hans de Goede --- 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 Fri May 31 20:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682151 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 B4D1817FAAE; Fri, 31 May 2024 20:37:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; cv=none; b=M+L+mvyDiHJo7ilo3cps/4glqWe2HKklbRifS/EmNGnnya0XPBlgUHIUllCFPquBopFNirhzO14q0yQNE+PsEFram8Yo+36R+kJryieaPdQHo/j2yadEIuuOh4Odk5taJO34Cvog1ZNkaQJemxnYi7tAG54Vne5idDUlKnpUFZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; c=relaxed/simple; bh=Q4TosjeGaAlesFOvhOKuWq462U/pe+hYmovI9Y0U2Eg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pRhPtghSS9RdZtBuGeeHzS26duxO/ptn168BaaIceuIkkhuatCOwE4xJrEn9en6w50aBMxntk78GWUzyisUJ7SL5oAa3MnI9wgq9UqEZR3KX/tob6E/Zap7SaxnzzXZ3anhnWKRNzEr4JpybLra+1ZAQnaS8theEEwrQ6lF8eGo= 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=GoZzffMv; arc=none smtp.client-ip=198.175.65.17 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="GoZzffMv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187836; x=1748723836; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q4TosjeGaAlesFOvhOKuWq462U/pe+hYmovI9Y0U2Eg=; b=GoZzffMvppiBbiRLPjn5ZYlnjTjqV36/bbDx/WhX7PwJM+17Fp2oS+7D y+Uo4fbTSA0XKDO8oSELo1fVs2sGqudyIkqiB84Da11eazXp+r0m2rz52 UKICMG9fBh1hFeJP1j/6mcrby17ixIrbP5w+DWHqcLBtvYDsS/jkRJSYU 3sPbAiTdYsjhAi3F2Nozf1+/qETm3z0eryxRkJkDyt8IE+N4fkdqi8kxl v33nGRH04pl+bvWqd3a2MsKLrB5SlBeqiFTRWRKF+QRwoBN1FnezV8OCD gy0reRFrdtQ7tSE26Q3FAnW2qSZnJcxKU9YuhEKceZTAA9ERMkOlrbVJh Q==; X-CSE-ConnectionGUID: pQIlbMfARVa9OSxmzki96A== X-CSE-MsgGUID: enkpRI0pQUa+WiCZTaD9Gw== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871841" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871841" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 X-CSE-ConnectionGUID: QgW8GW6hTKCI0O6rhvGZ5g== X-CSE-MsgGUID: vt3AL+dHTxut838gqmSVoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355387" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH 06/11] platform/x86: intel_ips: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:02 -0700 Message-ID: <20240531203706.233365-7-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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: Hans de Goede --- 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 73ec4460a151..c62c3c4ec20a 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 Fri May 31 20:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682153 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 E413217FACA; Fri, 31 May 2024 20:37:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; cv=none; b=ccVWDhSOsrkkL2PmOyueFSKoS63iHbc4KsBIedSCo2gpG0/lGavbpcP8Df1B/xnI0uVeowXCQSJj7359HZi4ovlHMkKIYJN5JLkGLllPGrAO9MC4aOE3EnXls1WOgV/mlSqyAmXD/qSkqlCaQZun6Ht5xABi+wNsVr6Fjhj6M50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187837; c=relaxed/simple; bh=yaJboBMEPLKvR1jTeG+KSsAACemlTofNhMPhw7StcCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kPrWIXNExnX16hdKOkaVYqMeJ9c1Zgi9TnfmjMGt8MV727ZeHlK43cWZRPLgjeZFMy/Wt8xbZXqsuryLosoZFLrnGk7ErHp5o0U6pT4TruSsX7aGnLmHZ6pzovN38/tmM4DI0yn4Qb1NcxwAE5Hllx1LRQnzARKtzC6oc6Lyvlw= 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=Gu59g7Wi; arc=none smtp.client-ip=198.175.65.17 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="Gu59g7Wi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187836; x=1748723836; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yaJboBMEPLKvR1jTeG+KSsAACemlTofNhMPhw7StcCg=; b=Gu59g7Wiw9JuAvaQ8xn4ouRAiDw+4Nw/sIebxNY1HSLmZHIUa/kFpFfD dysf4hXyIkyhtY+bAKcoq75jTS9iSLA9NOtsw1CXRc6PlJ+kA0tjpFGUq NDTMys8Eadg+oGn8sAswIX2bgQHa+K9aLWAEkgphcZ87AkMPwhnXigqk/ g4VgkocAsw238jRU2ykl7tNX5cBFUgG9HS7AASBSSTmrr7xn9TXqji/mD lKRbWpjSZmDDA7ZgqqzBYV/yNBfTQxc5/TR42VFL2rxjDdhwRnulsuNOj Q1vPeKMSxf8F+CoCDti7W6BIRGd5I9gaytSxwRQPlndxxrevo+n3eZOjZ w==; X-CSE-ConnectionGUID: 9vqynYZRSGulGB4DcBzBCQ== X-CSE-MsgGUID: Br1YLyOEQUytZYuw/jr1gQ== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871845" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871845" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:12 -0700 X-CSE-ConnectionGUID: IDdgpq3nQDahYbqebn4ILA== X-CSE-MsgGUID: IA8i6JIZRVWuc17wmtug/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355390" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Srinivas Pandruvada Subject: [PATCH 07/11] platform/x86: intel-uncore-freq: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:03 -0700 Message-ID: <20240531203706.233365-8-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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 Acked-by: Hans de Goede --- .../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 Fri May 31 20:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682154 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 632CB1822F9; Fri, 31 May 2024 20:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187838; cv=none; b=tpcXF9AW8FU36qIJBcbTecaFgopOB6rWhQslmNT57edzjB9YUw2kkPfaJoBefCpmYiFex1Izyt/ctfUeKcj4wZG2xRt7R32c/YMCuO4va4AwQc60k6yKaP/QiglL5TYfDGFeRwhQVxYt5NrE6uk1O9a0aKZDkG5yL2YVmOIMOZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187838; c=relaxed/simple; bh=hG3FP4AcNKVMSK2tzoC+JG6H48CVh98nrbPvxUI40RA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vE0ibv4B+Q+1uk5k8PSadPnTnxyZHpRumeAqVj0RXZmvfyrOOooumZ6I00bcd/O8URr4OxjPk3X+P8RVD2EwHD3pR588KQD0NiiQ34QtiOQJukc/fj9EQmTX8onyUrXBSdpogSnMoQVah5aoPgfIprFHJYGnwqh0Vv1V12WAGqs= 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=gUP/T61I; arc=none smtp.client-ip=198.175.65.17 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="gUP/T61I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187837; x=1748723837; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hG3FP4AcNKVMSK2tzoC+JG6H48CVh98nrbPvxUI40RA=; b=gUP/T61Iy5SqtuvdZ3E+191+qT1OCC0LYo+JxOSaHHOcfm9T1Tks8vi3 LhJx41RSpf7q3GwASS2BCIJyHCPSWFxVamsw3+nIEOKB2sV6UBkcV3NJp OL/rk1BDDGtZ/7m9j51g1WAbPIOEhtrfKGMsiYxhvMij9D58DN6A11m+J NTiFMpOcnL5uP28VPIHqDvLbHayWbRBodK+1cLKTVB6QUZMc/nRJICSO9 qJWf8MhyfmoZmXGRST865GHA6ohAGanUvCW3Z8exiDV1pjbbztU6EnItC zlSS2EvWUYH0B6CI0pHgE5PQ01eXVkMm6tF09gWYtMvwz1Q5n29zUGVdH Q==; X-CSE-ConnectionGUID: slLSF1KUSciL2sbTZ7FCOw== X-CSE-MsgGUID: Lu4pvUc6RjeVKUboTtQeEw== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871849" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871849" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 X-CSE-ConnectionGUID: 2KJ6j4tWRxO+4C2bRmM4hg== X-CSE-MsgGUID: 92NgkqxAQFu6Qz1BzbeUwg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355393" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Srinivas Pandruvada Subject: [PATCH 08/11] platform/x86: intel_speed_select_if: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:04 -0700 Message-ID: <20240531203706.233365-9-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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 Acked-by: Hans de Goede --- 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 Fri May 31 20:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13682155 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 7E5A3182D01; Fri, 31 May 2024 20:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187839; cv=none; b=cDlSxWW0IHwg4TTITzR7x9K8RyNyO1GSgZ2SPUlvc02ivd9rEWu4qQQobwUqS5L8snVHIv/sLFOe5ga50e9uhFH6zWFwnDggomPBCfGWrOyfI3A7ThvNuvpxy+51R+n9pciPdKSXjb5LWJRtg9jUebBG+76Ca+eYIHwu0lgw2Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717187839; c=relaxed/simple; bh=uwrfu/RQXE+CPGny/VIfWFI+r++v83onQnRT6WNFLOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rU4GvyQi6khgxT5iIXn/OiaciIeYBmxdvbBAxOmPrklw8X8zG0JXmBADF+CGgMWgQkUOOlvtoLZuZhMCtmN9Cc0QVkm0nIuT7xdbVBwtFrMzc2Gjby4LbnzaF36ubz4ZufV65uYHuROODuLHtZL7jMadFSpqWEFRC6Htzmdrw3c= 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=BW5nWWLT; arc=none smtp.client-ip=198.175.65.17 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="BW5nWWLT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717187837; x=1748723837; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uwrfu/RQXE+CPGny/VIfWFI+r++v83onQnRT6WNFLOM=; b=BW5nWWLTA5Fcz/Ya/05VubV9dO91UIprCdFOqGkrk7gPK5fOcyqgQsPa WRBTfrgAOPqRbAtScEIT6hZbPtglEXXhVm1J0rpMG0StFXS5Boa8zPDPw y3yaxgi8z4G5iIQx1FZxpEhwgn7f6L34yhS6nFnyIv1K9+ELqYng5Sonc lmOd2oY3twcZ2Y5yt/DjpZ7cYcR9KMmg7rL50DW/uwWt6CYs2Byp0zz2F kbatYHtVw6hLFQ6/yAK2bUFkznygbOOjCyDFkK123Z4sheduEpiD96r0T ta7Pfy673G37eqHn47LhIBW5hIJcFNmNvwCg7CnC7sxPiBFmAnDSZgpux A==; X-CSE-ConnectionGUID: 0kLsUctuTAmyGc5yakAUHg== X-CSE-MsgGUID: NAIQgE0ISUGzgwdqiCwmvA== X-IronPort-AV: E=McAfee;i="6600,9927,11089"; a="13871853" X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="13871853" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 X-CSE-ConnectionGUID: Rm6XaC6qS4OMd2shuamntA== X-CSE-MsgGUID: xSQWySafSlOgPQV7lfBwsg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,205,1712646000"; d="scan'208";a="36355396" Received: from agluck-desk3.sc.intel.com ([172.25.222.70]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 May 2024 13:37:13 -0700 From: Tony Luck To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede Cc: platform-driver-x86@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck , Kuppuswamy Sathyanarayanan Subject: [PATCH 09/11] platform/x86: intel_scu_wdt: Switch to new Intel CPU model defines Date: Fri, 31 May 2024 13:37:05 -0700 Message-ID: <20240531203706.233365-10-tony.luck@intel.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240531203706.233365-1-tony.luck@intel.com> References: <20240531203706.233365-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 Acked-by: Hans de Goede --- 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), {} };