128 lines
5.1 KiB
Diff
128 lines
5.1 KiB
Diff
From 53a0b5245e3afc807fcc6985a4f3fb54b319794e Mon Sep 17 00:00:00 2001
|
|
From: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Date: Tue, 19 Apr 2022 17:06:51 +0800
|
|
Subject: [PATCH 082/108] scsi: hisi_sas: Initialise devices in .slave_alloc
|
|
callback
|
|
|
|
mainline inclusion
|
|
from mainline-v5.16-rc1
|
|
commit 36c6b7613ef1ffd88637315f11c71896f3ce4856
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F803
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=36c6b7613ef1ffd88637315f11c71896f3ce4856
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Perform driver-specific SCSI device initialization in the designated SCSI
|
|
midlayer callback instead of relying on the libsas "device found" callback.
|
|
|
|
The SCSI midlayer .slave_alloc interface is called prior to sending any I/O
|
|
to the device.
|
|
|
|
Link: https://lore.kernel.org/r/1634041588-74824-2-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: 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>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas.h | 1 +
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 17 ++++++++++++++---
|
|
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +-
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +-
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +-
|
|
5 files changed, 18 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
index d381dfda8f99..d403d6855ed6 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas.h
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
@@ -683,6 +683,7 @@ extern int hisi_sas_probe(struct platform_device *pdev,
|
|
extern int hisi_sas_remove(struct platform_device *pdev);
|
|
|
|
extern int hisi_sas_slave_configure(struct scsi_device *sdev);
|
|
+extern int hisi_sas_slave_alloc(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 int hisi_sas_host_reset(struct Scsi_Host *shost, int reset_type);
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index b56778a1402a..749bc5498530 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -764,6 +764,20 @@ static int hisi_sas_init_device(struct domain_device *device)
|
|
return rc;
|
|
}
|
|
|
|
+int hisi_sas_slave_alloc(struct scsi_device *sdev)
|
|
+{
|
|
+ struct domain_device *ddev;
|
|
+ int rc;
|
|
+
|
|
+ rc = sas_slave_alloc(sdev);
|
|
+ if (rc)
|
|
+ return rc;
|
|
+ ddev = sdev_to_domain_dev(sdev);
|
|
+
|
|
+ return hisi_sas_init_device(ddev);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(hisi_sas_slave_alloc);
|
|
+
|
|
static int hisi_sas_dev_found(struct domain_device *device)
|
|
{
|
|
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
|
|
@@ -810,9 +824,6 @@ static int hisi_sas_dev_found(struct domain_device *device)
|
|
dev_info(dev, "dev[%d:%x] found\n",
|
|
sas_dev->device_id, sas_dev->dev_type);
|
|
|
|
- rc = hisi_sas_init_device(device);
|
|
- if (rc)
|
|
- goto err_out;
|
|
sas_dev->dev_status = HISI_SAS_DEV_NORMAL;
|
|
return 0;
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
index c82abcf2567c..540ca255d65e 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
@@ -1772,7 +1772,7 @@ static struct scsi_host_template sht_v1_hw = {
|
|
.use_clustering = ENABLE_CLUSTERING,
|
|
.eh_device_reset_handler = sas_eh_device_reset_handler,
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
- .slave_alloc = sas_slave_alloc,
|
|
+ .slave_alloc = hisi_sas_slave_alloc,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
.shost_attrs = host_attrs_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 46a0a321ff54..f9381df36cfa 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -3562,7 +3562,7 @@ static struct scsi_host_template sht_v2_hw = {
|
|
.use_clustering = ENABLE_CLUSTERING,
|
|
.eh_device_reset_handler = sas_eh_device_reset_handler,
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
- .slave_alloc = sas_slave_alloc,
|
|
+ .slave_alloc = hisi_sas_slave_alloc,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
.shost_attrs = host_attrs_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 d12194d04a1e..33882a4ef00a 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3573,7 +3573,7 @@ static struct scsi_host_template sht_v3_hw = {
|
|
.use_clustering = ENABLE_CLUSTERING,
|
|
.eh_device_reset_handler = sas_eh_device_reset_handler,
|
|
.eh_target_reset_handler = sas_eh_target_reset_handler,
|
|
- .slave_alloc = sas_slave_alloc,
|
|
+ .slave_alloc = hisi_sas_slave_alloc,
|
|
.target_destroy = sas_target_destroy,
|
|
.ioctl = sas_ioctl,
|
|
.shost_attrs = host_attrs_v3_hw,
|
|
--
|
|
2.27.0
|
|
|