Commit 7dc58d81 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Aichun Shi
Browse files

EDAC, i10nm: make skx_common.o a separate module 

mainline inclusion
from mainline-v6.11-rc1
commit 123b158635505c89ed0d3ef45c5845ff9030a466
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IBPIMS
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=123b158635505c89ed0d3ef45c5845ff9030a466



-------------------------------------

Commit 598afa05 ("kbuild: warn objects shared among multiple modules")
was added to track down cases where the same object is linked into
multiple modules. This can cause serious problems if some modules are
builtin while others are not.

That test triggers this warning:

scripts/Makefile.build:236: drivers/edac/Makefile: skx_common.o is added to multiple modules: i10nm_edac skx_edac

Make this a separate module instead.

[Tony: Added more background details to commit message]

Intel-SIG: commit 123b15863550 EDAC, i10nm: make skx_common.o a separate module
Backport to fix EDAC driver for GNR

Fixes: d4dc89d0 ("EDAC, i10nm: Add a driver for Intel 10nm server processors")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/all/20240529095132.1929397-1-arnd@kernel.org/


[ Aichun Shi: amend commit log ]
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent 22f72139

drivers/edac/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -58,11 +58,13 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac_mod.o 
layerscape_edac_mod-y			:= fsl_ddr_edac.o layerscape_edac.o

obj-$(CONFIG_EDAC_LAYERSCAPE)		+= layerscape_edac_mod.o



skx_edac-y				:= skx_common.o skx_base.o

obj-$(CONFIG_EDAC_SKX)			+= skx_edac.o

skx_edac_common-y			:= skx_common.o



i10nm_edac-y				:= skx_common.o i10nm_base.o

obj-$(CONFIG_EDAC_I10NM)		+= i10nm_edac.o

skx_edac-y				:= skx_base.o

obj-$(CONFIG_EDAC_SKX)			+= skx_edac.o skx_edac_common.o



i10nm_edac-y				:= i10nm_base.o

obj-$(CONFIG_EDAC_I10NM)		+= i10nm_edac.o skx_edac_common.o



obj-$(CONFIG_EDAC_MV64X60)		+= mv64x60_edac.o

obj-$(CONFIG_EDAC_CELL)			+= cell_edac.o

drivers/edac/skx_common.c

+19 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static u64 skx_tolm, skx_tohm; 
static LIST_HEAD(dev_edac_list);

static bool skx_mem_cfg_2lm;



int __init skx_adxl_get(void)

int skx_adxl_get(void)

{

	const char * const *names;

	int i, j;
@@ -110,12 +110,14 @@ int __init skx_adxl_get(void) 


	return -ENODEV;

}

EXPORT_SYMBOL_GPL(skx_adxl_get);



void __exit skx_adxl_put(void)

void skx_adxl_put(void)

{

	kfree(adxl_values);

	kfree(adxl_msg);

}

EXPORT_SYMBOL_GPL(skx_adxl_put);



static bool skx_adxl_decode(struct decoded_addr *res, bool error_in_1st_level_mem)

{
@@ -187,12 +189,14 @@ void skx_set_mem_cfg(bool mem_cfg_2lm) 
{

	skx_mem_cfg_2lm = mem_cfg_2lm;

}

EXPORT_SYMBOL_GPL(skx_set_mem_cfg);



void skx_set_decode(skx_decode_f decode, skx_show_retry_log_f show_retry_log)

{

	driver_decode = decode;

	skx_show_retry_rd_err_log = show_retry_log;

}

EXPORT_SYMBOL_GPL(skx_set_decode);



int skx_get_src_id(struct skx_dev *d, int off, u8 *id)

{
@@ -206,6 +210,7 @@ int skx_get_src_id(struct skx_dev *d, int off, u8 *id) 
	*id = GET_BITFIELD(reg, 12, 14);

	return 0;

}

EXPORT_SYMBOL_GPL(skx_get_src_id);



int skx_get_node_id(struct skx_dev *d, u8 *id)

{
@@ -219,6 +224,7 @@ int skx_get_node_id(struct skx_dev *d, u8 *id) 
	*id = GET_BITFIELD(reg, 0, 2);

	return 0;

}

EXPORT_SYMBOL_GPL(skx_get_node_id);



static int get_width(u32 mtr)

{
@@ -284,6 +290,7 @@ int skx_get_all_bus_mappings(struct res_config *cfg, struct list_head **list) 
		*list = &dev_edac_list;

	return ndev;

}

EXPORT_SYMBOL_GPL(skx_get_all_bus_mappings);



int skx_get_hi_lo(unsigned int did, int off[], u64 *tolm, u64 *tohm)

{
@@ -323,6 +330,7 @@ int skx_get_hi_lo(unsigned int did, int off[], u64 *tolm, u64 *tohm) 
	pci_dev_put(pdev);

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(skx_get_hi_lo);



static int skx_get_dimm_attr(u32 reg, int lobit, int hibit, int add,

			     int minval, int maxval, const char *name)
@@ -394,6 +402,7 @@ int skx_get_dimm_info(u32 mtr, u32 mcmtr, u32 amap, struct dimm_info *dimm, 


	return 1;

}

EXPORT_SYMBOL_GPL(skx_get_dimm_info);



int skx_get_nvdimm_info(struct dimm_info *dimm, struct skx_imc *imc,

			int chan, int dimmno, const char *mod_str)
@@ -442,6 +451,7 @@ int skx_get_nvdimm_info(struct dimm_info *dimm, struct skx_imc *imc, 


	return (size == 0 || size == ~0ull) ? 0 : 1;

}

EXPORT_SYMBOL_GPL(skx_get_nvdimm_info);



int skx_register_mci(struct skx_imc *imc, struct pci_dev *pdev,

		     const char *ctl_name, const char *mod_str,
@@ -512,6 +522,7 @@ int skx_register_mci(struct skx_imc *imc, struct pci_dev *pdev, 
	imc->mci = NULL;

	return rc;

}

EXPORT_SYMBOL_GPL(skx_register_mci);



static void skx_unregister_mci(struct skx_imc *imc)

{
@@ -700,6 +711,7 @@ int skx_mce_check_error(struct notifier_block *nb, unsigned long val, 
	mce->kflags |= MCE_HANDLED_EDAC;

	return NOTIFY_DONE;

}

EXPORT_SYMBOL_GPL(skx_mce_check_error);



void skx_remove(void)

{
@@ -737,3 +749,8 @@ void skx_remove(void) 
		kfree(d);

	}

}

EXPORT_SYMBOL_GPL(skx_remove);



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Tony Luck");

MODULE_DESCRIPTION("MC Driver for Intel server processors");

drivers/edac/skx_common.h

+2 −2
Original line number Diff line number Diff line
@@ -231,8 +231,8 @@ typedef int (*get_dimm_config_f)(struct mem_ctl_info *mci, 
typedef bool (*skx_decode_f)(struct decoded_addr *res);

typedef void (*skx_show_retry_log_f)(struct decoded_addr *res, char *msg, int len, bool scrub_err);



int __init skx_adxl_get(void);

void __exit skx_adxl_put(void);

int skx_adxl_get(void);

void skx_adxl_put(void);

void skx_set_decode(skx_decode_f decode, skx_show_retry_log_f show_retry_log);

void skx_set_mem_cfg(bool mem_cfg_2lm);