156 lines
4.8 KiB
Diff
156 lines
4.8 KiB
Diff
From 3d30a9dada3bef0ff3138cf4cb86ae390762c770 Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Fri, 2 Oct 2020 22:30:34 +0800
|
|
Subject: [PATCH 060/108] scsi: hisi_sas: Add controller runtime PM support for
|
|
v3 hw
|
|
|
|
mainline inclusion
|
|
from mainline-v5.10-rc1
|
|
commit 65ff4aef7e9bde00871875c5fbc9c6b79df6f5ba
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F81U
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=65ff4aef7e9bde00871875c5fbc9c6b79df6f5ba
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add controller runtime PM support for v3 hw.
|
|
|
|
Link: https://lore.kernel.org/r/1601649038-25534-4-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas.h | 2 +
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 56 +++++++++++++++++++++++++-
|
|
2 files changed, 56 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
index f9512b6c2d02..b2a368e41f0c 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas.h
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/of_address.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/platform_device.h>
|
|
+#include <linux/pm_runtime.h>
|
|
#include <linux/property.h>
|
|
#include <linux/regmap.h>
|
|
#include <scsi/scsi_common.h>
|
|
@@ -38,6 +39,7 @@
|
|
#define HISI_SAS_MAX_DEVICES HISI_SAS_MAX_ITCT_ENTRIES
|
|
#define HISI_SAS_RESET_BIT 0
|
|
#define HISI_SAS_REJECT_CMD_BIT 1
|
|
+#define HISI_SAS_PM_BIT 2
|
|
#define HISI_SAS_MAX_COMMANDS (HISI_SAS_QUEUE_SLOTS)
|
|
#define HISI_SAS_RESERVED_IPTT 96
|
|
#define HISI_SAS_UNRESERVED_IPTT \
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 26626823f175..ad39439bc04d 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3712,6 +3712,17 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
|
|
scsi_scan_host(shost);
|
|
|
|
+ /*
|
|
+ * For the situation that there are ATA disks connected with SAS
|
|
+ * controller, it additionally creates ata_port which will affect the
|
|
+ * child_count of hisi_hba->dev. Even if suspended all the disks,
|
|
+ * ata_port is still and the child_count of hisi_hba->dev is not 0.
|
|
+ * So use pm_suspend_ignore_children() to ignore the effect to
|
|
+ * hisi_hba->dev.
|
|
+ */
|
|
+ pm_suspend_ignore_children(dev, true);
|
|
+ pm_runtime_put_noidle(&pdev->dev);
|
|
+
|
|
return 0;
|
|
|
|
err_out_register_ha:
|
|
@@ -3752,6 +3763,7 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev)
|
|
struct hisi_hba *hisi_hba = sha->lldd_ha;
|
|
struct Scsi_Host *shost = sha->core.shost;
|
|
|
|
+ pm_runtime_get_noresume(dev);
|
|
if (timer_pending(&hisi_hba->timer))
|
|
del_timer(&hisi_hba->timer);
|
|
|
|
@@ -3808,7 +3820,7 @@ enum {
|
|
hip08,
|
|
};
|
|
|
|
-static int suspend_v3_hw(struct device *device)
|
|
+static int _suspend_v3_hw(struct device *device)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
|
struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
@@ -3854,7 +3866,7 @@ static int suspend_v3_hw(struct device *device)
|
|
return 0;
|
|
}
|
|
|
|
-static int resume_v3_hw(struct device *device)
|
|
+static int _resume_v3_hw(struct device *device)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(device);
|
|
struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
@@ -3893,6 +3905,34 @@ static int resume_v3_hw(struct device *device)
|
|
return 0;
|
|
}
|
|
|
|
+static int suspend_v3_hw(struct device *device)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(device);
|
|
+ struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
+ struct hisi_hba *hisi_hba = sha->lldd_ha;
|
|
+ int rc;
|
|
+
|
|
+ set_bit(HISI_SAS_PM_BIT, &hisi_hba->flags);
|
|
+
|
|
+ rc = _suspend_v3_hw(device);
|
|
+ if (rc)
|
|
+ clear_bit(HISI_SAS_PM_BIT, &hisi_hba->flags);
|
|
+
|
|
+ return rc;
|
|
+}
|
|
+
|
|
+static int resume_v3_hw(struct device *device)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(device);
|
|
+ struct sas_ha_struct *sha = pci_get_drvdata(pdev);
|
|
+ struct hisi_hba *hisi_hba = sha->lldd_ha;
|
|
+ int rc = _resume_v3_hw(device);
|
|
+
|
|
+ clear_bit(HISI_SAS_PM_BIT, &hisi_hba->flags);
|
|
+
|
|
+ return rc;
|
|
+}
|
|
+
|
|
static const struct pci_device_id sas_v3_pci_table[] = {
|
|
{ PCI_VDEVICE(HUAWEI, 0xa230), hip08 },
|
|
{}
|
|
@@ -3904,8 +3944,20 @@ static const struct pci_error_handlers hisi_sas_err_handler = {
|
|
.reset_done = hisi_sas_reset_done_v3_hw,
|
|
};
|
|
|
|
+static int runtime_suspend_v3_hw(struct device *dev)
|
|
+{
|
|
+ return suspend_v3_hw(dev);
|
|
+}
|
|
+
|
|
+static int runtime_resume_v3_hw(struct device *dev)
|
|
+{
|
|
+ return resume_v3_hw(dev);
|
|
+}
|
|
+
|
|
static const struct dev_pm_ops hisi_sas_v3_pm_ops = {
|
|
SET_SYSTEM_SLEEP_PM_OPS(suspend_v3_hw, resume_v3_hw)
|
|
+ SET_RUNTIME_PM_OPS(runtime_suspend_v3_hw,
|
|
+ runtime_resume_v3_hw, NULL)
|
|
};
|
|
|
|
static struct pci_driver sas_v3_pci_driver = {
|
|
--
|
|
2.27.0
|
|
|