From fd98df2ae35760934e6b8ace358e5d474c93deef Mon Sep 17 00:00:00 2001 From: Luo Jiaxing Date: Fri, 18 Jan 2019 09:25:21 +0800 Subject: [PATCH] scsi: hisi_sas: correct an error setting of memory allocation size for DQ at Debugfs feature We allocate memory base on hisi_hba->hw->complete_hdr_size for DQ, but it was wrong.For the structure, which used to save DQ, is struct hisi_sas_cmd_hdr, and this size is not saved at variables: complete_hdr_size. So we need to correct it. Signed-off-by: Luo Jiaxing Signed-off-by: John Garry Feature or Bugfix:Bugfix Signed-off-by: luojiaxing Reviewed-by: chenxiang Signed-off-by: Yang Yingliang --- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index e9a218f6d3c2..8419b26b5447 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2641,7 +2641,7 @@ static void hisi_sas_debugfs_snapshot_cq_reg(struct hisi_hba *hisi_hba) static void hisi_sas_debugfs_snapshot_dq_reg(struct hisi_hba *hisi_hba) { - int queue_entry_size = hisi_hba->hw->complete_hdr_size; + int queue_entry_size = sizeof(struct hisi_sas_cmd_hdr); int i; for (i = 0; i < hisi_hba->queue_count; i++) @@ -3104,7 +3104,7 @@ void hisi_sas_debugfs_init(struct hisi_hba *hisi_hba) } /* Alloc buffer for dq */ - sz = hisi_hba->hw->complete_hdr_size * HISI_SAS_QUEUE_SLOTS; + sz = sizeof(struct hisi_sas_cmd_hdr) * HISI_SAS_QUEUE_SLOTS; for (d = 0; d < hisi_hba->queue_count; d++) { hisi_hba->debugfs_cmd_hdr[d] = devm_kmalloc(dev, sz, GFP_KERNEL); -- GitLab