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

Commit aab55f76 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add ICE node for SM8150"

parents 01e93610 7fe923ac

arch/arm64/boot/dts/qcom/sm8150.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -2129,10 +2129,34 @@ 
		reg = <0x17c0000c 0x4>;

	};



	ufs_ice: ufsice@1d90000 {

		compatible = "qcom,ice";

		reg = <0x1d90000 0x8000>;

		qcom,enable-ice-clk;

		clock-names = "ufs_core_clk", "bus_clk",

				"iface_clk", "ice_core_clk";

		clocks = <&clock_gcc GCC_UFS_PHY_AXI_CLK>,

			 <&clock_gcc GCC_UFS_MEM_CLKREF_CLK>,

			 <&clock_gcc GCC_UFS_PHY_AHB_CLK>,

			 <&clock_gcc GCC_UFS_PHY_ICE_CORE_CLK>;

		qcom,op-freq-hz = <0>, <0>, <0>, <300000000>;

		vdd-hba-supply = <&ufs_phy_gdsc>;

		qcom,msm-bus,name = "ufs_ice_noc";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<1 650 0 0>,    /* No vote */

				<1 650 1000 0>; /* Max. bandwidth */

		qcom,bus-vector-names = "MIN",

					"MAX";

		qcom,instance-type = "ufs";

	};



	ufsphy_mem: ufsphy_mem@1d87000 {

		reg = <0x1d87000 0xda8>; /* PHY regs */

		reg-names = "phy_mem";

		#phy-cells = <0>;

		ufs-qcom-crypto = <&ufs_ice>;



		lanes-per-direction = <2>;
@@ -2152,6 +2176,7 @@ 
		interrupts = <0 265 0>;

		phys = <&ufsphy_mem>;

		phy-names = "ufsphy";

		ufs-qcom-crypto = <&ufs_ice>;



		lanes-per-direction = <2>;

		dev-ref-clk-freq = <0>; /* 19.2 MHz */

arch/arm64/configs/sm8150-perf_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_UEVENT=y
@@ -579,6 +580,8 @@ CONFIG_MSM_TZ_LOG=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_FUSE_FS=y
@@ -611,6 +614,7 @@ CONFIG_CORESIGHT_REMOTE_ETM=y 
CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y
@@ -624,6 +628,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/sm8150_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_SCSI_UFSHCD=y

CONFIG_SCSI_UFSHCD_PLATFORM=y

CONFIG_SCSI_UFS_QCOM=y

CONFIG_SCSI_UFS_QCOM_ICE=y

CONFIG_SCSI_UFSHCD_CMD_LOGGING=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y
@@ -606,6 +607,8 @@ CONFIG_MSM_TZ_LOG=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_FUSE_FS=y
@@ -692,6 +695,7 @@ CONFIG_CORESIGHT_REMOTE_ETM=y 
CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y
@@ -706,6 +710,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=y 
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_DEV_QCOM_ICE=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) 
	bio->bi_write_hint = bio_src->bi_write_hint;

	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;

	bio_clone_blkcg_association(bio, bio_src);

}

EXPORT_SYMBOL(__bio_clone_fast);

block/blk-merge.c

+11 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/bio.h>

#include <linux/blkdev.h>

#include <linux/scatterlist.h>



#include <linux/pfk.h>

#include <trace/events/block.h>



#include "blk.h"
@@ -660,6 +660,11 @@ static void blk_account_io_merge(struct request *req) 
	}

}



static bool crypto_not_mergeable(const struct bio *bio, const struct bio *nxt)

{

	return (!pfk_allow_merge_bio(bio, nxt));

}



/*

 * For non-mq, this has to be called with the request spinlock acquired.

 * For mq with scheduling, the appropriate queue wide lock should be held.
@@ -698,6 +703,8 @@ static struct request *attempt_merge(struct request_queue *q, 
	if (req->write_hint != next->write_hint)

		return NULL;



	if (crypto_not_mergeable(req->bio, next->bio))

		return 0;

	/*

	 * If we are allowed to merge, then append bio list

	 * from next to rq and release next. merge_requests_fn
@@ -829,6 +836,9 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio) 
	if (rq->write_hint != bio->bi_write_hint)

		return false;



	if (crypto_not_mergeable(rq->bio, bio))

		return false;



	return true;

}