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: /xgVILq5vLN2WlCCY+NYy0cI1dsJ8foniQer4mDrOnynKjBDhn2Tjmrv+jv0mr+ubBOHUa4xFo
 4IjWFJ9zdAiAi8LO59PT2Uf7JQWSdk+nuBiPUrKqTuRPZOWgjJyu/ZCKmJXJlCpaUT9ItMpjlQ
 smkjm4R14vIohajtQT6FBr9CNmDhl8qTKpIrrhYBIttcoHzm11EIfCK6SXRpsJanv+ttFwNhN5
 0nKJUFVI4kUHffPmXueC7SMV3Hh8iuhiK6HVlhMnHoxWJlkfjVmjQA3rKlSVYHBYh3c7COmlPL
 xk0=
IronPort-SDR: 52PAIyz0AtIuVd84ny3LYsRuroo5xSCXt3hdwtDDzSbrjk7LyDstYzxQ94Rz3TFePiMei/Kl4g
 Zk3mDFPN3R3k8H2gPxiYWsqbwm2r1ZDc0yx7V88SXtI8gnqw5lhJaDM7CjTlmSlvrbL1JIFm3v
 s8Lfu52zGr9a0vD18OjgJiD6hfDex75ykjD9rMfRvSm/AhhYx11Vr+hkslJdkKGUXw/ES1HE0Y
 UtjkqZ/UlDO7odQfQLqUkGCPDukFOVjVpsUgmHSnpHqkUO6oa6OR7zYwoa505dfcMWpoJUHV25
 sR5hRb/b26scu/HqJ1sC1sVs
IronPort-SDR: aMA30q+zpn9MybJj3SdjBgJPrbvF8vw+MCeqrOuAQohi4OoK7LzoFkTAXJUy97kwc98PBYm7zR
 ov5m6HQeNCd8EDTnpfSD2w8N/+RCHdn2MfXda6NwMXuSgsTDS7yJKpll9prgX/wGNKk+GgAYO2
 XN+Jodn+OOxewrNnSckVI31Qaxk0vWbmQ7KVdg11Kqi/IBawCFCxg7CIiXyTkCUIjmZ+DDhE0/
 8dhCMd967S3x+D5jwJBXXG9tONiwPruoeyWy/5g+XKMvowCi5HyoxBGVUxKyxnlwRmKohepo97
 3GQ=
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 v4 1/9] scsi: ufshpb: Cache HPB Control mode on init
Date:   Fri, 26 Feb 2021 10:32:52 +0200
Message-Id: <20210226083300.30934-2-avri.altman@wdc.com>
In-Reply-To: <20210226083300.30934-1-avri.altman@wdc.com>
References: <20210226083300.30934-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>
---
 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 3ea7e88f5bff..2d589ee18875 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -656,6 +656,7 @@ struct ufs_hba_variant_params {
  * @hpb_disabled: flag to check if HPB is disabled
  * @max_hpb_single_cmd: maximum size of single HPB command
  * @is_legacy: flag to check HPB 1.0
+ * @control_mode: either host or device
  */
 struct ufshpb_dev_info {
 	int num_lu;
@@ -665,6 +666,7 @@ struct ufshpb_dev_info {
 	bool hpb_disabled;
 	int 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 f89714a9785c..d9ea0cddc3c4 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -1624,6 +1624,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)
@@ -2308,11 +2311,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_sigle_cmd = 0;
 
-	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 88f424250dd9..14b7ba9bda3a 100644
--- a/drivers/scsi/ufs/ufshpb.h
+++ b/drivers/scsi/ufs/ufshpb.h
@@ -227,6 +227,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