scsi: hisi_sas: Add debugfs file structure for IOST

BugLink: https://bugs.launchpad.net/bugs/1854548
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>
(cherry picked from commit e15f2e2dff5b809dce923839f21362d6b0d06b1e)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index af5f836e5807a6d6b9504c9a1bd367a69c3275fb..c4bcaa5aff8a32149a921e7c1c3b17dd5b644769 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -343,6 +343,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;
@@ -428,7 +432,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 28fa05d03214ca716c43f56bfb9b99dd36b24263..c50ff5e93be4a7b7c9e3388655cccb6d2fe07c29 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -2803,7 +2803,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;
 
@@ -3062,14 +3062,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;
@@ -3248,7 +3248,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,
@@ -3718,7 +3719,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);
@@ -3786,8 +3787,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 *