130 lines
4.8 KiB
Diff
130 lines
4.8 KiB
Diff
From 4e63bca6e8c3a7fac800ee6c27f9afab13774fde Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Fri, 9 Nov 2018 22:06:32 +0800
|
|
Subject: [PATCH 10/31] scsi: hisi_sas: Create separate host attributes per HBA
|
|
Origin: https://git.kernel.org/linus/c3566f9a617de3288739fd3b8e7539951bf2b04d
|
|
|
|
Currently all the three HBA (v1/v2/v3 HW) share the same host attributes.
|
|
|
|
To support each HBA having separate attributes in future, create per-HBA
|
|
attributes.
|
|
|
|
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>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas.h | 1 -
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 6 ------
|
|
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 7 ++++++-
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 7 ++++++-
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 7 ++++++-
|
|
5 files changed, 18 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
index 0ddb53c8a2e2..94a9e13c069c 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas.h
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
@@ -468,7 +468,6 @@ extern int hisi_sas_remove(struct platform_device *pdev);
|
|
extern int hisi_sas_slave_configure(struct scsi_device *sdev);
|
|
extern int hisi_sas_scan_finished(struct Scsi_Host *shost, unsigned long time);
|
|
extern void hisi_sas_scan_start(struct Scsi_Host *shost);
|
|
-extern struct device_attribute *host_attrs[];
|
|
extern int hisi_sas_host_reset(struct Scsi_Host *shost, int reset_type);
|
|
extern void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy);
|
|
extern void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba,
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index c2998d3ac37f..dc71f8d83551 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -2009,12 +2009,6 @@ EXPORT_SYMBOL_GPL(hisi_sas_kill_tasklets);
|
|
struct scsi_transport_template *hisi_sas_stt;
|
|
EXPORT_SYMBOL_GPL(hisi_sas_stt);
|
|
|
|
-struct device_attribute *host_attrs[] = {
|
|
- &dev_attr_phy_event_threshold,
|
|
- NULL,
|
|
-};
|
|
-EXPORT_SYMBOL_GPL(host_attrs);
|
|
-
|
|
static struct sas_domain_function_template hisi_sas_transport_ops = {
|
|
.lldd_dev_found = hisi_sas_dev_found,
|
|
.lldd_dev_gone = hisi_sas_dev_gone,
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
index 8df822a4a1bd..e8e3a876e493 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
@@ -1797,6 +1797,11 @@ static int hisi_sas_v1_init(struct hisi_hba *hisi_hba)
|
|
return 0;
|
|
}
|
|
|
|
+static struct device_attribute *host_attrs_v1_hw[] = {
|
|
+ &dev_attr_phy_event_threshold,
|
|
+ NULL
|
|
+};
|
|
+
|
|
static struct scsi_host_template sht_v1_hw = {
|
|
.name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
@@ -1815,7 +1820,7 @@ static struct scsi_host_template sht_v1_hw = {
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
- .shost_attrs = host_attrs,
|
|
+ .shost_attrs = host_attrs_v1_hw,
|
|
};
|
|
|
|
static const struct hisi_sas_hw hisi_sas_v1_hw = {
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
index 77a85ead483e..574a269e2865 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -3552,6 +3552,11 @@ static void wait_cmds_complete_timeout_v2_hw(struct hisi_hba *hisi_hba,
|
|
dev_dbg(dev, "wait commands complete %dms\n", time);
|
|
}
|
|
|
|
+struct device_attribute *host_attrs_v2_hw[] = {
|
|
+ &dev_attr_phy_event_threshold,
|
|
+ NULL
|
|
+};
|
|
+
|
|
static struct scsi_host_template sht_v2_hw = {
|
|
.name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
@@ -3570,7 +3575,7 @@ static struct scsi_host_template sht_v2_hw = {
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
- .shost_attrs = host_attrs,
|
|
+ .shost_attrs = host_attrs_v2_hw,
|
|
};
|
|
|
|
static const struct hisi_sas_hw hisi_sas_v2_hw = {
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 43005d39abe6..1d0896959fbb 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -2089,6 +2089,11 @@ static void wait_cmds_complete_timeout_v3_hw(struct hisi_hba *hisi_hba,
|
|
dev_dbg(dev, "wait commands complete %dms\n", time);
|
|
}
|
|
|
|
+struct device_attribute *host_attrs_v3_hw[] = {
|
|
+ &dev_attr_phy_event_threshold,
|
|
+ NULL
|
|
+};
|
|
+
|
|
static struct scsi_host_template sht_v3_hw = {
|
|
.name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
@@ -2107,7 +2112,7 @@ static struct scsi_host_template sht_v3_hw = {
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
- .shost_attrs = host_attrs,
|
|
+ .shost_attrs = host_attrs_v3_hw,
|
|
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
|
|
};
|
|
|
|
--
|
|
2.20.1
|
|
|