[GIT PULL] EDAC updates for v6.17-rc1

[GIT PULL] EDAC updates for v6.17-rc1

[Borislav Petkov]

Hi Linus,

please pull the EDAC updates for v6.17-rc1.

There's a small merge conflict with upstream, I've added the resolution at the
end of this mail if it helps.

Thx.

---

The following changes since commit 86731a2a651e58953fc949573895f2fa6d456841:

  Linux 6.16-rc3 (2025-06-22 13:30:08 -0700)

are available in the Git repository at:

  ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/ras/ras.git tags/edac_updates_for_v6.17_rc1

for you to fetch changes up to 35928bc38db69a2af26624e35a250c1e0f9a6a3f:

  EDAC/{skx_common,i10nm}: Use scnprintf() for safer buffer handling (2025-07-15 10:06:58 -0700)

----------------------------------------------------------------
- i10nm:
 - switch to use 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

----------------------------------------------------------------
Arnd Bergmann (1):
      EDAC/mem_repair: Reduce stack usage in edac_mem_repair_get_desc()

George Gaidarov (2):
      EDAC/ie31200: Enable support for Core i5-14600 and i7-14700
      EDAC/ie31200: Document which CPUs correspond to each Raptor Lake-S device ID

Lili Li (1):
      EDAC/igen6: Add Intel Wildcat Lake SoCs support

Qiuxu Zhuo (4):
      ie31200/EDAC: Add Intel Bartlett Lake-S SoCs support
      EDAC/igen6: Reduce log level to debug for absent memory controllers
      EDAC/i10nm: Add Intel Granite Rapids-D support
      EDAC/ie31200: Add Intel Raptor Lake-HX SoCs support

Shubhrajyoti Datta (1):
      EDAC/synopsys: Clear the ECC counters on init

Wang Haoran (1):
      EDAC/{skx_common,i10nm}: Use scnprintf() for safer buffer handling

 drivers/edac/i10nm_base.c    | 30 +++++++++-----
 drivers/edac/ie31200_edac.c  | 38 +++++++++++++++--
 drivers/edac/igen6_edac.c    | 17 +++++++-
 drivers/edac/mem_repair.c    | 56 ++++++++++---------------
 drivers/edac/skx_common.c    |  4 +-
 drivers/edac/synopsys_edac.c | 97 +++++++++++++++++++++-----------------------
 6 files changed, 140 insertions(+), 102 deletions(-)

---

Merge conflict resolution:

diff --cc drivers/edac/mem_repair.c
index 70a033a76233,2e4e790e0ffe..000000000000
--- a/drivers/edac/mem_repair.c
+++ b/drivers/edac/mem_repair.c
@@@ -331,11 -319,10 +319,11 @@@ 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;
 -		ctx->mem_repair_attrs[i] =
 -			&ctx->mem_repair_dev_attr[i].dev_attr.attr;
++
 +		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;
++		ctx->mem_repair_attrs[i] = &ctx->mem_repair_dev_attr[i].dev_attr.attr;
  	}
  
  	sprintf(ctx->name, "%s%d", "mem_repair", instance);


-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [GIT PULL] EDAC updates for v6.17-rc1

[pr-tracker-bot]

The pull request you sent on Mon, 28 Jul 2025 16:15:22 +0200:

> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/ras/ras.git tags/edac_updates_for_v6.17_rc1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d7223aed30cd77be31dabd635e709828f3255366

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html