Skip to content

Commit

Permalink
[CRYPTO] padlock: Remove pointless padlock module
Browse files Browse the repository at this point in the history
When this is compiled in it is run too early to do anything useful:
[    6.052000] padlock: No VIA PadLock drivers have been loaded.
[    6.052000] padlock: Using VIA PadLock ACE for AES algorithm.
[    6.052000] padlock: Using VIA PadLock ACE for SHA1/SHA256 algorithms.

When it's a module it isn't doing anything special, the same functionality 
can be provided in userspace by "probeall padlock padlock-aes padlock-sha" 
in modules.conf if it is required.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Cc: Michal Ludvig <michal@logix.cz>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Simon Arlott authored and Herbert Xu committed May 2, 2007
1 parent e196d62 commit f6259de
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 72 deletions.
16 changes: 3 additions & 13 deletions drivers/crypto/Kconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
menu "Hardware crypto devices"

config CRYPTO_DEV_PADLOCK
tristate "Support for VIA PadLock ACE"
bool "Support for VIA PadLock ACE"
depends on X86_32
select CRYPTO_ALGAPI
default m
default y
help
Some VIA processors come with an integrated crypto engine
(so called VIA PadLock ACE, Advanced Cryptography Engine)
Expand All @@ -14,16 +14,6 @@ config CRYPTO_DEV_PADLOCK
The instructions are used only when the CPU supports them.
Otherwise software encryption is used.

Selecting M for this option will compile a helper module
padlock.ko that should autoload all below configured
algorithms. Don't worry if your hardware does not support
some or all of them. In such case padlock.ko will
simply write a single line into the kernel log informing
about its failure but everything will keep working fine.

If you are unsure, say M. The compiled module will be
called padlock.ko

config CRYPTO_DEV_PADLOCK_AES
tristate "PadLock driver for AES algorithm"
depends on CRYPTO_DEV_PADLOCK
Expand Down Expand Up @@ -55,7 +45,7 @@ source "arch/s390/crypto/Kconfig"

config CRYPTO_DEV_GEODE
tristate "Support for the Geode LX AES engine"
depends on CRYPTO && X86_32 && PCI
depends on X86_32 && PCI
select CRYPTO_ALGAPI
select CRYPTO_BLKCIPHER
default m
Expand Down
1 change: 0 additions & 1 deletion drivers/crypto/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
58 changes: 0 additions & 58 deletions drivers/crypto/padlock.c

This file was deleted.

0 comments on commit f6259de

Please sign in to comment.