82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
From 5cad5cf497bcd5fc97f9c966b7d680b4722e5d18 Mon Sep 17 00:00:00 2001
|
|
From: Luo Jiaxing <luojiaxing@huawei.com>
|
|
Date: Tue, 3 Aug 2021 14:47:50 +0800
|
|
Subject: [PATCH 070/108] scsi: hisi_sas: Enable debugfs support by default
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1
|
|
commit 1dbe61bf7d760547d16ccf057572e641a653ad4a
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8F81L
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1dbe61bf7d760547d16ccf057572e641a653ad4a
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add a config option to enable debugfs support by default. And if debugfs
|
|
support is enabled by default, dump count default value is increased to 50
|
|
as generally users want something bigger than the current default in that
|
|
situation.
|
|
|
|
Link: https://lore.kernel.org/r/1611659068-131975-4-git-send-email-john.garry@huawei.com
|
|
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
|
|
Signed-off-by: John Garry <john.garry@huawei.com>
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Reviewed-by: Ouyangdelong <ouyangdelong@huawei.com>
|
|
Signed-off-by: Nifujia <nifujia1@hisilicon.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
|
|
Conflicts:
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
---
|
|
drivers/scsi/hisi_sas/Kconfig | 6 ++++++
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 13 +++++++++++--
|
|
2 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/Kconfig b/drivers/scsi/hisi_sas/Kconfig
|
|
index 11c46b217caa..a8999964d3e9 100644
|
|
--- a/drivers/scsi/hisi_sas/Kconfig
|
|
+++ b/drivers/scsi/hisi_sas/Kconfig
|
|
@@ -17,3 +17,9 @@ config SCSI_HISI_SAS_PCI
|
|
depends on ACPI
|
|
help
|
|
This driver supports HiSilicon's SAS HBA based on PCI device
|
|
+
|
|
+config SCSI_HISI_SAS_DEBUGFS_DEFAULT_ENABLE
|
|
+ bool "HiSilicon SAS debugging default enable"
|
|
+ depends on SCSI_HISI_SAS
|
|
+ help
|
|
+ Set Y to default enable DEBUGFS for SCSI_HISI_SAS
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index 62fc39c27af8..133791f6223b 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -2786,12 +2786,21 @@ int hisi_sas_remove(struct platform_device *pdev)
|
|
}
|
|
EXPORT_SYMBOL_GPL(hisi_sas_remove);
|
|
|
|
+#if IS_ENABLED(CONFIG_SCSI_HISI_SAS_DEBUGFS_DEFAULT_ENABLE)
|
|
+#define DEBUGFS_ENABLE_DEFAULT "enabled"
|
|
bool hisi_sas_debugfs_enable = true;
|
|
+u32 hisi_sas_debugfs_dump_count = 50;
|
|
+#else
|
|
+#define DEBUGFS_ENABLE_DEFAULT "disabled"
|
|
+bool hisi_sas_debugfs_enable;
|
|
+u32 hisi_sas_debugfs_dump_count = 1;
|
|
+#endif
|
|
+
|
|
EXPORT_SYMBOL_GPL(hisi_sas_debugfs_enable);
|
|
module_param_named(debugfs_enable, hisi_sas_debugfs_enable, bool, 0444);
|
|
-MODULE_PARM_DESC(hisi_sas_debugfs_enable, "Enable driver debugfs (default disabled)");
|
|
+MODULE_PARM_DESC(hisi_sas_debugfs_enable,
|
|
+ "Enable driver debugfs (default "DEBUGFS_ENABLE_DEFAULT")");
|
|
|
|
-u32 hisi_sas_debugfs_dump_count = 1;
|
|
EXPORT_SYMBOL_GPL(hisi_sas_debugfs_dump_count);
|
|
module_param_named(debugfs_dump_count, hisi_sas_debugfs_dump_count, uint, 0444);
|
|
MODULE_PARM_DESC(hisi_sas_debugfs_dump_count, "Number of debugfs dumps to allow");
|
|
--
|
|
2.27.0
|
|
|