scsi: ufs: ufshpb: Cache HPB Control mode on init

We will use control_mode later when we need to differentiate between device
and host control modes.

Link: https://lore.kernel.org/r/20210712095039.8093-2-avri.altman@wdc.com
Reviewed-by: Daejun Park <daejun7.park@samsung.com>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 8457050..b4322ce 100644 (file)
--- 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 9333b67..26353cc 100644 (file)
--- 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 1e8d6e1..dc168ba 100644 (file)
--- 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;