Skip to contentSkip to conversation

crypto: use SRCARCH to source arch Kconfigs

PATCH New Prasad Pandit 2 participants 4 messages Aug 16, 2023 Crypto API

lore
Share & tools
lore

Prasad Pandit

author
#0 lore raw

PATCH 1/1 crypto: use SRCARCH to source arch Kconfigs

From: P J P <[email protected]>

Use $(SRCARCH) variable to source architecture specific crypto Kconfig file. It helps to avoid multiple if ARCH conditionals.

Signed-off-by Prasad Pandit <[email protected]>
---
 crypto/Kconfig | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
crypto/Kconfig +1 -24
index 650b1b3620d8..0ac776d3168b 100644
@@ -1421,30 +1421,7 @@ config CRYPTO_HASH_INFO
 	bool
 
 if !KMSAN # avoid false positives from assembly
-if ARM
-source "arch/arm/crypto/Kconfig"
-endif
-if ARM64
-source "arch/arm64/crypto/Kconfig"
-endif
-if LOONGARCH
-source "arch/loongarch/crypto/Kconfig"
-endif
-if MIPS
-source "arch/mips/crypto/Kconfig"
-endif
-if PPC
-source "arch/powerpc/crypto/Kconfig"
-endif
-if S390
-source "arch/s390/crypto/Kconfig"
-endif
-if SPARC
-source "arch/sparc/crypto/Kconfig"
-endif
-if X86
-source "arch/x86/crypto/Kconfig"
-endif
+source "arch/$(SRCARCH)/crypto/Kconfig"
 endif
 
 source "drivers/crypto/Kconfig"
Signature · 1 line
2.41.0
build bot
#1 lore raw
kernel test robot noticed the following build errors:

Hi Prasad,

kernel test robot noticed the following build errors:

[auto build test ERROR on herbert-cryptodev-2.6/master]
[also build test ERROR on herbert-crypto-2.6/master linus/master v6.5-rc6 next-20230815] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Prasad-Pandit/crypto-use-SRCARCH-to-source-arch-Kconfigs/20230816-143209
base:   https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
patch link:    https://lore.kernel.org/r/20230816063107.11215-1-ppandit%40redhat.com
patch subject: [PATCH] crypto: use SRCARCH to source arch Kconfigs
config: hexagon-randconfig-r011-20230816 (attached as .config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce: (https://download.01.org/0day-ci/archive/20230816/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

>> crypto/Kconfig:1424: can't open file "arch/hexagon/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: oldconfig] Error 1 shuffle=3400782416 make[2]: *** [Makefile:693: oldconfig] Error 2 shuffle=3400782416 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=3400782416 make[1]: Target 'oldconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=3400782416
make: Target 'oldconfig' not remade because of errors.
--

>> crypto/Kconfig:1424: can't open file "arch/hexagon/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: olddefconfig] Error 1 shuffle=3400782416 make[2]: *** [Makefile:693: olddefconfig] Error 2 shuffle=3400782416 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=3400782416 make[1]: Target 'olddefconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=3400782416
make: Target 'olddefconfig' not remade because of errors.

vim +1424 crypto/Kconfig

1419
1420 config CRYPTO_HASH_INFO
1421 bool
1422
1423 if !KMSAN # avoid false positives from assembly

> 1424	source "arch/$(SRCARCH)/crypto/Kconfig"

1425 endif
1426

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
build bot
#2 lore raw
In reply to Prasad Pandit
kernel test robot noticed the following build errors:

Hi Prasad,

kernel test robot noticed the following build errors:

[auto build test ERROR on herbert-cryptodev-2.6/master]
[also build test ERROR on herbert-crypto-2.6/master linus/master v6.5-rc6 next-20230815] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Prasad-Pandit/crypto-use-SRCARCH-to-source-arch-Kconfigs/20230816-143209
base:   https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
patch link:    https://lore.kernel.org/r/20230816063107.11215-1-ppandit%40redhat.com
patch subject: [PATCH] crypto: use SRCARCH to source arch Kconfigs
config: arc-randconfig-r035-20230816 (attached as .config)
compiler: arc-elf-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230816/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

>> crypto/Kconfig:1424: can't open file "arch/arc/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: oldconfig] Error 1 shuffle=2853089106 make[2]: *** [Makefile:693: oldconfig] Error 2 shuffle=2853089106 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=2853089106 make[1]: Target 'oldconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=2853089106
make: Target 'oldconfig' not remade because of errors.
--

>> crypto/Kconfig:1424: can't open file "arch/arc/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: olddefconfig] Error 1 shuffle=2853089106 make[2]: *** [Makefile:693: olddefconfig] Error 2 shuffle=2853089106 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=2853089106 make[1]: Target 'olddefconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=2853089106
make: Target 'olddefconfig' not remade because of errors.

vim +1424 crypto/Kconfig

1419
1420 config CRYPTO_HASH_INFO
1421 bool
1422
1423 if !KMSAN # avoid false positives from assembly

> 1424	source "arch/$(SRCARCH)/crypto/Kconfig"

1425 endif
1426

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
build bot
#3 lore raw
In reply to Prasad Pandit
kernel test robot noticed the following build errors:

Hi Prasad,

kernel test robot noticed the following build errors:

[auto build test ERROR on herbert-cryptodev-2.6/master]
[also build test ERROR on herbert-crypto-2.6/master linus/master v6.5-rc6 next-20230815] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Prasad-Pandit/crypto-use-SRCARCH-to-source-arch-Kconfigs/20230816-143209
base:   https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master
patch link:    https://lore.kernel.org/r/20230816063107.11215-1-ppandit%40redhat.com
patch subject: [PATCH] crypto: use SRCARCH to source arch Kconfigs
config: xtensa-randconfig-r015-20230816 (attached as .config)
compiler: xtensa-linux-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230816/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

>> crypto/Kconfig:1424: can't open file "arch/xtensa/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: oldconfig] Error 1 shuffle=2313028485 make[2]: *** [Makefile:693: oldconfig] Error 2 shuffle=2313028485 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=2313028485 make[1]: Target 'oldconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=2313028485
make: Target 'oldconfig' not remade because of errors.
--

>> crypto/Kconfig:1424: can't open file "arch/xtensa/crypto/Kconfig"

make[3]: *** [scripts/kconfig/Makefile:77: olddefconfig] Error 1 shuffle=2313028485 make[2]: *** [Makefile:693: olddefconfig] Error 2 shuffle=2313028485 make[1]: *** [Makefile:234: __sub-make] Error 2 shuffle=2313028485 make[1]: Target 'olddefconfig' not remade because of errors.
make: *** [Makefile:234: __sub-make] Error 2 shuffle=2313028485
make: Target 'olddefconfig' not remade because of errors.

vim +1424 crypto/Kconfig

1419
1420 config CRYPTO_HASH_INFO
1421 bool
1422
1423 if !KMSAN # avoid false positives from assembly

> 1424	source "arch/$(SRCARCH)/crypto/Kconfig"

1425 endif
1426

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki