scsi: hisi_sas: Drop kmap_atomic() in SMP command completion

The call to kmap_atomic() in the SMP command completion code is
unnecessary, since kmap() is only really concerned with highmem, which is
not relevant on arm64. The controller only finds itself in arm64 systems.

Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index b13cbc64d2a9fc69df9296c755b65b8478457595..015bf00a20e6a6e65fda09bc53960cf4398b1819 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1275,11 +1275,10 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
        }
        case SAS_PROTOCOL_SMP:
        {
-               void *to;
                struct scatterlist *sg_resp = &task->smp_task.smp_resp;
+               void *to = page_address(sg_page(sg_resp));
 
                ts->stat = SAM_STAT_GOOD;
-               to = kmap_atomic(sg_page(sg_resp));
 
                dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
                             DMA_FROM_DEVICE);
@@ -1289,7 +1288,6 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
                       hisi_sas_status_buf_addr_mem(slot) +
                       sizeof(struct hisi_sas_err_record),
                       sg_dma_len(sg_resp));
-               kunmap_atomic(to);
                break;
        }
        case SAS_PROTOCOL_SATA:

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index de33e31cd88a4b9ab2544f3f590ca0953e9fc1e4..c3cf3b77c65564366542d1ae0eb0f9a6658b269d 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2419,10 +2419,9 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        case SAS_PROTOCOL_SMP:
        {
                struct scatterlist *sg_resp = &task->smp_task.smp_resp;
-               void *to;
+               void *to = page_address(sg_page(sg_resp));
 
                ts->stat = SAM_STAT_GOOD;
-               to = kmap_atomic(sg_page(sg_resp));
 
                dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
                             DMA_FROM_DEVICE);
@@ -2432,7 +2431,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                       hisi_sas_status_buf_addr_mem(slot) +
                       sizeof(struct hisi_sas_err_record),
                       sg_dma_len(sg_resp));
-               kunmap_atomic(to);
                break;
        }
        case SAS_PROTOCOL_SATA:

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 072a39d5c4add49f60da6dc3e65a3aaf64132511..fcb2ef5f24b9a3e9177353233276fc698f6ee4bb 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2211,10 +2211,9 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        }
        case SAS_PROTOCOL_SMP: {
                struct scatterlist *sg_resp = &task->smp_task.smp_resp;
-               void *to;
+               void *to = page_address(sg_page(sg_resp));
 
                ts->stat = SAM_STAT_GOOD;
-               to = kmap_atomic(sg_page(sg_resp));
 
                dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
                             DMA_FROM_DEVICE);
@@ -2224,7 +2223,6 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                        hisi_sas_status_buf_addr_mem(slot) +
                       sizeof(struct hisi_sas_err_record),
                       sg_dma_len(sg_resp));
-               kunmap_atomic(to);
                break;
        }
        case SAS_PROTOCOL_SATA: