Drop scsi-ufs-clear-uac-for-rpmb-after-ufshcd-resets.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/scsi-ufs-clear-uac-for-rpmb-after-ufshcd-resets.patch b/queue-5.10/scsi-ufs-clear-uac-for-rpmb-after-ufshcd-resets.patch
deleted file mode 100644 (file)
index 702e26d..0000000
--- a/queue-5.10/scsi-ufs-clear-uac-for-rpmb-after-ufshcd-resets.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 878a87fe90377b2bc94f8f07c353061fcea6a6bb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 30 Nov 2020 20:14:02 -0800
-Subject: scsi: ufs: Clear UAC for RPMB after ufshcd resets
-
-From: Randall Huang <huangrandall@google.com>
-
-[ Upstream commit 1918651f2d7e8d58c9b7c49755c61e41ed655009 ]
-
-If RPMB is not provisioned, we may see RPMB failure after UFS
-suspend/resume.  Inject request_sense to clear uac in ufshcd reset flow.
-
-Link: https://lore.kernel.org/r/20201201041402.3860525-1-jaegeuk@kernel.org
-Reported-by: kernel test robot <lkp@intel.com>
-Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
-Signed-off-by: Randall Huang <huangrandall@google.com>
-Signed-off-by: Leo Liou <leoliou@google.com>
-Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/scsi/ufs/ufshcd.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
-index d7e9c4bc80478..ec7005bcf61d8 100644
---- a/drivers/scsi/ufs/ufshcd.c
-+++ b/drivers/scsi/ufs/ufshcd.c
-@@ -220,6 +220,7 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba);
- static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);
- static int ufshcd_clear_tm_cmd(struct ufs_hba *hba, int tag);
- static void ufshcd_hba_exit(struct ufs_hba *hba);
-+static int ufshcd_clear_ua_wluns(struct ufs_hba *hba);
- static int ufshcd_probe_hba(struct ufs_hba *hba, bool async);
- static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
-                                bool skip_ref_clk);
-@@ -6842,7 +6843,8 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba)
- 
-       /* Establish the link again and restore the device */
-       err = ufshcd_probe_hba(hba, false);
--
-+      if (!err)
-+              ufshcd_clear_ua_wluns(hba);
- out:
-       if (err)
-               dev_err(hba->dev, "%s: Host init failed %d\n", __func__, err);
-@@ -8274,13 +8276,7 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
-        * handling context.
-        */
-       hba->host->eh_noresume = 1;
--      if (hba->wlun_dev_clr_ua) {
--              ret = ufshcd_send_request_sense(hba, sdp);
--              if (ret)
--                      goto out;
--              /* Unit attention condition is cleared now */
--              hba->wlun_dev_clr_ua = false;
--      }
-+      ufshcd_clear_ua_wluns(hba);
- 
-       cmd[4] = pwr_mode << 4;
- 
-@@ -8301,7 +8297,7 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
- 
-       if (!ret)
-               hba->curr_dev_pwr_mode = pwr_mode;
--out:
-+
-       scsi_device_put(sdp);
-       hba->host->eh_noresume = 0;
-       return ret;
--- 
-2.27.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 20190049a8c429c7665d591bc3be6a53880acdd9..07afe283ab35a770f946365fd9dcf53efe808b88 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -50,7 +50,6 @@ selftests-vm-fix-building-protection-keys-test.patch
 block-add-debugfs-stanza-for-queue_flag_nowait.patch
 workqueue-kick-a-worker-based-on-the-actual-activati.patch
 scsi-ufs-fix-wrong-print-message-in-dev_err.patch
-scsi-ufs-clear-uac-for-rpmb-after-ufshcd-resets.patch
 scsi-ufs-pci-fix-restore-from-s4-for-intel-controlle.patch
 scsi-ufs-pci-ensure-ufs-device-is-in-powerdown-mode-.patch
 scsi-ufs-pci-fix-recovery-from-hibernate-exit-errors.patch