Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0d7dc0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "platform: msm: add Per-File-Tagger (PFT) driver"

parents 4b142d80 97da78b1

block/bio.c

+1 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) 
	bio->bi_rw = bio_src->bi_rw;

	bio->bi_iter = bio_src->bi_iter;

	bio->bi_io_vec = bio_src->bi_io_vec;

	bio->bi_dio_inode = bio_src->bi_dio_inode;

}

EXPORT_SYMBOL(__bio_clone_fast);

block/blk-merge.c

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/bio.h>

#include <linux/blkdev.h>

#include <linux/scatterlist.h>

#include <linux/security.h>



#include "blk.h"
@@ -672,6 +673,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
			return false;

	}



	/* Don't merge bios of files with different encryption */

	if (!security_allow_merge_bio(rq->bio, bio))

		return false;



	return true;

}

drivers/platform/msm/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -137,6 +137,16 @@ config MSM_MHI_UCI 
	  read, write and ioctl operations to communicate with the

	  attached device.



config PFT

	bool "Per-File-Tagger driver"

	default n

	help

		This driver is used for tagging enterprise files.

		It is part of the Per-File-Encryption (PFE) feature.

		The driver is tagging files when created by

		registered application.

		Tagged files are encrypted using the dm-req-crypt driver.



config I2C_MSM_PROF_DBG

	tristate "I2C_MSM_PROF_DBG"

	depends on ARCH_MSM && I2C_MSM_V2

drivers/platform/msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,10 +2,13 @@ 
# Makefile for the MSM specific device drivers.

#



ccflags-y += -Isecurity/selinux -Isecurity/selinux/include



obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/

obj-$(CONFIG_MSM_SPMI) += spmi/

obj-$(CONFIG_MSM_MHI) += mhi/

obj-$(CONFIG_MSM_MHI_UCI) += mhi_uci/

obj-$(CONFIG_PFT) += pft.o

obj-$(CONFIG_QPNP_POWER_ON) += qpnp-power-on.o

obj-$(CONFIG_QPNP_REVID) += qpnp-revid.o

obj-$(CONFIG_QPNP_COINCELL) += qpnp-coincell.o