From nobody Fri Dec 19 20:34:07 2025 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 EB62D15253B for ; Tue, 16 Apr 2024 21:22:22 +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=1713302544; cv=none; b=j9DvzDIn7XJqFrJ/pWFygus9m6Df48ZWl31PoLjtMvueZ1HeGumxteI+A7NnJNol/E95a4hb0AoqyG1wW1sgogW1BFTAiEhBKBO76uop3Uo5IlmSP+5Ao1CAw6fuVJN2d/l3ceVk4LhAGPfkMQlMWIzemaxaZZL5vAjJkWAyNI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302544; c=relaxed/simple; bh=2gPGaDcRT5gcL/MB7CRiRDvqupdeUr0UkHk3k5ZMu6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SuO4PDJIIOoDCy3amV6RE36/gd8ZZ0EoMy4oI7xQOh8fh2PckrbhGOGuMDTyEZjO8jZkY+Lft565FQtYNJhZwwf/uX1HzQJ2R4Sce8Lo/u2Rte5+qX/FL+Gyg/D+T26TGwviD1q6IV1lVizWtb4aKIh1RGN5LvvmrSg4cs5FxAQ= 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=GxB5YqeC; 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="GxB5YqeC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302543; x=1744838543; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2gPGaDcRT5gcL/MB7CRiRDvqupdeUr0UkHk3k5ZMu6g=; b=GxB5YqeCwn6CgKcMBvmAOqX30+J6FnS074o3xzv4WKuv67xfMmnPKt0U fxS1zVBtFiX6ns4YkDAkM/xps3h2fhi09JRsRujoorzR+SxmBI2tT7QFr b80g6xprTKA3w0ETeJfr9r/DcedBDjQBD1DYF/sX4Mz0Wf515YiMlKydW MCwcUjhbOHkYuBG0ybCHtXVglXRuTv8LJ8jdRKPJcav18t6y/WlToXzEz lU+jLZyFOfhRaPD9JM9LbUXKNbUKDygfH7xLZmI/x2Ji7Uj9FrPWMtUa3 V02eEBvEeLjcKoSvGir8ePALkLGRsHfRdFoIC5nYLYAzlXkL0EQ8YGX8F w==; X-CSE-ConnectionGUID: lFed9T8ST4CG/4/FgLgm9g== X-CSE-MsgGUID: rUtIYag+RCSgUfhSxY1w8Q== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234924" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234924" 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:23 -0700 X-CSE-ConnectionGUID: Pi2uSVG5SZCFXfiEfYLbUQ== X-CSE-MsgGUID: HaRXpSXaQd+o5xzaVUPZtw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267095" 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:22 -0700 From: Tony Luck To: linux-kernel@vger.kernel.org Cc: Iwona Winiarska , openbmc@lists.ozlabs.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v3 53/74] x86/cpu/vfm: Update drivers/peci/cpu.c Date: Tue, 16 Apr 2024 14:22:21 -0700 Message-ID: <20240416212221.9662-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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- include/linux/peci-cpu.h | 1 + drivers/peci/cpu.c | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/linux/peci-cpu.h b/include/linux/peci-cpu.h index ff8ae9c26c80..2c972b728524 100644 --- a/include/linux/peci-cpu.h +++ b/include/linux/peci-cpu.h @@ -6,6 +6,7 @@ =20 #include =20 +#include "../../arch/x86/include/asm/cpu_device_id.h" #include "../../arch/x86/include/asm/intel-family.h" =20 #define PECI_PCS_PKG_ID 0 /* Package Identifier Read */ diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c index bd990acd92b8..8e8292c05551 100644 --- a/drivers/peci/cpu.c +++ b/drivers/peci/cpu.c @@ -294,38 +294,38 @@ peci_cpu_probe(struct peci_device *device, const stru= ct peci_device_id *id) =20 static const struct peci_device_id peci_cpu_device_ids[] =3D { { /* Haswell Xeon */ - .family =3D 6, - .model =3D INTEL_FAM6_HASWELL_X, + .family =3D VFM_FAMILY(INTEL_HASWELL_X), + .model =3D VFM_MODEL(INTEL_HASWELL_X), .data =3D "hsx", }, { /* Broadwell Xeon */ - .family =3D 6, - .model =3D INTEL_FAM6_BROADWELL_X, + .family =3D VFM_FAMILY(INTEL_BROADWELL_X), + .model =3D VFM_MODEL(INTEL_BROADWELL_X), .data =3D "bdx", }, { /* Broadwell Xeon D */ - .family =3D 6, - .model =3D INTEL_FAM6_BROADWELL_D, + .family =3D VFM_FAMILY(INTEL_BROADWELL_D), + .model =3D VFM_MODEL(INTEL_BROADWELL_D), .data =3D "bdxd", }, { /* Skylake Xeon */ - .family =3D 6, - .model =3D INTEL_FAM6_SKYLAKE_X, + .family =3D VFM_FAMILY(INTEL_SKYLAKE_X), + .model =3D VFM_MODEL(INTEL_SKYLAKE_X), .data =3D "skx", }, { /* Icelake Xeon */ - .family =3D 6, - .model =3D INTEL_FAM6_ICELAKE_X, + .family =3D VFM_FAMILY(INTEL_ICELAKE_X), + .model =3D VFM_MODEL(INTEL_ICELAKE_X), .data =3D "icx", }, { /* Icelake Xeon D */ - .family =3D 6, - .model =3D INTEL_FAM6_ICELAKE_D, + .family =3D VFM_FAMILY(INTEL_ICELAKE_D), + .model =3D VFM_MODEL(INTEL_ICELAKE_D), .data =3D "icxd", }, { /* Sapphire Rapids Xeon */ - .family =3D 6, - .model =3D INTEL_FAM6_SAPPHIRERAPIDS_X, + .family =3D VFM_FAMILY(INTEL_SAPPHIRERAPIDS_X), + .model =3D VFM_MODEL(INTEL_SAPPHIRERAPIDS_X), .data =3D "spr", }, { } --=20 2.44.0