projects/linux·commit 5b115dcc

Merge remote-tracking branches 'ras/edac-drivers', 'ras/edac-misc' and 'ras/edac-amd-atl' into edac-updates

5b115dcc · Borislav Petkov (AMD) <[email protected]> · 2026-02-09 13:49:36 +01:00

* ras/edac-drivers:
  EDAC/r82600: Remove this obsolete driver
  EDAC/i82443bxgx: Remove driver that has been marked broken since 2007
  EDAC/igen6: Add more Intel Panther Lake-H SoCs support
  EDAC/igen6: Make masks of {MCHBAR, TOM, TOUUD, ECC_ERROR_LOG} configurable
  EDAC/igen6: Add two Intel Amston Lake SoCs support
  EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
  EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()

* ras/edac-misc:
  EDAC/amd64: Avoid a -Wformat-security warning

* ras/edac-amd-atl:
  RAS/AMD/ATL: Remove an unneeded semicolon

Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Commit
5b115dccdc8612cd892c41354e63fd5b23d56c51
Parents
1795dc52 · c816ba1d · 0923a618

Merge commit. Changes below are compared with the first parent: 1795dc52.

Changes

2 files changed · +2 −2

FileStatusAddDelContent
drivers/edac/amd64_edac.cmodified+1−1View file
drivers/ras/amd/atl/denormalize.cmodified+1−1View file

drivers/edac/amd64_edac.c

View file
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 2391f34..63fca0e 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3911,7 +3911,7 @@ static int per_family_init(struct amd64_pvt *pvt)
}
if (tmp_name)
- scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name);
+ scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "%s", tmp_name);
else
scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh",
pvt->fam, pvt->model);

drivers/ras/amd/atl/denormalize.c

View file
diff --git a/drivers/ras/amd/atl/denormalize.c b/drivers/ras/amd/atl/denormalize.c
index 1a525cf..d45ce75 100644
--- a/drivers/ras/amd/atl/denormalize.c
+++ b/drivers/ras/amd/atl/denormalize.c
@@ -683,7 +683,7 @@ static int denorm_addr_df4_np2(struct addr_ctx *ctx)
default:
atl_debug_on_bad_intlv_mode(ctx);
return -EINVAL;
- };
+ }
if (ctx->map.num_intlv_sockets == 1) {
hash_pa8 = BIT_ULL(shift_value) & ctx->ret_addr;