From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Jul 2025 23:30:38 +0000 (-0700)
Subject: Merge tag 'edac_updates_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7223aed30cd77be31dabd635e709828f3255366;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'edac_updates_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC updates from Borislav Petkov:

 - i10nm:
     - switch to using scnprintf()
     - Add Granite Rapids-D support

 - synopsys: Make sure ECC error and counter registers are cleared
   during init/probing to avoid reporting stale errors

 - igen6: Add Wildcat Lake SoCs support

 - Make sure scrub features sysfs attributes are initialized properly

 - Allocate memory repair sysfs attributes statically to reduce stack
   usage

 - Fix DIMM module size computation for DIMMs with total capacity which
   is a non power-of-two number, in amd64_edac

 - Do not be too dramatic when reporting disabled memory controllers in
   igen6_edac

 - Add support to ie31200_edac for the following SoCs:
     - Core i5-14[67]00
     - Bartless Lake-S SoCs
     - Raptor Lake-HX

* tag 'edac_updates_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/{skx_common,i10nm}: Use scnprintf() for safer buffer handling
  EDAC/synopsys: Clear the ECC counters on init
  EDAC/ie31200: Add Intel Raptor Lake-HX SoCs support
  EDAC/igen6: Add Intel Wildcat Lake SoCs support
  EDAC/i10nm: Add Intel Granite Rapids-D support
  EDAC/mem_repair: Reduce stack usage in edac_mem_repair_get_desc()
  EDAC/igen6: Reduce log level to debug for absent memory controllers
  EDAC/ie31200: Document which CPUs correspond to each Raptor Lake-S device ID
  EDAC/ie31200: Enable support for Core i5-14600 and i7-14700
  ie31200/EDAC: Add Intel Bartlett Lake-S SoCs support
---

d7223aed30cd77be31dabd635e709828f3255366
diff --cc drivers/edac/mem_repair.c
index 70a033a76233c,2e4e790e0ffe0..108d69209146c
--- a/drivers/edac/mem_repair.c
+++ b/drivers/edac/mem_repair.c
@@@ -331,9 -319,8 +319,9 @@@ static int mem_repair_create_desc(struc
  		return -ENOMEM;
  
  	for (i = 0; i < MR_MAX_ATTRS; i++) {
- 		memcpy(&ctx->mem_repair_dev_attr[i],
- 		       &dev_attr[i], sizeof(dev_attr[i]));
+ 		ctx->mem_repair_dev_attr[i].dev_attr = mem_repair_dev_attr[i];
+ 		ctx->mem_repair_dev_attr[i].instance = instance;
 +		sysfs_attr_init(&ctx->mem_repair_dev_attr[i].dev_attr.attr);
  		ctx->mem_repair_attrs[i] =
  			&ctx->mem_repair_dev_attr[i].dev_attr.attr;
  	}