> +static int ufshpb_issue_umap_all_req(struct ufshpb_lu *hpb) Maybe ufshpb_issue_umap_all_req is just a wrapper for ufshpb_issue_umap_req? e.g it calls ufshpb_issue_umap_req(hpb, int read_buferr_id = 0x3) ? Then on host mode inactivation: static int ufshpb_issue_umap_single_req(struct ufshpb_lu *hpb) { return ufshpb_issue_umap_req(hpb, 0x1); } > @@ -1691,6 +2180,7 @@ static void ufshpb_hpb_lu_prepared(struct ufs_hba > *hba) > ufshpb_set_state(hpb, HPB_PRESENT); > if ((hpb->lu_pinned_end - hpb->lu_pinned_start) > 0) > queue_work(ufshpb_wq, &hpb->map_work); > + ufshpb_issue_umap_all_req(hpb); If (!is_legacy)