scsi: hisi_sas: print device id for errors

BugLink: https://bugs.launchpad.net/bugs/1774466
When we find an erroneous slot completion, to help aid debugging add the
device index to the current debug log.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 381ed6c081ae423b03d82ce1a0bb79bbec2b033e linux-next)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index f5f86c21ed4552a4f79bb00d736413376d549d02..55c1d8603807292ea810a7e5a08e887644981ea2 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2459,10 +2459,10 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                        slot_err_v2_hw(hisi_hba, task, slot, 2);
 
                if (ts->stat != SAS_DATA_UNDERRUN)
-                       dev_info(dev, "erroneous completion iptt=%d task=%p "
+                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "
                                "CQ hdr: 0x%x 0x%x 0x%x 0x%x "
                                "Error info: 0x%x 0x%x 0x%x 0x%x\n",
-                               slot->idx, task,
+                               slot->idx, task, sas_dev->device_id,
                                complete_hdr->dw0, complete_hdr->dw1,
                                complete_hdr->act, complete_hdr->dw3,
                                error_info[0], error_info[1],

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index aa52d5e424f7a09d5e5728a6d0b0fee0ebdd90b0..760724ae4d6f429362171aa192396ac239b44139 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1641,10 +1641,10 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
 
                slot_err_v3_hw(hisi_hba, task, slot);
                if (ts->stat != SAS_DATA_UNDERRUN)
-                       dev_info(dev, "erroneous completion iptt=%d task=%p "
+                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "
                                "CQ hdr: 0x%x 0x%x 0x%x 0x%x "
                                "Error info: 0x%x 0x%x 0x%x 0x%x\n",
-                               slot->idx, task,
+                               slot->idx, task, sas_dev->device_id,
                                complete_hdr->dw0, complete_hdr->dw1,
                                complete_hdr->act, complete_hdr->dw3,
                                error_info[0], error_info[1],