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

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

Merge "scsi: ufs: fixed DUN size for ICE encryption to be 4k"

parents 243d79cf 24c9ad1c

drivers/scsi/ufs/ufs-qcom-ice.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -339,7 +339,8 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 




	req = cmd->request;

	req = cmd->request;

	if (req->bio)

	if (req->bio)

		lba = req->bio->bi_iter.bi_sector;

		lba = (req->bio->bi_iter.bi_sector) >>

			UFS_QCOM_ICE_TR_DATA_UNIT_4_KB;





	slot = req->tag;

	slot = req->tag;

	if (slot < 0 || slot > qcom_host->hba->nutrs) {

	if (slot < 0 || slot > qcom_host->hba->nutrs) {
@@ -390,6 +391,7 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 
		bypass = ice_set.decr_bypass ? UFS_QCOM_ICE_ENABLE_BYPASS :

		bypass = ice_set.decr_bypass ? UFS_QCOM_ICE_ENABLE_BYPASS :

						UFS_QCOM_ICE_DISABLE_BYPASS;

						UFS_QCOM_ICE_DISABLE_BYPASS;







	/* Configure ICE index */

	/* Configure ICE index */

	ctrl_info_val =

	ctrl_info_val =

		(ice_set.crypto_data.key_index &

		(ice_set.crypto_data.key_index &
@@ -398,8 +400,7 @@ int ufs_qcom_ice_cfg_start(struct ufs_qcom_host *qcom_host, 




	/* Configure data unit size of transfer request */

	/* Configure data unit size of transfer request */

	ctrl_info_val |=

	ctrl_info_val |=

		(UFS_QCOM_ICE_TR_DATA_UNIT_4_KB &

		UFS_QCOM_ICE_TR_DATA_UNIT_4_KB

		 MASK_UFS_QCOM_ICE_CTRL_INFO_CDU)

		 << OFFSET_UFS_QCOM_ICE_CTRL_INFO_CDU;

		 << OFFSET_UFS_QCOM_ICE_CTRL_INFO_CDU;





	/* Configure ICE bypass mode */

	/* Configure ICE bypass mode */

drivers/scsi/ufs/ufs-qcom.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -822,7 +822,8 @@ static int ufs_qcom_crypto_req_setup(struct ufs_hba *hba, 




	/* Use request LBA as the DUN value */

	/* Use request LBA as the DUN value */

	if (req->bio)

	if (req->bio)

		*dun = req->bio->bi_iter.bi_sector;

		*dun = (req->bio->bi_iter.bi_sector) >>

				UFS_QCOM_ICE_TR_DATA_UNIT_4_KB;





	ret = ufs_qcom_ice_req_setup(host, lrbp->cmd, cc_index, enable);

	ret = ufs_qcom_ice_req_setup(host, lrbp->cmd, cc_index, enable);

drivers/scsi/ufs/ufshcd.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -2468,9 +2468,6 @@ static int ufshcd_prepare_crypto_utrd(struct ufs_hba *hba, 
		goto out;

		goto out;





	req_desc->header.dword_0 |= cc_index | UTRD_CRYPTO_ENABLE;

	req_desc->header.dword_0 |= cc_index | UTRD_CRYPTO_ENABLE;

	if (lrbp->cmd->request && lrbp->cmd->request->bio)

		dun = lrbp->cmd->request->bio->bi_iter.bi_sector;



	req_desc->header.dword_1 = (u32)(dun & 0xFFFFFFFF);

	req_desc->header.dword_1 = (u32)(dun & 0xFFFFFFFF);

	req_desc->header.dword_3 = (u32)((dun >> 32) & 0xFFFFFFFF);

	req_desc->header.dword_3 = (u32)((dun >> 32) & 0xFFFFFFFF);

out:

out: