Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp2176305lqa; Tue, 30 Apr 2024 10:00:58 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUuXcpHB1geptADsDo/I7xvl6p01PI6zCnbjabF/NMQBJYtyY5NoTyF9a89VZmhSdpaE3eLWgNEs0gteLFlNAZJMnJujx3ZvXBruZG/6Q== X-Google-Smtp-Source: AGHT+IEF4hs2odFkRTlE1I7B8bpZ6Z5x5Q77DnBRp1M2DzHfJxW7aB28p+DHdYOxWpASQkNaSgLV X-Received: by 2002:a05:6a20:438e:b0:1a9:d6e2:66e9 with SMTP id i14-20020a056a20438e00b001a9d6e266e9mr485225pzl.28.1714496458298; Tue, 30 Apr 2024 10:00:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714496458; cv=pass; d=google.com; s=arc-20160816; b=WxjdW2Zq3YOWw9oqmWJaTy4ibPsfw4see/g44nJ8OsE9WGBV34LfgKXYEAwmVx4kBP JGTkpofWjF9TRbV2jAwwdnws09HpRJ/gbTNOEQcBNNiGpHfsYNnyg1vEs2f1t7/fwMIg DmaW05/+tG9uK8CrHGeWS8CnZNnmK25N3yqYYo5leggSa0wf/ib5Tuoht/wOuE3bJhdW O6ehnxZjkPo9KNyfvPfrCHDI8O0kd0EHOZCX67s+5Piesq+sduT6Z5miKYOf5YBUJ2iq 0WhP2FTOQOs0QvmfogoqA4TFH8l6omcBcdnOXljSFMYQ+xEChRcYL84fl9r1qUL0y78C Ei6A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=w/9nCpTGm/R+E3AV4DXBfLNcTFMdROb/GQUNU5dTmW8=; fh=fCCNFvJbPqqXo45yXdlgqaDimb/JVSzwDZSVTcpWFog=; b=shSl/Kr0TgMf8zg91eP2y63uZ12oeZzA23OdWDD/LY1U9n+F/49g/TvRvmmSIdfHxZ xGMgA9+dOObYdqN/XM+VZS2oEjsVjBD3a2++5V4lQ65IRq1i6Lb+BxCbcusfACIbfSSj 8JCcsb8bapYJOVXi5iBha4WKqOTHj93niiJAP8Cc8xaFwmWgcMLsJlxAVi6vp/zd+7ed vTzWvGMRhBq4QvHgevSViKVcqO01KuZJhzPth1/gHPwOvKbhXuTVjZQRgaWi8zIvWBbp 1/r49mtMaLTQFB7svu3t/hVvNUr+yOOYPB5H1ejKcKtrOYLcz469l/YDKzA6jGoP3qOU ge4w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="iTCBa/Hi"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164462-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164462-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id fe8-20020a056a002f0800b006ed891673a7si22530492pfb.97.2024.04.30.10.00.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 10:00:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-164462-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="iTCBa/Hi"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164462-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164462-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id B81D4B21CD3 for ; Tue, 30 Apr 2024 16:56:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 620181C9EB2; Tue, 30 Apr 2024 16:51:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="iTCBa/Hi" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D48D1C2325 for ; Tue, 30 Apr 2024 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495911; cv=none; b=CMZc7PE1LK4SNXyMZjfkKAeozhU7MHhTMyLUCZ5e92PFlLUuJ3p/6fEXqF/5obUHdERpMrxAfnns0Kw6UUrvVyIq6tJDmSynLjP/wR4FMQx1AVKtXwIHAfjOLF63X4+GkT4De8kohrpXgT5kM3VeNn7JL2mK4MrsZmpzxMYXrfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714495911; c=relaxed/simple; bh=/JbFqsT4QboTVC5nN5+7Tn0VrIVjmy0ALnM5ZmCJwqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sfFW5EVDaNNbMYUASDKWUGyQylLIVnM3IhPYZlgv7z70b50MnxBsXZRVqubbAp6hZEnk7hiWG6yhAaTmNSYerFHZh7VTHE3hz/K8HiipqJm5440AjGuLJzHnwGo/mcHCJQnPRVZjNj3o0BwFZ8ymWlBdXO9EZFxRNEYFLEVS4F0= 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=iTCBa/Hi; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714495908; x=1746031908; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/JbFqsT4QboTVC5nN5+7Tn0VrIVjmy0ALnM5ZmCJwqg=; b=iTCBa/Hi8L5TvxCkWRdSqBZSuwKfwL4x2ZIRxGCh2ZsUiEQrGfn6MAyB qt7UoLNuWRUgrC0gy71I7A8ksXFo/Dc23lThZfJQzzV8Si3VTJeigEtQ/ yC6o33edMPNgm5u2c+gboV0ci2+t/AJb429xq812e91PHVXlXcT86Ka2Z E7H/pJ1AsXQ0pMTp88kJvSL92JtJoTLABRQfwpa+pQP4crkwJopbRMB/k +9k0+fVUZoBWZNV1j17EHopSiRHWIaaD9uW4g1d3TmbasTrKcnaTj5iZc iPeSvJaF+aEKD0aJ67mxnmlbyl8LdtdI1vqkqnHPvrSjrf5jev8Tgc40Q w==; X-CSE-ConnectionGUID: JLWAxO49SdyXDo/95wHLrQ== X-CSE-MsgGUID: xtkBO9yDQWmLC5ro1flVRA== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10075772" X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="10075772" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:23 -0700 X-CSE-ConnectionGUID: R7a3kwDARDe5wiji/wbUkw== X-CSE-MsgGUID: bg3AbzpATYiqGL4g0vHHAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,242,1708416000"; d="scan'208";a="26515501" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 09:51:19 -0700 From: Tony Luck To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v5 33/47] EDAC/i10nm: Switch to new Intel CPU model defines Date: Tue, 30 Apr 2024 09:50:46 -0700 Message-ID: <20240430165100.73491-33-tony.luck@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430165100.73491-1-tony.luck@intel.com> References: <20240430164913.73473-1-tony.luck@intel.com> <20240430165100.73491-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: 8bit New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck --- drivers/edac/i10nm_base.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c index 3fd22a1eb1a9..24dd896d9a9d 100644 --- a/drivers/edac/i10nm_base.c +++ b/drivers/edac/i10nm_base.c @@ -942,16 +942,16 @@ static struct res_config gnr_cfg = { }; static const struct x86_cpu_id i10nm_cpuids[] = { - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_TREMONT_D, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_TREMONT_D, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_X, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_X, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_D, X86_STEPPINGS(0x0, 0xf), &i10nm_cfg1), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), + X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), + X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), + X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), + X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_D, X86_STEPPINGS(0x0, 0xf), &i10nm_cfg1), + X86_MATCH_VFM_STEPPINGS(INTEL_SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), {} }; MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids); -- 2.44.0