* [PATCH] powerpc/crypto: fix pseries_defconfig break
@ 2012-07-31 23:34 Seth Jennings
2012-07-31 23:45 ` Stephen Rothwell
2012-07-31 23:46 ` Michael Neuling
0 siblings, 2 replies; 3+ messages in thread
From: Seth Jennings @ 2012-07-31 23:34 UTC (permalink / raw)
To: Herbert Xu
Cc: Seth Jennings, Michael Neuling, Stephen Rothwell, linux-next,
LKML, Kent Yoder, Benjamin Herrenschmidt, anton
As part of the Kconfig rework for drivers/crypto/nx, the meaning of
CONFIG_CRYPTO_DEV_NX was changed. At the same time this commit was
heading upstream
fd297b3a7302ab866306f53c1fd1e97b083fe83e
powerpc: Enable pseries hardware RNG and crypto module
still used the old meaning, set CONFIG_CRYPTO_DEV_NX=m when it
is now a bool in the Kconfig. This patch repairs the break.
Reported-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
---
This patch is based on Linus master which already contains
the commit above. Please apply this patch before my patchset
(powerpc/crypto: IBM Power7+ in-Nest compression support) to
avoid the pseries_defconfig break.
arch/powerpc/configs/pseries_defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1f65b3c..9f4a936 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_LZO=m
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_NX=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
CONFIG_VIRTUALIZATION=y
CONFIG_KVM_BOOK3S_64=m
CONFIG_KVM_BOOK3S_64_HV=y
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/crypto: fix pseries_defconfig break
2012-07-31 23:34 [PATCH] powerpc/crypto: fix pseries_defconfig break Seth Jennings
@ 2012-07-31 23:45 ` Stephen Rothwell
2012-07-31 23:46 ` Michael Neuling
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-07-31 23:45 UTC (permalink / raw)
To: Seth Jennings
Cc: Herbert Xu, Michael Neuling, linux-next, LKML, Kent Yoder,
Benjamin Herrenschmidt, anton
[-- Attachment #1: Type: text/plain, Size: 768 bytes --]
Hi Seth,
On Tue, 31 Jul 2012 18:34:51 -0500 Seth Jennings <sjenning@linux.vnet.ibm.com> wrote:
>
> diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
> index 1f65b3c..9f4a936 100644
> --- a/arch/powerpc/configs/pseries_defconfig
> +++ b/arch/powerpc/configs/pseries_defconfig
> @@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m
> CONFIG_CRYPTO_LZO=m
> # CONFIG_CRYPTO_ANSI_CPRNG is not set
> CONFIG_CRYPTO_HW=y
> -CONFIG_CRYPTO_DEV_NX=m
> +CONFIG_CRYPTO_DEV_NX=y
> +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
> CONFIG_VIRTUALIZATION=y
> CONFIG_KVM_BOOK3S_64=m
> CONFIG_KVM_BOOK3S_64_HV=y
The same change is needed to ppc64_defconfig, please.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/crypto: fix pseries_defconfig break
2012-07-31 23:34 [PATCH] powerpc/crypto: fix pseries_defconfig break Seth Jennings
2012-07-31 23:45 ` Stephen Rothwell
@ 2012-07-31 23:46 ` Michael Neuling
1 sibling, 0 replies; 3+ messages in thread
From: Michael Neuling @ 2012-07-31 23:46 UTC (permalink / raw)
To: Seth Jennings
Cc: Herbert Xu, Stephen Rothwell, linux-next, LKML, Kent Yoder,
Benjamin Herrenschmidt, anton
Seth Jennings <sjenning@linux.vnet.ibm.com> wrote:
> As part of the Kconfig rework for drivers/crypto/nx, the meaning of
> CONFIG_CRYPTO_DEV_NX was changed. At the same time this commit was
> heading upstream
>
> fd297b3a7302ab866306f53c1fd1e97b083fe83e
> powerpc: Enable pseries hardware RNG and crypto module
>
> still used the old meaning, set CONFIG_CRYPTO_DEV_NX=m when it
> is now a bool in the Kconfig. This patch repairs the break.
>
> Reported-by: Michael Neuling <mikey@neuling.org>
> Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
> ---
> This patch is based on Linus master which already contains
> the commit above. Please apply this patch before my patchset
> (powerpc/crypto: IBM Power7+ in-Nest compression support) to
> avoid the pseries_defconfig break.
>
> arch/powerpc/configs/pseries_defconfig | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
ppc64_defconfig needs fixing too.
grep CONFIG_CRYPTO_DEV_NX=m arch/powerpc/configs/*
arch/powerpc/configs/ppc64_defconfig:CONFIG_CRYPTO_DEV_NX=m
arch/powerpc/configs/pseries_defconfig:CONFIG_CRYPTO_DEV_NX=m
Mikey
>
> diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
> index 1f65b3c..9f4a936 100644
> --- a/arch/powerpc/configs/pseries_defconfig
> +++ b/arch/powerpc/configs/pseries_defconfig
> @@ -369,7 +369,8 @@ CONFIG_CRYPTO_TWOFISH=m
> CONFIG_CRYPTO_LZO=m
> # CONFIG_CRYPTO_ANSI_CPRNG is not set
> CONFIG_CRYPTO_HW=y
> -CONFIG_CRYPTO_DEV_NX=m
> +CONFIG_CRYPTO_DEV_NX=y
> +CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
> CONFIG_VIRTUALIZATION=y
> CONFIG_KVM_BOOK3S_64=m
> CONFIG_KVM_BOOK3S_64_HV=y
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-31 23:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 23:34 [PATCH] powerpc/crypto: fix pseries_defconfig break Seth Jennings
2012-07-31 23:45 ` Stephen Rothwell
2012-07-31 23:46 ` Michael Neuling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).