[PATCH] crypto: ixp4xx - Remove COMPILE_TEST from Kconfig dependencies

[PATCH] crypto: ixp4xx - Remove COMPILE_TEST from Kconfig dependencies

[Tom Zanussi]

COMPILE_TEST was added during the move to drivers/crypto/intel/ but
shouldn't have been as it triggers a build bug when not compiled by
the target compiler.  So remove it to match the original.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202304061846.G6cpPXiQ-lkp@intel.com/
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 drivers/crypto/intel/ixp4xx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/intel/ixp4xx/Kconfig b/drivers/crypto/intel/ixp4xx/Kconfig
index af3cc5688328..4cfb1e37f45b 100644
--- a/drivers/crypto/intel/ixp4xx/Kconfig
+++ b/drivers/crypto/intel/ixp4xx/Kconfig
@@ -1,6 +1,6 @@
 config CRYPTO_DEV_IXP4XX
 	tristate "Driver for IXP4xx crypto hardware acceleration"
-	depends on (ARCH_IXP4XX || COMPILE_TEST) && IXP4XX_QMGR && IXP4XX_NPE
+	depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
 	select CRYPTO_AES
 	select CRYPTO_DES
 	select CRYPTO_ECB
-- 
2.34.1

[PATCH] crypto: ixp4xx - Do not check word size when compile testing

[Herbert Xu]

On Fri, Apr 07, 2023 at 02:37:44PM -0500, Tom Zanussi wrote:
> COMPILE_TEST was added during the move to drivers/crypto/intel/ but
> shouldn't have been as it triggers a build bug when not compiled by
> the target compiler.  So remove it to match the original.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202304061846.G6cpPXiQ-lkp@intel.com/
> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
> ---
>  drivers/crypto/intel/ixp4xx/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

We could also fix it by making the BUILD_BUG_ON conditional:

---8<---
The BUILD_BUG_ON preventing compilation on foreign architectures
should be disabled when we're doing compile testing.

Fixes: 1bc7fdbf2677 ("crypto: ixp4xx - Move driver to...")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202304061846.G6cpPXiQ-lkp@intel.com/
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
index b63e2359a133..5d640f13ad1c 100644
--- a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
+++ b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
@@ -263,7 +263,8 @@ static int setup_crypt_desc(void)
 {
 	struct device *dev = &pdev->dev;
 
-	BUILD_BUG_ON(sizeof(struct crypt_ctl) != 64);
+	BUILD_BUG_ON(!IS_ENABLED(CONFIG_COMPILE_TEST) &&
+		     sizeof(struct crypt_ctl) != 64);
 	crypt_virt = dma_alloc_coherent(dev,
 					NPE_QLEN * sizeof(struct crypt_ctl),
 					&crypt_phys, GFP_ATOMIC);
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] crypto: ixp4xx - Do not check word size when compile testing

[Linus Walleij]

On Sun, Apr 9, 2023 at 9:47 AM Herbert Xu <herbert@gondor.apana.org.au> wrote:
> On Fri, Apr 07, 2023 at 02:37:44PM -0500, Tom Zanussi wrote:
> > COMPILE_TEST was added during the move to drivers/crypto/intel/ but
> > shouldn't have been as it triggers a build bug when not compiled by
> > the target compiler.  So remove it to match the original.
> >
> > Reported-by: kernel test robot <lkp@intel.com>
> > Link: https://lore.kernel.org/oe-kbuild-all/202304061846.G6cpPXiQ-lkp@intel.com/
> > Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
> > ---
> >  drivers/crypto/intel/ixp4xx/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> We could also fix it by making the BUILD_BUG_ON conditional:
>
> ---8<---
> The BUILD_BUG_ON preventing compilation on foreign architectures
> should be disabled when we're doing compile testing.
>
> Fixes: 1bc7fdbf2677 ("crypto: ixp4xx - Move driver to...")
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202304061846.G6cpPXiQ-lkp@intel.com/
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

This fix is more elegant I think, as it keeps the compile coverage.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij