120 lines
4.5 KiB
Diff
120 lines
4.5 KiB
Diff
From 989f21b61f1c4ad5b7ed36e55ef00e30dc9f6861 Mon Sep 17 00:00:00 2001
|
|
From: Luo Jiaxing <luojiaxing@huawei.com>
|
|
Date: Thu, 24 Oct 2019 22:08:17 +0800
|
|
Subject: [PATCH 030/108] scsi: hisi_sas: Add debugfs file structure for IOST
|
|
|
|
mainline inclusion
|
|
from mainline-v5.5-rc1
|
|
commit e15f2e2dff5b809dce923839f21362d6b0d06b1e
|
|
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=e15f2e2dff5b809dce923839f21362d6b0d06b1e
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Create a file structure which was used to save the memory address for IOST
|
|
at debugfs. This structure is bound to the corresponding debugfs file, it
|
|
can help callback function of debugfs file to get what it needs.
|
|
|
|
Link: https://lore.kernel.org/r/1571926105-74636-11-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>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/scsi/hisi_sas/hisi_sas.h | 6 +++++-
|
|
drivers/scsi/hisi_sas/hisi_sas_main.c | 21 +++++++++++----------
|
|
2 files changed, 16 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
index 646ab7d6ad05..efedf889b91c 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas.h
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
|
|
@@ -387,6 +387,10 @@ struct hisi_sas_debugfs_port {
|
|
u32 *data;
|
|
};
|
|
|
|
+struct hisi_sas_debugfs_iost {
|
|
+ struct hisi_sas_iost *iost;
|
|
+};
|
|
+
|
|
struct hisi_hba {
|
|
/* This must be the first element, used by SHOST_TO_SAS_HA */
|
|
struct sas_ha_struct *p;
|
|
@@ -470,7 +474,7 @@ struct hisi_hba {
|
|
struct hisi_sas_debugfs_port debugfs_port_reg[HISI_SAS_MAX_PHYS];
|
|
struct hisi_sas_debugfs_cq debugfs_cq[HISI_SAS_MAX_QUEUES];
|
|
struct hisi_sas_debugfs_dq debugfs_dq[HISI_SAS_MAX_QUEUES];
|
|
- struct hisi_sas_iost *debugfs_iost;
|
|
+ struct hisi_sas_debugfs_iost debugfs_iost;
|
|
struct hisi_sas_itct *debugfs_itct;
|
|
u64 *debugfs_iost_cache;
|
|
u64 debugfs_timestamp;
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
index 637308372ec3..4edecfc3e7b7 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
|
|
@@ -2869,7 +2869,7 @@ static void hisi_sas_debugfs_snapshot_iost_reg(struct hisi_hba *hisi_hba)
|
|
{
|
|
int max_command_entries = HISI_SAS_MAX_COMMANDS;
|
|
void *cachebuf = hisi_hba->debugfs_iost_cache;
|
|
- void *databuf = hisi_hba->debugfs_iost;
|
|
+ void *databuf = hisi_hba->debugfs_iost.iost;
|
|
struct hisi_sas_iost *iost;
|
|
int i;
|
|
|
|
@@ -3513,14 +3513,14 @@ static const struct file_operations hisi_sas_debugfs_dq_fops = {
|
|
|
|
static int hisi_sas_debugfs_iost_show(struct seq_file *s, void *p)
|
|
{
|
|
- struct hisi_hba *hisi_hba = s->private;
|
|
- struct hisi_sas_iost *debugfs_iost = hisi_hba->debugfs_iost;
|
|
+ struct hisi_sas_debugfs_iost *debugfs_iost = s->private;
|
|
+ struct hisi_sas_iost *iost = debugfs_iost->iost;
|
|
int i, max_command_entries = HISI_SAS_MAX_COMMANDS;
|
|
|
|
- for (i = 0; i < max_command_entries; i++, debugfs_iost++) {
|
|
- __le64 *iost = &debugfs_iost->qw0;
|
|
+ for (i = 0; i < max_command_entries; i++, iost++) {
|
|
+ __le64 *data = &iost->qw0;
|
|
|
|
- hisi_sas_show_row_64(s, i, sizeof(*debugfs_iost), iost);
|
|
+ hisi_sas_show_row_64(s, i, sizeof(*iost), data);
|
|
}
|
|
|
|
return 0;
|
|
@@ -3702,7 +3702,8 @@ static void hisi_sas_debugfs_create_files(struct hisi_hba *hisi_hba)
|
|
&hisi_sas_debugfs_dq_fops);
|
|
}
|
|
|
|
- debugfs_create_file("iost", 0400, dump_dentry, hisi_hba,
|
|
+ debugfs_create_file("iost", 0400, dump_dentry,
|
|
+ &hisi_hba->debugfs_iost,
|
|
&hisi_sas_debugfs_iost_fops);
|
|
|
|
debugfs_create_file("iost_cache", 0400, dump_dentry, hisi_hba,
|
|
@@ -3803,7 +3804,7 @@ static void hisi_sas_debugfs_release(struct hisi_hba *hisi_hba)
|
|
|
|
devm_kfree(dev, hisi_hba->debugfs_iost_cache);
|
|
devm_kfree(dev, hisi_hba->debugfs_itct_cache);
|
|
- devm_kfree(dev, hisi_hba->debugfs_iost);
|
|
+ devm_kfree(dev, hisi_hba->debugfs_iost.iost);
|
|
|
|
for (i = 0; i < hisi_hba->queue_count; i++)
|
|
devm_kfree(dev, hisi_hba->debugfs_dq[i].hdr);
|
|
@@ -3904,8 +3905,8 @@ static int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba)
|
|
|
|
sz = HISI_SAS_MAX_COMMANDS * sizeof(struct hisi_sas_iost);
|
|
|
|
- hisi_hba->debugfs_iost = devm_kmalloc(dev, sz, GFP_KERNEL);
|
|
- if (!hisi_hba->debugfs_iost)
|
|
+ hisi_hba->debugfs_iost.iost = devm_kmalloc(dev, sz, GFP_KERNEL);
|
|
+ if (!hisi_hba->debugfs_iost.iost)
|
|
goto fail;
|
|
|
|
sz = HISI_SAS_IOST_ITCT_CACHE_NUM *
|
|
--
|
|
2.27.0
|
|
|