Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: zV3ddZr7x68K0hFd8Sl/U2OTR7WPjeRYRjDw784pjXNKw1fxq2BPAqeKoxqTaPLIMEW2P8pJMM
 JCAtCfM0kwOWnfKrubv8GKAXzXnwPzI5qki6J70kgf75m0Ekcq+qge7CDFZK+nuLvu170ItGTP
 kldMLcI8K6H5lq9yFJ/duH2s7kmrRl1p9TJpsWjF5U0G68WeA4LgOuZZLeCGrX6wO62HzuBzLD
 pDgFM3e2JSDhd4yMSYE5BlC/cQ+HnfTdGp4nILpkSwyvTOyhgKm7KTBrJLv34EJ5Y/A95yixqD
 FM0=
IronPort-SDR: +CKcCqKCHC1juuCDBouj+Pexe9gfqPNtuOm1WFqcoXo+l/ccRN3Z95uh5TkhjeWEzWbey7mj9W
 TLIAzdtNLNM6xolOga55JWYrRxmd4dtjYu7aWQVTkVisn26LKn+LkWtpmiUfWDecn1gMtOlMrM
 EBJ/lbQx2t84tkfBvEA65z0usO9M2OpOhWB88DuvqwizICBMU3sjhYugw9xumt0I/NldS0UfAB
 fU66rF6TqKcpQkgoYrKsCW4rBXV9jnJcTueQJcItUhvn0hsMsRjqZL98i8OljG4yAmRo4G2xm2
 LZ6V0+zmeyiXU5klzdJsGBSJ
IronPort-SDR: Hvt3VZoO4YZpiRP0KwufuGdATWZrcjByULYpOKyf6kwFFwbN7cIdEldmCzOCTjbqR0TOK32Pcw
 s9qIlvLhTpCs6KeOvhe96QEyeYQqYxy+PNE6rqLVxsY3R+6oRlVgkojTQ2iHSk0TDTsq25EyPU
 5yWZLg+ctwe69a6KRV1qcD07C1vw+QUOP79G9r4tz6JOyx2oWVFQ9feEjjBp2MhZ2r4WYMSCRW
 kOgpa22pBVvWTQw8o/kYjfPGdx8HBY9RymiP+WuZRe06/iMCBNIeByoN2IpgXWXZ/C5bUTD6mK
 JW8=
WDCIronportException: Internal
From:   Avri Altman <avri.altman@wdc.com>
To:     "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     gregkh@linuxfoundation.org, Bart Van Assche <bvanassche@acm.org>,
        yongmyung lee <ymhungry.lee@samsung.com>,
        Daejun Park <daejun7.park@samsung.com>,
        alim.akhtar@samsung.com, asutoshd@codeaurora.org,
        Zang Leigang <zangleigang@hisilicon.com>,
        Avi Shchislowski <avi.shchislowski@wdc.com>,
        Bean Huo <beanhuo@micron.com>, cang@codeaurora.org,
        stanley.chu@mediatek.com, Avri Altman <avri.altman@wdc.com>
Subject: [PATCH v12 01/12] scsi: ufshpb: Cache HPB Control mode on init
Date:   Mon, 12 Jul 2021 12:50:28 +0300
Message-Id: <20210712095039.8093-2-avri.altman@wdc.com>
In-Reply-To: <20210712095039.8093-1-avri.altman@wdc.com>
References: <20210712095039.8093-1-avri.altman@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

We will use it later, when we'll need to differentiate between device
and host control modes.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Daejun Park <daejun7.park@samsung.com>
---
 drivers/scsi/ufs/ufshcd.h | 2 ++
 drivers/scsi/ufs/ufshpb.c | 8 +++++---
 drivers/scsi/ufs/ufshpb.h | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 90aad8393572..0b4496c1af64 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -652,6 +652,7 @@ struct ufs_hba_variant_params {
  * @hpb_disabled: flag to check if HPB is disabled
  * @max_hpb_single_cmd: device reported bMAX_DATA_SIZE_FOR_SINGLE_CMD value
  * @is_legacy: flag to check HPB 1.0
+ * @control_mode: either host or device
  */
 struct ufshpb_dev_info {
 	int num_lu;
@@ -661,6 +662,7 @@ struct ufshpb_dev_info {
 	bool hpb_disabled;
 	u8 max_hpb_single_cmd;
 	bool is_legacy;
+	u8 control_mode;
 };
 #endif
 
diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index f417fb89174f..c6fa9cee683a 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -1608,6 +1608,9 @@ static void ufshpb_lu_parameter_init(struct ufs_hba *hba,
 				 % (hpb->srgn_mem_size / HPB_ENTRY_SIZE);
 
 	hpb->pages_per_srgn = DIV_ROUND_UP(hpb->srgn_mem_size, PAGE_SIZE);
+
+	if (hpb_dev_info->control_mode == HPB_HOST_CONTROL)
+		hpb->is_hcm = true;
 }
 
 static int ufshpb_alloc_region_tbl(struct ufs_hba *hba, struct ufshpb_lu *hpb)
@@ -2301,11 +2304,10 @@ void ufshpb_get_dev_info(struct ufs_hba *hba, u8 *desc_buf)
 {
 	struct ufshpb_dev_info *hpb_dev_info = &hba->ufshpb_dev;
 	int version, ret;
-	u8 hpb_mode;
 	u32 max_hpb_single_cmd = HPB_MULTI_CHUNK_LOW;
 
-	hpb_mode = desc_buf[DEVICE_DESC_PARAM_HPB_CONTROL];
-	if (hpb_mode == HPB_HOST_CONTROL) {
+	hpb_dev_info->control_mode = desc_buf[DEVICE_DESC_PARAM_HPB_CONTROL];
+	if (hpb_dev_info->control_mode == HPB_HOST_CONTROL) {
 		dev_err(hba->dev, "%s: host control mode is not supported.\n",
 			__func__);
 		hpb_dev_info->hpb_disabled = true;
diff --git a/drivers/scsi/ufs/ufshpb.h b/drivers/scsi/ufs/ufshpb.h
index 1e8d6e1d909e..dc168ba08a09 100644
--- a/drivers/scsi/ufs/ufshpb.h
+++ b/drivers/scsi/ufs/ufshpb.h
@@ -228,6 +228,8 @@ struct ufshpb_lu {
 	u32 entries_per_srgn_shift;
 	u32 pages_per_srgn;
 
+	bool is_hcm;
+
 	struct ufshpb_stats stats;
 	struct ufshpb_params params;
 
-- 
2.25.1