Commit 8807e155 authored by Qiuxu Zhuo's avatar Qiuxu Zhuo Committed by Tony Luck
Browse files

EDAC, {skx,i10nm}: Use CPU stepping macro to pass configurations 



Use the X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro to pass CPU
stepping specific configurations to {skx,i10nm}_init(), so can delete
the CPU stepping check from 10nm_init().

Signed-off-by: default avatarQiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20200509010822.76331-1-qiuxu.zhuo@intel.com
parent e9ff6636

drivers/edac/i10nm_base.c

+5 −7
Original line number Diff line number Diff line
@@ -135,9 +135,11 @@ static struct res_config i10nm_cfg1 = { 
};



static const struct x86_cpu_id i10nm_cpuids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	&i10nm_cfg0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&i10nm_cfg0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		&i10nm_cfg1),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_TREMONT_D,	X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_TREMONT_D,	X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_X,		X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_X,		X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ICELAKE_D,		X86_STEPPINGS(0x0, 0xf), &i10nm_cfg1),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);
@@ -264,10 +266,6 @@ static int __init i10nm_init(void) 


	cfg = (struct res_config *)id->driver_data;



	/* Newer steppings have different offset for ATOM_TREMONT_D/ICELAKE_X */

	if (boot_cpu_data.x86_stepping >= 4)

		cfg->busno_cfg_offset = 0xd0;



	rc = skx_get_hi_lo(0x09a2, off, &tolm, &tohm);

	if (rc)

		return rc;

drivers/edac/skx_base.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static struct res_config skx_cfg = { 
};



static const struct x86_cpu_id skx_cpuids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,	&skx_cfg),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg),

	{ }

};

MODULE_DEVICE_TABLE(x86cpu, skx_cpuids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE