Merge "project: msm8996: enable fbcon display when verified boot is enabled"
diff --git a/platform/msm_shared/rpmb/rpmb.c b/platform/msm_shared/rpmb/rpmb.c
index e3c7e9f..984f580 100644
--- a/platform/msm_shared/rpmb/rpmb.c
+++ b/platform/msm_shared/rpmb/rpmb.c
@@ -87,7 +87,12 @@
 	{
 		struct ufs_dev *ufs_dev = (struct ufs_dev *) dev;
 		ufs_rpmb_init(ufs_dev);
-		info.size = ufs_dev->rpmb_num_blocks;
+	/*
+	 * According to JEDE UFS spec, qLogicalBlockCount in RPMB Unit Descriptor
+	 * is a multiple of 256. But TZ expects the number of sectors reported
+	 * with sector size in 512 bytes hence report accordingly.
+	 */
+		info.size = ufs_dev->rpmb_num_blocks / 2;
 		info.rel_wr_count = ufs_dev->rpmb_rw_size;
 		info.dev_type  = UFS_RPMB;
 	}