Patchwork EDAC: i10nm, skx: fix randconfig builds

login
register
mail settings
Submitter Arnd Bergmann
Date March 5, 2019, 1:21 p.m.
Message ID <20190305132147.3739133-1-arnd@arndb.de>
Download mbox | patch
Permalink /patch/741619/
State New
Headers show

Comments

Arnd Bergmann - March 5, 2019, 1:21 p.m.
In a configuration where one of the two drivers is built-in and the
other one is a module, kbuild tries to add the modular file into
vmlinux, and fails with

drivers/edac/skx_common.o:(.rodata+0xc0): undefined reference to `__this_module'

We either have to make both drivers be configured the same way all the
time, or make skx_common a separate module.

This takes the second approach, which is more logical, but has the downside
of requiring lots of new EXPORT_SYMBOL_GPL() statements.

Fixes: d4dc89d069aa ("EDAC, i10nm: Add a driver for Intel 10nm server processors")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/edac/Makefile     |  8 ++++----
 drivers/edac/skx_common.c | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
Borislav Petkov - March 5, 2019, 2:34 p.m.
On Tue, Mar 05, 2019 at 02:21:30PM +0100, Arnd Bergmann wrote:
> In a configuration where one of the two drivers is built-in and the
> other one is a module, kbuild tries to add the modular file into
> vmlinux, and fails with

There must be something more to that .config of yours because both

CONFIG_EDAC_SKX=m
CONFIG_EDAC_I10NM=y

and

CONFIG_EDAC_SKX=y
CONFIG_EDAC_I10NM=m

work ok here...
Arnd Bergmann - March 6, 2019, 1:48 p.m.
On Tue, Mar 5, 2019 at 3:34 PM Borislav Petkov <bp@alien8.de> wrote:
>
> On Tue, Mar 05, 2019 at 02:21:30PM +0100, Arnd Bergmann wrote:
> > In a configuration where one of the two drivers is built-in and the
> > other one is a module, kbuild tries to add the modular file into
> > vmlinux, and fails with
>
> There must be something more to that .config of yours because both
>
> CONFIG_EDAC_SKX=m
> CONFIG_EDAC_I10NM=y
>
> and
>
> CONFIG_EDAC_SKX=y
> CONFIG_EDAC_I10NM=m
>
> work ok here...

Quite possible, here is the fill .config file that I used as attachment

      Arnd

Patch

diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index 89ad4a84a0f6..ab01d15be46c 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -57,11 +57,11 @@  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-y				:= skx_base.o
+obj-$(CONFIG_EDAC_SKX)			+= skx_common.o skx_edac.o
 
-i10nm_edac-y				:= skx_common.o i10nm_base.o
-obj-$(CONFIG_EDAC_I10NM)		+= i10nm_edac.o
+i10nm_edac-y				:= i10nm_base.o
+obj-$(CONFIG_EDAC_I10NM)		+= skx_common.o i10nm_edac.o
 
 obj-$(CONFIG_EDAC_MV64X60)		+= mv64x60_edac.o
 obj-$(CONFIG_EDAC_CELL)			+= cell_edac.o
diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c
index 0e96e7b5b0a7..bb183035df5c 100644
--- a/drivers/edac/skx_common.c
+++ b/drivers/edac/skx_common.c
@@ -83,12 +83,14 @@  int __init skx_adxl_get(void)
 
 	return -ENODEV;
 }
+EXPORT_SYMBOL_GPL(skx_adxl_get);
 
 void __exit 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)
 {
@@ -127,6 +129,7 @@  void skx_set_decode(skx_decode_f decode)
 {
 	skx_decode = decode;
 }
+EXPORT_SYMBOL_GPL(skx_set_decode);
 
 int skx_get_src_id(struct skx_dev *d, u8 *id)
 {
@@ -140,6 +143,7 @@  int skx_get_src_id(struct skx_dev *d, 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)
 {
@@ -153,6 +157,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)
 {
@@ -219,6 +224,7 @@  int skx_get_all_bus_mappings(unsigned int did, int off, enum type type,
 		*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)
 {
@@ -258,6 +264,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)
@@ -311,6 +318,7 @@  int skx_get_dimm_info(u32 mtr, 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)
@@ -359,6 +367,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,
@@ -426,6 +435,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)
 {
@@ -609,6 +619,7 @@  int skx_mce_check_error(struct notifier_block *nb, unsigned long val,
 
 	return NOTIFY_DONE;
 }
+EXPORT_SYMBOL_GPL(skx_mce_check_error);
 
 void skx_remove(void)
 {
@@ -644,6 +655,7 @@  void skx_remove(void)
 		kfree(d);
 	}
 }
+EXPORT_SYMBOL_GPL(skx_remove);
 
 #ifdef CONFIG_EDAC_DEBUG
 /*
@@ -683,9 +695,11 @@  void setup_skx_debug(const char *dirname)
 		skx_test = NULL;
 	}
 }
+EXPORT_SYMBOL_GPL(setup_skx_debug);
 
 void teardown_skx_debug(void)
 {
 	debugfs_remove_recursive(skx_test);
 }
+EXPORT_SYMBOL_GPL(teardown_skx_debug);
 #endif /*CONFIG_EDAC_DEBUG*/