79 lines
2.9 KiB
Diff
79 lines
2.9 KiB
Diff
From b2bdaceb05aa8a5a8355d9e200cd6270351f6ec0 Mon Sep 17 00:00:00 2001
|
|
From: Jason Yan <yanaijie@huawei.com>
|
|
Date: Tue, 12 May 2020 19:32:58 +0800
|
|
Subject: [PATCH 046/108] scsi: hisi_sas: Display proc_name in sysfs
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit 55ce24b3bfd75f76696a00f2666caaf806eebea2
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EKNE
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=55ce24b3bfd75f76696a00f2666caaf806eebea2
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
The 'proc_name' entry in sysfs for hisi_sas is 'null' now because it is not
|
|
initialized in scsi_host_template. It looks like:
|
|
|
|
[root@localhost ~]# cat /sys/class/scsi_host/host2/proc_name
|
|
(null)
|
|
|
|
While the other driver's entry looks like:
|
|
|
|
linux-vnMQMU:~ # cat /sys/class/scsi_host/host0/proc_name
|
|
megaraid_sas
|
|
|
|
Link: https://lore.kernel.org/r/20200512113258.30781-1-yanaijie@huawei.com
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Xiang Chen <chenxiang66@hisilicon.com>
|
|
Acked-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Jason Yan <yanaijie@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_v1_hw.c | 1 +
|
|
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 +
|
|
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
index 1228f282d443..c21a18703cab 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
@@ -1761,6 +1761,7 @@ static struct device_attribute *host_attrs_v1_hw[] = {
|
|
|
|
static struct scsi_host_template sht_v1_hw = {
|
|
.name = DRV_NAME,
|
|
+ .proc_name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
.queuecommand = sas_queuecommand,
|
|
.target_alloc = sas_target_alloc,
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
index 55faa3ec72f9..c044ce0a0f18 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
|
|
@@ -3552,6 +3552,7 @@ struct device_attribute *host_attrs_v2_hw[] = {
|
|
|
|
static struct scsi_host_template sht_v2_hw = {
|
|
.name = DRV_NAME,
|
|
+ .proc_name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
.queuecommand = sas_queuecommand,
|
|
.target_alloc = sas_target_alloc,
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
index 62dd7b599911..23eeb3678da2 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
|
|
@@ -3466,6 +3466,7 @@ static void read_iost_itct_cache_v3_hw(struct hisi_hba *hisi_hba,
|
|
|
|
static struct scsi_host_template sht_v3_hw = {
|
|
.name = DRV_NAME,
|
|
+ .proc_name = DRV_NAME,
|
|
.module = THIS_MODULE,
|
|
.queuecommand = sas_queuecommand,
|
|
.target_alloc = sas_target_alloc,
|
|
--
|
|
2.27.0
|
|
|