* [PATCH v3 45/74] x86/cpu/vfm: Update drivers/edac/i10nm_base.c
[not found] <20240416211941.9369-1-tony.luck@intel.com>
@ 2024-04-16 21:22 ` Tony Luck
2024-04-16 21:22 ` [PATCH v3 46/74] x86/cpu/vfm: Update drivers/edac/pnd2_edac.c Tony Luck
` (2 subsequent siblings)
3 siblings, 0 replies; 4+ messages in thread
From: Tony Luck @ 2024-04-16 21:22 UTC (permalink / raw)
To: Tony Luck
Cc: Borislav Petkov, James Morse, Mauro Carvalho Chehab,
Robert Richter, linux-edac, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 46/74] x86/cpu/vfm: Update drivers/edac/pnd2_edac.c
[not found] <20240416211941.9369-1-tony.luck@intel.com>
2024-04-16 21:22 ` [PATCH v3 45/74] x86/cpu/vfm: Update drivers/edac/i10nm_base.c Tony Luck
@ 2024-04-16 21:22 ` Tony Luck
2024-04-16 21:22 ` [PATCH v3 47/74] x86/cpu/vfm: Update drivers/edac/sb_edac.c Tony Luck
2024-04-16 21:22 ` [PATCH v3 48/74] x86/cpu/vfm: Update drivers/edac/skx_base.c Tony Luck
3 siblings, 0 replies; 4+ messages in thread
From: Tony Luck @ 2024-04-16 21:22 UTC (permalink / raw)
To: Tony Luck
Cc: Borislav Petkov, James Morse, Mauro Carvalho Chehab,
Robert Richter, linux-edac, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
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);
--
2.44.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 47/74] x86/cpu/vfm: Update drivers/edac/sb_edac.c
[not found] <20240416211941.9369-1-tony.luck@intel.com>
2024-04-16 21:22 ` [PATCH v3 45/74] x86/cpu/vfm: Update drivers/edac/i10nm_base.c Tony Luck
2024-04-16 21:22 ` [PATCH v3 46/74] x86/cpu/vfm: Update drivers/edac/pnd2_edac.c Tony Luck
@ 2024-04-16 21:22 ` Tony Luck
2024-04-16 21:22 ` [PATCH v3 48/74] x86/cpu/vfm: Update drivers/edac/skx_base.c Tony Luck
3 siblings, 0 replies; 4+ messages in thread
From: Tony Luck @ 2024-04-16 21:22 UTC (permalink / raw)
To: Tony Luck
Cc: Qiuxu Zhuo, Borislav Petkov, James Morse, Mauro Carvalho Chehab,
Robert Richter, linux-edac, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
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);
--
2.44.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 48/74] x86/cpu/vfm: Update drivers/edac/skx_base.c
[not found] <20240416211941.9369-1-tony.luck@intel.com>
` (2 preceding siblings ...)
2024-04-16 21:22 ` [PATCH v3 47/74] x86/cpu/vfm: Update drivers/edac/sb_edac.c Tony Luck
@ 2024-04-16 21:22 ` Tony Luck
3 siblings, 0 replies; 4+ messages in thread
From: Tony Luck @ 2024-04-16 21:22 UTC (permalink / raw)
To: Tony Luck
Cc: Borislav Petkov, James Morse, Mauro Carvalho Chehab,
Robert Richter, linux-edac, linux-kernel, patches
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
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);
--
2.44.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-16 21:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240416211941.9369-1-tony.luck@intel.com>
2024-04-16 21:22 ` [PATCH v3 45/74] x86/cpu/vfm: Update drivers/edac/i10nm_base.c Tony Luck
2024-04-16 21:22 ` [PATCH v3 46/74] x86/cpu/vfm: Update drivers/edac/pnd2_edac.c Tony Luck
2024-04-16 21:22 ` [PATCH v3 47/74] x86/cpu/vfm: Update drivers/edac/sb_edac.c Tony Luck
2024-04-16 21:22 ` [PATCH v3 48/74] x86/cpu/vfm: Update drivers/edac/skx_base.c Tony Luck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).