69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From 31528afff33d3511b7e14442e59969e7b0a56521 Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Tue, 19 Apr 2022 17:07:00 +0800
|
|
Subject: [PATCH 084/108] scsi: hisi_sas: Add more logs for runtime
|
|
suspend/resume
|
|
|
|
mainline inclusion
|
|
from mainline-v5.17-rc1
|
|
commit 97f4100939844a6381ba61b99d6d2b1f2fccb79f
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F803
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=97f4100939844a6381ba61b99d6d2b1f2fccb79f
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add some logs at the beginning and end of suspend/resume.
|
|
|
|
Link: https://lore.kernel.org/r/1639999298-244569-9-git-send-email-chenxiang66@hisilicon.com
|
|
Acked-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Signed-off-by: Fujai Ni<nifuijia1@hisilicon.com>
|
|
Reviewed-by: Jason Yan <yanaijie@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 04d2c8a54633..ca0b76e6088c 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -5309,6 +5309,8 @@ static int _suspend_v3_hw(struct device *device)
|
|
if (test_and_set_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags))
|
|
return -EPERM;
|
|
|
|
+ dev_warn(dev, "entering suspend state\n");
|
|
+
|
|
scsi_block_requests(shost);
|
|
set_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
|
|
flush_workqueue(hisi_hba->wq);
|
|
@@ -5334,6 +5336,8 @@ static int _suspend_v3_hw(struct device *device)
|
|
hisi_sas_release_tasks(hisi_hba);
|
|
|
|
sas_suspend_ha(sha);
|
|
+
|
|
+ dev_warn(dev, "end of suspending controller\n");
|
|
return 0;
|
|
}
|
|
|
|
@@ -5373,6 +5377,8 @@ static int _resume_v3_hw(struct device *device)
|
|
sas_resume_ha(sha);
|
|
clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
|
|
|
|
+ dev_warn(dev, "end of resuming controller\n");
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|