scsi: hisi_sas: Add debugfs file structure for ITCT

BugLink: https://bugs.launchpad.net/bugs/1854548
Create a file structure which was used to save the memory address for ITCT
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-12-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 0161d55f23a1e020e5e6892177caf92a61e5c161)
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 c4bcaa5aff8a32149a921e7c1c3b17dd5b644769..f42f1b34f84393a47c066bdfd3adb4b39c76525e 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -347,6 +347,10 @@ struct hisi_sas_debugfs_iost {
        struct hisi_sas_iost *iost;
 };
 
+struct hisi_sas_debugfs_itct {
+       struct hisi_sas_itct *itct;
+};
+
 struct hisi_hba {
        /* This must be the first element, used by SHOST_TO_SAS_HA */
        struct sas_ha_struct *p;
@@ -433,7 +437,7 @@ struct hisi_hba {
        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_debugfs_iost debugfs_iost;
-       struct hisi_sas_itct *debugfs_itct;
+       struct hisi_sas_debugfs_itct debugfs_itct;
        u64 *debugfs_iost_cache;
        u64 debugfs_timestamp;
        u64 *debugfs_itct_cache;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index c50ff5e93be4a7b7c9e3388655cccb6d2fe07c29..35a4e363ff222a5c5b41af803ab3384b849f68c6 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1574,7 +1574,7 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba)
        struct Scsi_Host *shost = hisi_hba->shost;
        int rc;
 
-       if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct)
+       if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct.itct)
                queue_work(hisi_hba->wq, &hisi_hba->debugfs_work);
 
        if (!hisi_hba->hw->soft_reset)
@@ -2066,7 +2066,7 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
 
        /* Internal abort timed out */
        if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
-               if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct)
+               if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct.itct)
                        queue_work(hisi_hba->wq, &hisi_hba->debugfs_work);
 
                if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
@@ -2784,7 +2784,7 @@ static void hisi_sas_debugfs_snapshot_ras_reg(struct hisi_hba *hisi_hba)
 static void hisi_sas_debugfs_snapshot_itct_reg(struct hisi_hba *hisi_hba)
 {
        void *cachebuf = hisi_hba->debugfs_itct_cache;
-       void *databuf = hisi_hba->debugfs_itct;
+       void *databuf = hisi_hba->debugfs_itct.itct;
        struct hisi_sas_itct *itct;
        int i;
 
@@ -3131,13 +3131,13 @@ static const struct file_operations hisi_sas_debugfs_iost_cache_fops = {
 static int hisi_sas_debugfs_itct_show(struct seq_file *s, void *p)
 {
        int i;
-       struct hisi_hba *hisi_hba = s->private;
-       struct hisi_sas_itct *debugfs_itct = hisi_hba->debugfs_itct;
+       struct hisi_sas_debugfs_itct *debugfs_itct = s->private;
+       struct hisi_sas_itct *itct = debugfs_itct->itct;
 
-       for (i = 0; i < HISI_SAS_MAX_ITCT_ENTRIES; i++, debugfs_itct++) {
-               __le64 *itct = &debugfs_itct->qw0;
+       for (i = 0; i < HISI_SAS_MAX_ITCT_ENTRIES; i++, itct++) {
+               __le64 *data = &itct->qw0;
 
-               hisi_sas_show_row_64(s, i, sizeof(*debugfs_itct), itct);
+               hisi_sas_show_row_64(s, i, sizeof(*itct), data);
        }
 
        return 0;
@@ -3255,7 +3255,8 @@ static void hisi_sas_debugfs_create_files(struct hisi_hba *hisi_hba)
        debugfs_create_file("iost_cache", 0400, dump_dentry, hisi_hba,
                            &hisi_sas_debugfs_iost_cache_fops);
 
-       debugfs_create_file("itct", 0400, dump_dentry, hisi_hba,
+       debugfs_create_file("itct", 0400, dump_dentry,
+                           &hisi_hba->debugfs_itct,
                            &hisi_sas_debugfs_itct_fops);
 
        debugfs_create_file("itct_cache", 0400, dump_dentry, hisi_hba,
@@ -3808,8 +3809,8 @@ static int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba)
        /* New memory allocation must be locate before itct */
        sz = HISI_SAS_MAX_ITCT_ENTRIES * sizeof(struct hisi_sas_itct);
 
-       hisi_hba->debugfs_itct = devm_kmalloc(dev, sz, GFP_KERNEL);
-       if (!hisi_hba->debugfs_itct)
+       hisi_hba->debugfs_itct.itct = devm_kmalloc(dev, sz, GFP_KERNEL);
+       if (!hisi_hba->debugfs_itct.itct)
                goto fail;
 
        return 0;