[PATCH v3 6/9] scsi: ufshpb: Add hpb dev reset response

[Avri Altman]

The spec does not define what is the host's recommended response when
the device send hpb dev reset response (oper 0x2).

We will update all active hpb regions: mark them and do that on the next
read.

Signed-off-by: Avri Altman <avri.alt...@wdc.com>
---
 drivers/scsi/ufs/ufshpb.c | 40 ++++++++++++++++++++++++++++++++++++---
 drivers/scsi/ufs/ufshpb.h |  3 +++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index 3435a5507853..15755f677097 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -658,7 +658,8 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb 
*lrbp)
                if (rgn->reads == ACTIVATION_THRESHOLD)
                        activate = true;
                spin_unlock_irqrestore(&rgn->rgn_lock, flags);
-               if (activate) {
+               if (activate ||
+                   test_and_clear_bit(RGN_FLAG_UPDATE, &rgn->rgn_flags)) {
                        spin_lock_irqsave(&hpb->rsp_list_lock, flags);
                        ufshpb_update_active_info(hpb, rgn_idx, srgn_idx);
                        hpb->stats.rb_active_cnt++;
@@ -1446,6 +1447,11 @@ void ufshpb_rsp_upiu(struct ufs_hba *hba, struct 
ufshcd_lrb *lrbp)
        case HPB_RSP_DEV_RESET:
                dev_warn(&hpb->sdev_ufs_lu->sdev_dev,
                         "UFS device lost HPB information during PM.\n");
+
+               if (hpb->is_hcm &&
+                   !test_and_set_bit(RESET_PENDING, &hpb->work_data_bits))
+                       schedule_work(&hpb->ufshpb_lun_reset_work);
+
                break;
        default:
                dev_notice(&hpb->sdev_ufs_lu->sdev_dev,
@@ -1560,6 +1566,27 @@ static void ufshpb_run_inactive_region_list(struct 
ufshpb_lu *hpb)
        spin_unlock_irqrestore(&hpb->rsp_list_lock, flags);
 }
 
+static void ufshpb_reset_work_handler(struct work_struct *work)
+{
+       struct ufshpb_lu *hpb;
+       struct victim_select_info *lru_info;
+       struct ufshpb_region *rgn;
+       unsigned long flags;
+
+       hpb = container_of(work, struct ufshpb_lu, ufshpb_lun_reset_work);
+
+       lru_info = &hpb->lru_info;
+
+       spin_lock_irqsave(&hpb->rgn_state_lock, flags);
+
+       list_for_each_entry(rgn, &lru_info->lh_lru_rgn, list_lru_rgn)
+               set_bit(RGN_FLAG_UPDATE, &rgn->rgn_flags);
+
+       spin_unlock_irqrestore(&hpb->rgn_state_lock, flags);
+
+       clear_bit(RESET_PENDING, &hpb->work_data_bits);
+}
+
 static void ufshpb_normalization_work_handler(struct work_struct *work)
 {
        struct ufshpb_lu *hpb;
@@ -1770,6 +1797,8 @@ static int ufshpb_alloc_region_tbl(struct ufs_hba *hba, 
struct ufshpb_lu *hpb)
                } else {
                        rgn->rgn_state = HPB_RGN_INACTIVE;
                }
+
+               rgn->rgn_flags = 0;
        }
 
        return 0;
@@ -1983,9 +2012,12 @@ static int ufshpb_lu_hpb_init(struct ufs_hba *hba, 
struct ufshpb_lu *hpb)
        INIT_LIST_HEAD(&hpb->list_hpb_lu);
 
        INIT_WORK(&hpb->map_work, ufshpb_map_work_handler);
-       if (hpb->is_hcm)
+       if (hpb->is_hcm) {
                INIT_WORK(&hpb->ufshpb_normalization_work,
                          ufshpb_normalization_work_handler);
+               INIT_WORK(&hpb->ufshpb_lun_reset_work,
+                         ufshpb_reset_work_handler);
+       }
 
        hpb->map_req_cache = kmem_cache_create("ufshpb_req_cache",
                          sizeof(struct ufshpb_req), 0, 0, NULL);
@@ -2085,8 +2117,10 @@ static void ufshpb_discard_rsp_lists(struct ufshpb_lu 
*hpb)
 
 static void ufshpb_cancel_jobs(struct ufshpb_lu *hpb)
 {
-       if (hpb->is_hcm)
+       if (hpb->is_hcm) {
+               cancel_work_sync(&hpb->ufshpb_lun_reset_work);
                cancel_work_sync(&hpb->ufshpb_normalization_work);
+       }
        cancel_work_sync(&hpb->map_work);
 }
 
diff --git a/drivers/scsi/ufs/ufshpb.h b/drivers/scsi/ufs/ufshpb.h
index 13ec49ba260d..a3b85d2df224 100644
--- a/drivers/scsi/ufs/ufshpb.h
+++ b/drivers/scsi/ufs/ufshpb.h
@@ -119,6 +119,7 @@ struct ufshpb_region {
        struct list_head list_lru_rgn;
        unsigned long rgn_flags;
 #define RGN_FLAG_DIRTY 0
+#define RGN_FLAG_UPDATE 1
 
        /* region reads - for host mode */
        spinlock_t rgn_lock;
@@ -215,8 +216,10 @@ struct ufshpb_lu {
        /* for selecting victim */
        struct victim_select_info lru_info;
        struct work_struct ufshpb_normalization_work;
+       struct work_struct ufshpb_lun_reset_work;
        unsigned long work_data_bits;
 #define WORK_PENDING 0
+#define RESET_PENDING 1
 
        /* pinned region information */
        u32 lu_pinned_start;
-- 
2.25.1