UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
John Garry 2019-08-05 21:48:06 +08:00 committed by Martin K. Petersen
parent 599aefc81e
commit 1c003146c6
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
View File

@ -1275,11 +1275,10 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
} }
case SAS_PROTOCOL_SMP: case SAS_PROTOCOL_SMP:
{ {
void *to;
struct scatterlist *sg_resp = &task->smp_task.smp_resp; struct scatterlist *sg_resp = &task->smp_task.smp_resp;
void *to = page_address(sg_page(sg_resp));
ts->stat = SAM_STAT_GOOD; ts->stat = SAM_STAT_GOOD;
to = kmap_atomic(sg_page(sg_resp));
dma_unmap_sg(dev, &task->smp_task.smp_resp, 1, dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
DMA_FROM_DEVICE); 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) + hisi_sas_status_buf_addr_mem(slot) +
sizeof(struct hisi_sas_err_record), sizeof(struct hisi_sas_err_record),
sg_dma_len(sg_resp)); sg_dma_len(sg_resp));
kunmap_atomic(to);
break; break;
} }
case SAS_PROTOCOL_SATA: case SAS_PROTOCOL_SATA:

4
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
View File

@ -2419,10 +2419,9 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
case SAS_PROTOCOL_SMP: case SAS_PROTOCOL_SMP:
{ {
struct scatterlist *sg_resp = &task->smp_task.smp_resp; struct scatterlist *sg_resp = &task->smp_task.smp_resp;
void *to; void *to = page_address(sg_page(sg_resp));
ts->stat = SAM_STAT_GOOD; ts->stat = SAM_STAT_GOOD;
to = kmap_atomic(sg_page(sg_resp));
dma_unmap_sg(dev, &task->smp_task.smp_resp, 1, dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
DMA_FROM_DEVICE); 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) + hisi_sas_status_buf_addr_mem(slot) +
sizeof(struct hisi_sas_err_record), sizeof(struct hisi_sas_err_record),
sg_dma_len(sg_resp)); sg_dma_len(sg_resp));
kunmap_atomic(to);
break; break;
} }
case SAS_PROTOCOL_SATA: case SAS_PROTOCOL_SATA:

4
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
View File

@ -2211,10 +2211,9 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
} }
case SAS_PROTOCOL_SMP: { case SAS_PROTOCOL_SMP: {
struct scatterlist *sg_resp = &task->smp_task.smp_resp; struct scatterlist *sg_resp = &task->smp_task.smp_resp;
void *to; void *to = page_address(sg_page(sg_resp));
ts->stat = SAM_STAT_GOOD; ts->stat = SAM_STAT_GOOD;
to = kmap_atomic(sg_page(sg_resp));
dma_unmap_sg(dev, &task->smp_task.smp_resp, 1, dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
DMA_FROM_DEVICE); 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) + hisi_sas_status_buf_addr_mem(slot) +
sizeof(struct hisi_sas_err_record), sizeof(struct hisi_sas_err_record),
sg_dma_len(sg_resp)); sg_dma_len(sg_resp));
kunmap_atomic(to);
break; break;
} }
case SAS_PROTOCOL_SATA: case SAS_PROTOCOL_SATA: