Merge tag 'sched-core-2020-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 3bc76bb..9382a4a 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -146,6 +146,7 @@ config BLK_CGROUP_IOLATENCY
 config BLK_CGROUP_IOCOST
        bool "Enable support for cost model based cgroup IO controller"
        depends on BLK_CGROUP=y
+       select BLK_RQ_IO_DATA_LEN
        select BLK_RQ_ALLOC_TIME
        ---help---
        Enabling this option enables the .weight interface for cost
@@ -185,6 +186,23 @@ config BLK_SED_OPAL
        Enabling this option enables users to setup/unlock/lock
        Locking ranges for SED devices using the Opal protocol.
 
+config BLK_INLINE_ENCRYPTION
+       bool "Enable inline encryption support in block layer"
+       help
+         Build the blk-crypto subsystem. Enabling this lets the
+         block layer handle encryption, so users can take
+         advantage of inline encryption hardware if present.
+
+config BLK_INLINE_ENCRYPTION_FALLBACK
+       bool "Enable crypto API fallback for blk-crypto"
+       depends on BLK_INLINE_ENCRYPTION
+       select CRYPTO
+       select CRYPTO_SKCIPHER
+       help
+         Enabling this lets the block layer handle inline encryption
+         by falling back to the kernel crypto API when inline
+         encryption hardware is not present.
+
 menu "Partition Types"
 
 source "block/partitions/Kconfig"