From patchwork Tue Apr 16 21:22:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632609 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 E731A13AD18; Tue, 16 Apr 2024 21:22:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302531; cv=none; b=Xg4mio+sIMPArhvoM9h2VHLJ3qXqp07MPe7zkAQ6quD+jjPbX3S+KlgHLx6WHhX4eWJlb1/nH9M/f+M0UL5nbeP3oepltzgCb61yqZ/IIHFqrQcHTlsxLr0dTXevBu1Cz8WMSAopNai9uvk+A9FyFTWtocFQNViTmFeZvuO5Nlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302531; c=relaxed/simple; bh=/JbFqsT4QboTVC5nN5+7Tn0VrIVjmy0ALnM5ZmCJwqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SWS2+OCBmDRdkdz7++blP2adeADeT1p1z8FVtaOFedGbpOvDundcGCRSaecbK7FSjGMxeF8WPXNu24v8PZPhyOY+oWQcKg+bmhU9HdqlzQHMKUndWTKGz7vuRz9nWtLCFhiQQO4r9X/CsVgBCeu/QT34pyL0S5F63KKFjgH6TdY= 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=ckqvAJsI; arc=none smtp.client-ip=198.175.65.11 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="ckqvAJsI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302530; x=1744838530; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/JbFqsT4QboTVC5nN5+7Tn0VrIVjmy0ALnM5ZmCJwqg=; b=ckqvAJsIJf6Ca+AOd7Nq3fLfpHoJktp0c6s5Lm7R+go371TuvV44sqHe eae4a4XNDytxtnr6Fj/ZMw79LzO15lxZIvccfByzNV8by0AV0g1GbQlLP IgrZ6AMknd4Ia+UmIZgZpj5CIBh0rouyOazKR47/we2JAYIcByGTOIJxf EeBtZH7Gp2ft4ZIP/hc+i3g44skWv/PMtQHtiATy9nKI5QLt1DyX+V4/t w20fhibUcPiHBSg54ZkSiFDB62bIQNettefqtaZDA7S1q5iUH62DzDgYA EvbcZJOsWLc7bTNv4EoEXmJAOsrKOm6PKj5abMZ9kcSYCTEk2YqXU9fNl Q==; X-CSE-ConnectionGUID: qwexSWjASFiCdnjNo6wCNw== X-CSE-MsgGUID: Tcs7UJ5RQhe/+K/do2af+w== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="19328758" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="19328758" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:10 -0700 X-CSE-ConnectionGUID: 1wYNcThTRh6xgy9V+D29lQ== X-CSE-MsgGUID: RP2KeeWeQsiP2/Awa8MBgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="27071909" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:10 -0700 From: Tony Luck To: Tony Luck Cc: Borislav Petkov , James Morse , Mauro Carvalho Chehab , Robert Richter , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v3 45/74] x86/cpu/vfm: Update drivers/edac/i10nm_base.c Date: Tue, 16 Apr 2024 14:22:08 -0700 Message-ID: <20240416212208.9509-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-edac@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/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); From patchwork Tue Apr 16 21:22:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632610 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 501EB14A0AC; Tue, 16 Apr 2024 21:22:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302532; cv=none; b=porurcUNYKisr1WALZPNMtPeZaOEepQpDA1P2d0lT6IwpbEP3YAZBIlS2rUms948q3OTJfC73G4gH5Yxhm0M/CsGOyWMwket1pP+FJMFSK0+2aRRVgVp/NN2c9o6e2IEGDXSTZW6ORyl83Pf7GeHebzSQUuIS7tOL3PFcYDTHBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302532; c=relaxed/simple; bh=P/jfG3oJQnxJWF8y4/FRhX5DE6yIHQm3rt2+JP3bIkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UD+r/gR/uWEhGciZFdGzhaRGKT3tiJWhs9o09N0CPEKMc3cz9S9+bwqBFX869uWMudr7720Nlmzh8vtCtqN9E1gKZu6JdkXrsXw6RC9lgEnvcADGhbD5tV1dwpmc+++2CGkii3mV45Zqx5C/DdyWKeARv7URitkFgcaRGV/AjB4= 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=cTgdN8j3; arc=none smtp.client-ip=198.175.65.11 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="cTgdN8j3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302532; x=1744838532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P/jfG3oJQnxJWF8y4/FRhX5DE6yIHQm3rt2+JP3bIkc=; b=cTgdN8j3nO/eazGpKZ6WfwNwUHWdKMVadQJo/o6/WJMoAhRrWPM09sHs tpgLa09AxKXOXklSpuavES9eXOdVJzE3VxJydhUJM4ApinjnH6nJ5kQQX 4XBD7ncUJppFuWWTCYmULGswm/tKT7X//QH+wtuX2tLptelT7LQUsZtTB llp8FHifMAVyDZFYIg0N0X4bVoxpxdlVqKK8CKSEPcamn2EufFCZw0G33 xyOkCSaXp/U4yboMfR27KFTVJQjJlPhegOCkvXZn49+nqbsZDioKxTesX xAsvNDRPt16bIuva+0Q6ne1nrbdXIMdda+ZYA5E5fXLo4ZBqtmXRMhIoD w==; X-CSE-ConnectionGUID: 6BdOTNxIQk2yjS2EOw07sg== X-CSE-MsgGUID: 5EX/vSxtTQW8mMNFwA15Pw== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="19328772" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="19328772" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:11 -0700 X-CSE-ConnectionGUID: ZL+GyJCKSyyerg211JyOxw== X-CSE-MsgGUID: GwMQFiJwT5K3pkj+r8Ul2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="27071916" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:11 -0700 From: Tony Luck To: Tony Luck Cc: Borislav Petkov , James Morse , Mauro Carvalho Chehab , Robert Richter , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v3 46/74] x86/cpu/vfm: Update drivers/edac/pnd2_edac.c Date: Tue, 16 Apr 2024 14:22:09 -0700 Message-ID: <20240416212209.9528-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-edac@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/edac/pnd2_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c index 2afcd148fcf8..f93f2f2b1cf2 100644 --- a/drivers/edac/pnd2_edac.c +++ b/drivers/edac/pnd2_edac.c @@ -1511,8 +1511,8 @@ static struct dunit_ops dnv_ops = { }; static const struct x86_cpu_id pnd2_cpuids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &apl_ops), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &dnv_ops), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT, &apl_ops), + X86_MATCH_VFM(INTEL_ATOM_GOLDMONT_D, &dnv_ops), { } }; MODULE_DEVICE_TABLE(x86cpu, pnd2_cpuids); From patchwork Tue Apr 16 21:22:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632611 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 19F2814A4E9; Tue, 16 Apr 2024 21:22:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302534; cv=none; b=RgBe8zxcQTbxqiVGTYAMivpN5SF2SROx1B7wbivQ+orv81XPeiCEi/75ScBMiXgulutgJKElAx84n9j2+1OUllvUIAOngoiTQK7Y6OMFtGTeuR2uEW2Wucc8sI+YvUceu/IHiEtucI1LdLX68XHDX+tLtdcIzguDzIeAYu4ztyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302534; c=relaxed/simple; bh=K0SMUkbNdaQTs8egvbi/pMmubWEho1P85u2CzO6rIlk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FoE+RsjXz3I6BcNvra0cPJhcxothLXsZYR4mevtmLM+4yWBswhM6EqatCGkt25mbneM1HW9BcTWo4IBfC9Ov4cSxzZMZVfR0m+pOrtULV4GXmz9GitxDC4M7MMkIUKC4owBbJ89CkG9i/Z8w356JzET/F98aN7O8jdk+YN08fOQ= 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=nvMfS8M+; arc=none smtp.client-ip=198.175.65.11 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="nvMfS8M+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302534; x=1744838534; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K0SMUkbNdaQTs8egvbi/pMmubWEho1P85u2CzO6rIlk=; b=nvMfS8M+o/0UsMAL+vJLdcWgODrprWT8/vRabocBwDnEAHwA+o3RqiLi 56CvKBAu0H23uzM6Wm0rBBbMY1LD8H1+ZSOkRTB+tZxQwImfQaqjLw4Wd 8C5P9NBR8ZNuYMBrwJbvRLefWs4oIcnSTvmOMcNvgiKhmIu4DR1MnbgoA ZxUkfj/9LUSPZsXwMGtvKGej5PD0BVQ+k9ve5SMB2bpnOJKnyDXKrkqAZ iwO7u7jfnBRzWbMnKighNqNw1PRo0oywOLGvEbTF4S6AcPP246ZFk3f4F 8kz2yJTWkPIZujL3wQZy01ZZzDbckNH6NCaT1Wa1/eSXYb9g9BF1YA9cV A==; X-CSE-ConnectionGUID: kMmBSHQgQKGjNRGBj/5fJQ== X-CSE-MsgGUID: TrYbt6hMQ76JCQH3UYSTAQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="19328779" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="19328779" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:13 -0700 X-CSE-ConnectionGUID: dvcak7n4TbSjBuxFQunMYg== X-CSE-MsgGUID: TKjU1AsDR4aHNfOM12QMXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="27071921" Received: from agluck-desk3.sc.intel.com ([172.25.222.105]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2024 14:22:13 -0700 From: Tony Luck To: Tony Luck Cc: Qiuxu Zhuo , Borislav Petkov , James Morse , Mauro Carvalho Chehab , Robert Richter , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v3 47/74] x86/cpu/vfm: Update drivers/edac/sb_edac.c Date: Tue, 16 Apr 2024 14:22:11 -0700 Message-ID: <20240416212211.9547-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-edac@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/edac/sb_edac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 26cca5a9322d..cbc92d3683e6 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -3546,13 +3546,13 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) } static const struct x86_cpu_id sbridge_cpuids[] = { - X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &pci_dev_descr_sbridge_table), - X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &pci_dev_descr_ibridge_table), - X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &pci_dev_descr_haswell_table), - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &pci_dev_descr_broadwell_table), - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &pci_dev_descr_broadwell_table), - X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &pci_dev_descr_knl_table), - X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &pci_dev_descr_knl_table), + X86_MATCH_VFM(INTEL_SANDYBRIDGE_X, &pci_dev_descr_sbridge_table), + X86_MATCH_VFM(INTEL_IVYBRIDGE_X, &pci_dev_descr_ibridge_table), + X86_MATCH_VFM(INTEL_HASWELL_X, &pci_dev_descr_haswell_table), + X86_MATCH_VFM(INTEL_BROADWELL_X, &pci_dev_descr_broadwell_table), + X86_MATCH_VFM(INTEL_BROADWELL_D, &pci_dev_descr_broadwell_table), + X86_MATCH_VFM(INTEL_XEON_PHI_KNL, &pci_dev_descr_knl_table), + X86_MATCH_VFM(INTEL_XEON_PHI_KNM, &pci_dev_descr_knl_table), { } }; MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids); From patchwork Tue Apr 16 21:22:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luck, Tony" X-Patchwork-Id: 13632612 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 EFAFC14A62B; Tue, 16 Apr 2024 21:22:14 +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=1713302536; cv=none; b=C77NUpQif9PGWFrTcWd6+gGqepHyAFENl7JdYwbBiYQfiI7OY/G+yTYUrsETLAZJvkhOStZP/acUx5Y7yzm2E4u2NMGDfzRwN7rKgVSXW2OcTNNuD+6JS0a4Plb0DLv2nZiyWecLciUyxL7QGZL9oZHz2jXJqdXkw6xQwgyfiQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713302536; c=relaxed/simple; bh=WV3qnx6+50b42Jf/GqLJUpAXvV6x1yHw3SQJ/gD5Xpk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i2xrxsflVXBJ2qzqdsPpQfiRZfLEhM8Oqzkjl+GWuGI/ADY7hOgO7IptmzqyBJgh+EHc1nh7ahEFPNI+jlXGND0QAeyGdmNCz2yoN4Il9senOPjN3v8h0JiV0EvSiRDgc4oVPIH/lMygszB0Vl66EoBFLE7mj4+tLFldLjgfTkc= 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=AG9OwzL/; 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="AG9OwzL/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713302535; x=1744838535; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WV3qnx6+50b42Jf/GqLJUpAXvV6x1yHw3SQJ/gD5Xpk=; b=AG9OwzL/IGdBiRPs3k94jplQTII21/j7zyev7TsfpoAsUmALxXrl3iCl LA0lmoNDOcstlk7MXDM+gU/h/+TQcHN42jZItZrjy1tyKWJxRBvmm3Ovo 8sIrUPK4bSd2xgQs+PHVrBu5wljINFpqlxETm4GTqDuIAcj+AoKGkZa93 Q9pj0WYoRfltqeRJObs9i/MZ8tnkv3vK1sZHy97TwA/WMpCOWSeu9xAtw idZbahJvKDovSS5JBCDj9GoTpJVXDxm3XR97QzqqgVWWzxJDV5PcnCCVv XOeE5d2Wx1TrBWjuH6r+PtMHg4yM+JCVD+41T0KPFy4qTCfkMm02rn+nz w==; X-CSE-ConnectionGUID: XadBR0vDTc6gjCHexsYSgA== X-CSE-MsgGUID: 325MtwwjQ3GksKpC5u5AjQ== X-IronPort-AV: E=McAfee;i="6600,9927,11046"; a="26234898" X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="26234898" 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:15 -0700 X-CSE-ConnectionGUID: rEikiT2HSWuwA6Nm64yzNA== X-CSE-MsgGUID: j5VILjF3Q42S4TskNU+j6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,207,1708416000"; d="scan'208";a="22267075" 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:14 -0700 From: Tony Luck To: Tony Luck Cc: Borislav Petkov , James Morse , Mauro Carvalho Chehab , Robert Richter , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH v3 48/74] x86/cpu/vfm: Update drivers/edac/skx_base.c Date: Tue, 16 Apr 2024 14:22:13 -0700 Message-ID: <20240416212213.9567-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-edac@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/edac/skx_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c index 0a862336a7ce..af3fa807acdb 100644 --- a/drivers/edac/skx_base.c +++ b/drivers/edac/skx_base.c @@ -164,7 +164,7 @@ static struct res_config skx_cfg = { }; static const struct x86_cpu_id skx_cpuids[] = { - X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg), + X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg), { } }; MODULE_DEVICE_TABLE(x86cpu, skx_cpuids);