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), {} };