Re: [tip: x86/cpu] x86/cpu/intel: Fix rename fallout

From: kbuild test robot
Date: Mon Aug 26 2019 - 23:09:07 EST


Hi tip-bot2,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190826]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/tip-bot2-for-Ingo-Molnar/x86-cpu-intel-Fix-rename-fallout/20190827-083739
config: x86_64-randconfig-s2-08250055 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@xxxxxxxxx>

All errors (new ones prefixed by >>):

In file included from drivers/platform/x86/intel_pmc_core.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:809:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:810:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:811:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:812:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:813:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core.c:814:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
^
--
In file included from drivers/platform/x86/intel_pmc_core_pltdrv.c:19:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:33:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:34:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:35:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:36:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:37:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/platform/x86/intel_pmc_core_pltdrv.c:38:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device),
^
--
In file included from drivers/powercap/intel_rapl_common.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:960:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:961:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_HASWELL_G' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:962:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(HASWELL_G, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:965:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_G' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:966:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_G, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_BROADWELL_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:967:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(BROADWELL_D, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:970:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:971:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:973:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:974:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:975:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:976:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:977:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:980:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_GOLDMONT_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:988:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_GOLDMONT_D, rapl_defaults_core),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ATOM_TREMONT_D' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers/powercap/intel_rapl_common.c:989:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ATOM_TREMONT_D, rapl_defaults_core),
^
--
In file included from drivers//platform/x86/intel_pmc_core.c:27:0:
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:809:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_SKYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:810:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:811:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_KABYLAKE' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:812:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_CANNONLAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:813:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
^
>> arch/x86/include/asm/intel-family.h:114:23: error: 'INTEL_FAM6_ICELAKE_L' undeclared here (not in a function)
INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
^
arch/x86/include/asm/intel-family.h:108:12: note: in definition of macro 'INTEL_CPU_FAM_ANY'
.model = _model, \
^
drivers//platform/x86/intel_pmc_core.c:814:2: note: in expansion of macro 'INTEL_CPU_FAM6'
INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
^
..

vim +/INTEL_FAM6_SKYLAKE_L +114 arch/x86/include/asm/intel-family.h

e2ce67b2b34b6e Andy Shevchenko 2018-06-29 112
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 113 #define INTEL_CPU_FAM6(_model, _driver_data) \
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 @114 INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
e2ce67b2b34b6e Andy Shevchenko 2018-06-29 115

:::::: The code at line 114 was first introduced by commit
:::::: e2ce67b2b34b6e9d77da2f375dba5b525508f7df x86/cpu: Introduce INTEL_CPU_FAM*() helper macros

:::::: TO: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
:::::: CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

Attachment: .config.gz
Description: application/gzip