Commit 5b115dcc authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

Merge remote-tracking branches 'ras/edac-drivers', 'ras/edac-misc' and... 


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

* 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: default avatarBorislav Petkov (AMD) <bp@alien8.de>
parents 1795dc52 c816ba1d 0923a618

drivers/edac/amd64_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;