8000 Merge tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm… · Rust-for-Linux/linux@73543ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 73543ba

Browse files
torvaldstorvalds
committed
Merge tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fixes from Borislav Petkov: - amd64: Correct the number of memory controllers on some AMD Zen clients - igen6: Handle firmware-disabled memory controllers properly * tag 'edac_urgent_for_v6.16_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC/igen6: Fix NULL pointer dereference EDAC/amd64: Correct number of UMCs for family 19h models 70h-7fh
2 parents e669e32 + 88efa0d commit 73543ba

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

‎drivers/edac/amd64_edac.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3879,6 +3879,7 @@ static int per_family_init(struct amd64_pvt *pvt)
38793879
break;
38803880
case 0x70 ... 0x7f:
38813881
pvt->ctl_name = "F19h_M70h";
3882+
pvt->max_mcs = 4;
38823883
pvt->flags.zn_regs_v2 = 1;
38833884
break;
38843885
case 0x90 ... 0x9f:

‎drivers/edac/igen6_edac.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
#define MEM_SLICE_HASH_MASK(v) (GET_BITFIELD(v, 6, 19) << 6)
126126
#define MEM_SLICE_HASH_LSB_MASK_BIT(v) GET_BITFIELD(v, 24, 26)
127127

128-
static const struct res_config {
128+
static struct res_config {
129129
bool machine_check;
130130
/* The number of present memory controllers. */
131131
int num_imc;
@@ -479,7 +479,7 @@ static u64 rpl_p_err_addr(u64 ecclog)
479479
return ECC_ERROR_LOG_ADDR45(ecclog);
480480
}
481481

482-
static const struct res_config ehl_cfg = {
482+
static struct res_config ehl_cfg = {
483483
.num_imc = 1,
484484
.imc_base = 0x5000,
485485
.ibecc_base = 0xdc00,
@@ -489,7 +489,7 @@ static const struct res_config ehl_cfg = {
489489
.err_addr_to_imc_addr = ehl_err_addr_to_imc_addr,
490490
};
491491

492-
static const struct res_config icl_cfg = {
492+
static struct res_config icl_cfg = {
493493
.num_imc = 1,
494494
.imc_base = 0x5000,
495495
.ibecc_base = 0xd800,
@@ -499,7 +499,7 @@ static const struct res_config icl_cfg = {
499499
.err_addr_to_imc_addr = ehl_err_addr_to_imc_addr,
500500
};
501501

502-
static const struct res_config tgl_cfg = {
502+
static struct res_config tgl_cfg = {
503503
.machine_check = true,
504504
.num_imc = 2,
505505
.imc_base = 0x5000,
@@ -513,7 +513,7 @@ static const struct res_config tgl_cfg = {
513513
.err_addr_to_imc_addr = tgl_err_addr_to_imc_addr,
514514
};
515515

516-
static const struct res_config adl_cfg = {
516+
static struct res_config adl_cfg = {
517517
.machine_check = true,
518518
.num_imc = 2,
519519
.imc_base = 0xd800,
@@ -524,7 +524,7 @@ static const struct res_config adl_cfg = {
524524
.err_addr_to_imc_addr = adl_err_addr_to_imc_addr,
525525
};
526526

527-
static const struct res_config adl_n_cfg = {
527+
static struct res_config adl_n_cfg = {
528528
.machine_check = true,
529529
.num_imc = 1,
530530
.imc_base = 0xd800,
@@ -535,7 +535,7 @@ static const struct res_config adl_n_cfg = {
535535
.err_addr_to_imc_addr = adl_err_addr_to_imc_addr,
536536
};
537537

538-
static const struct res_config rpl_p_cfg = {
538+
static struct res_config rpl_p_cfg = {
539539
.machine_check = true,
540540
.num_imc = 2,
541541
.imc_base = 0xd800,
@@ -547,7 +547,7 @@ static const struct res_config rpl_p_cfg = {
547547
.err_addr_to_imc_addr = adl_err_addr_to_imc_addr,
548548
};
549549

550-
static const struct res_config mtl_ps_cfg = {
550+
static struct res_config mtl_ps_cfg = {
551551
.machine_check = true,
552552
.num_imc = 2,
553553
.imc_base = 0xd800,
@@ -558,7 +558,7 @@ static const struct res_config mtl_ps_cfg = {
558558
.err_addr_to_imc_addr = adl_err_addr_to_imc_addr,
559559
};
560560

561-
static const struct res_config mtl_p_cfg = {
561+
static struct res_config mtl_p_cfg = {
562562
.machine_check = true,
563563
.num_imc = 2,
564564
.imc_base = 0xd800,
@@ -569,7 +569,7 @@ static const struct res_config mtl_p_cfg = {
569569
.err_addr_to_imc_addr = adl_err_addr_to_imc_addr,
570570
};
571571

572-
static const struct pci_device_id igen6_pci_tbl[] = {
572+
static struct pci_device_id igen6_pci_tbl[] = {
573573
{ PCI_VDEVICE(INTEL, DID_EHL_SKU5), (kernel_ulong_t)&ehl_cfg },
574574
{ PCI_VDEVICE(INTEL, DID_EHL_SKU6), (kernel_ulong_t)&ehl_cfg },
575575
{ PCI_VDEVICE(INTEL, DID_EHL_SKU7), (kernel_ulong_t)&ehl_cfg },
@@ -1350,9 +1350,11 @@ static int igen6_register_mcis(struct pci_dev *pdev, u64 mchbar)
13501350
return -ENODEV;
13511351
}
13521352

1353-
if (lmc < res_cfg->num_imc)
1353+
if (lmc < res_cfg->num_imc) {
13541354
igen6_printk(KERN_WARNING, "Expected %d mcs, but only %d detected.",
13551355
res_cfg->num_imc, lmc);
1356+
res_cfg->num_imc = lmc;
1357+
}
13561358

13571359
return 0;
13581360

0 commit comments

Comments
 (0)
0