These changes integrate new file encryption framework to use new V2 encryption policies. These changes were earlier reverted in 'commit4211691d29("Reverting crypto and incrementalfs changes")', as part of android-4.14.171 merge from Android common kernel. This patch attempts to bring them back post validation. commita9a5450ANDROID: dm: prevent default-key from being enabled without needed hooks commite1a94e6ANDROID: dm: add dm-default-key target for metadata encryption commit commit232fd35ANDROID: dm: enable may_passthrough_inline_crypto on some targets commit53bc059ANDROID: dm: add support for passing through inline crypto support commitaeed6dbANDROID: block: Introduce passthrough keyslot manager commit4f27c8bANDROID: ext4, f2fs: enable direct I/O with inline encryption commitc91db46BACKPORT: FROMLIST: scsi: ufs: add program_key() variant op commitf9a8e4aANDROID: block: export symbols needed for modules to use inline crypto commit75fea5fANDROID: block: fix some inline crypto bugs commit2871f73ANDROID: fscrypt: add support for hardware-wrapped keys commitbb5a657ANDROID: block: add KSM op to derive software secret from wrapped key commitd42ba87ANDROID: block: provide key size as input to inline crypto APIs commit86646ebANDROID: ufshcd-crypto: export cap find API commit83bc20eANDROID: scsi: ufs-qcom: Enable BROKEN_CRYPTO quirk flag commitc266a13ANDROID: scsi: ufs: Add quirk bit for controllers that don't play well with inline crypto commitea09b99ANDROID: cuttlefish_defconfig: Enable blk-crypto fallback commite12563cBACKPORT: FROMLIST: Update Inline Encryption from v5 to v6 of patch series commit8e8f55dANDROID: scsi: ufs: UFS init should not require inline crypto commitdae9899ANDROID: scsi: ufs: UFS crypto variant operations API commita69516dANDROID: cuttlefish_defconfig: enable inline encryption commitb8f7b23BACKPORT: FROMLIST: ext4: add inline encryption support commite64327fBACKPORT: FROMLIST: f2fs: add inline encryption support commita0dc8daBACKPORT: FROMLIST: fscrypt: add inline encryption support commit19c3c62BACKPORT: FROMLIST: scsi: ufs: Add inline encryption support to UFS commitf858a99BACKPORT: FROMLIST: scsi: ufs: UFS crypto API commit011b834BACKPORT: FROMLIST: scsi: ufs: UFS driver v2.1 spec crypto additions commitec0b569BACKPORT: FROMLIST: block: blk-crypto for Inline Encryption commit760b328ANDROID: block: Fix bio_crypt_should_process WARN_ON commit138adbbBACKPORT: FROMLIST: block: Add encryption context to struct bio commit66b5609BACKPORT: FROMLIST: block: Keyslot Manager for Inline Encryption Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android-4.14-stable Git-commit:a9a545067aGit-commit:e1a94e6b17Git-commit:232fd353e4Git-commit:53bc059bc6Git-commit:aeed6db424Git-commit:4f27c8b90bGit-commit:c91db466b5Git-commit:f9a8e4a5c5Git-commit:75fea5f605Git-commit:2871f73194Git-commit:bb5a65771aGit-commit:d42ba87e29Git-commit:86646ebb17Git-commit:83bc20ed4bGit-commit:c266a1311eGit-commit:ea09b9954cGit-commit:e12563c18dGit-commit:8e8f55d1a7Git-commit:dae9899044Git-commit:a69516d091Git-commit:b8f7b23674Git-commit:e64327f571Git-commit:a0dc8da519Git-commit:19c3c62836Git-commit:f858a9981aGit-commit:011b8344c3Git-commit:ec0b569b5cGit-commit:760b3283e8Git-commit:138adbbe5eGit-commit:66b5609826Change-Id: I171d90de41185824e0c7515f3a3b43ab88f4e058 Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
38 lines
1.5 KiB
Makefile
38 lines
1.5 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for the kernel block layer
|
|
#
|
|
|
|
obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
|
|
blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
|
|
blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
|
|
blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
|
|
blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \
|
|
genhd.o partition-generic.o ioprio.o \
|
|
badblocks.o partitions/
|
|
|
|
obj-$(CONFIG_BOUNCE) += bounce.o
|
|
obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o
|
|
obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
|
|
obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o
|
|
obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o
|
|
obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
|
|
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
|
|
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
|
|
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
|
|
obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o
|
|
obj-$(CONFIG_MQ_IOSCHED_KYBER) += kyber-iosched.o
|
|
bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
|
|
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o
|
|
|
|
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
|
|
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
|
|
obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
|
|
obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o
|
|
obj-$(CONFIG_BLK_MQ_VIRTIO) += blk-mq-virtio.o
|
|
obj-$(CONFIG_BLK_MQ_RDMA) += blk-mq-rdma.o
|
|
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
|
|
obj-$(CONFIG_BLK_WBT) += blk-wbt.o
|
|
obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
|
|
obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
|