projects/linux·commit fd3958ea

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

fd3958ea · Linus Torvalds <[email protected]> · 2021-01-18 11:07:18 -08:00

Pull crypto fixes from Herbert Xu:
 "A Kconfig dependency issue with omap-sham and a divide by zero in xor
  on some platforms"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: omap-sham - Fix link error without crypto-engine
  crypto: xor - Fix divide error in do_xor_speed()
Commit
fd3958eac387593d02e4d4287658ba04bcdb235a
Parents
19c329f6 · 38281194

Merge commit. Changes below are compared with the first parent: 19c329f6.

Changes

2 files changed · +3 −0

FileStatusAddDelContent
crypto/xor.cmodified+2−0View file
drivers/crypto/Kconfigmodified+1−0View file

crypto/xor.c

View file
diff --git a/crypto/xor.c b/crypto/xor.c
index eacbf4f..8f899f8 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -107,6 +107,8 @@ do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
preempt_enable();
// bytes/ns == GB/s, multiply by 1000 to get MB/s [not MiB/s]
+ if (!min)
+ min = 1;
speed = (1000 * REPS * BENCH_SIZE) / (unsigned int)ktime_to_ns(min);
tmpl->speed = speed;

drivers/crypto/Kconfig

View file
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index bbd5170..e535f28 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -366,6 +366,7 @@ if CRYPTO_DEV_OMAP
config CRYPTO_DEV_OMAP_SHAM
tristate "Support for OMAP MD5/SHA1/SHA2 hw accelerator"
depends on ARCH_OMAP2PLUS
+ select CRYPTO_ENGINE
select CRYPTO_SHA1
select CRYPTO_MD5
select CRYPTO_SHA256