diff options
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r-- | drivers/scsi/isci/request.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 192cb48d849a..ee0dc05c6269 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c | |||
@@ -1304,9 +1304,9 @@ sci_stp_request_pio_data_in_copy_data_buffer(struct isci_stp_request *stp_req, | |||
1304 | struct page *page = sg_page(sg); | 1304 | struct page *page = sg_page(sg); |
1305 | 1305 | ||
1306 | copy_len = min_t(int, total_len, sg_dma_len(sg)); | 1306 | copy_len = min_t(int, total_len, sg_dma_len(sg)); |
1307 | kaddr = kmap_atomic(page, KM_IRQ0); | 1307 | kaddr = kmap_atomic(page); |
1308 | memcpy(kaddr + sg->offset, src_addr, copy_len); | 1308 | memcpy(kaddr + sg->offset, src_addr, copy_len); |
1309 | kunmap_atomic(kaddr, KM_IRQ0); | 1309 | kunmap_atomic(kaddr); |
1310 | total_len -= copy_len; | 1310 | total_len -= copy_len; |
1311 | src_addr += copy_len; | 1311 | src_addr += copy_len; |
1312 | sg = sg_next(sg); | 1312 | sg = sg_next(sg); |
@@ -1654,7 +1654,7 @@ sci_io_request_frame_handler(struct isci_request *ireq, | |||
1654 | sci_unsolicited_frame_control_get_header(&ihost->uf_control, | 1654 | sci_unsolicited_frame_control_get_header(&ihost->uf_control, |
1655 | frame_index, | 1655 | frame_index, |
1656 | &frame_header); | 1656 | &frame_header); |
1657 | kaddr = kmap_atomic(sg_page(sg), KM_IRQ0); | 1657 | kaddr = kmap_atomic(sg_page(sg)); |
1658 | rsp = kaddr + sg->offset; | 1658 | rsp = kaddr + sg->offset; |
1659 | sci_swab32_cpy(rsp, frame_header, 1); | 1659 | sci_swab32_cpy(rsp, frame_header, 1); |
1660 | 1660 | ||
@@ -1691,7 +1691,7 @@ sci_io_request_frame_handler(struct isci_request *ireq, | |||
1691 | ireq->sci_status = SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR; | 1691 | ireq->sci_status = SCI_FAILURE_CONTROLLER_SPECIFIC_IO_ERR; |
1692 | sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); | 1692 | sci_change_state(&ireq->sm, SCI_REQ_COMPLETED); |
1693 | } | 1693 | } |
1694 | kunmap_atomic(kaddr, KM_IRQ0); | 1694 | kunmap_atomic(kaddr); |
1695 | 1695 | ||
1696 | sci_controller_release_frame(ihost, frame_index); | 1696 | sci_controller_release_frame(ihost, frame_index); |
1697 | 1697 | ||
@@ -3023,10 +3023,10 @@ static void isci_request_io_request_complete(struct isci_host *ihost, | |||
3023 | dma_unmap_sg(&ihost->pdev->dev, sg, 1, DMA_TO_DEVICE); | 3023 | dma_unmap_sg(&ihost->pdev->dev, sg, 1, DMA_TO_DEVICE); |
3024 | 3024 | ||
3025 | /* need to swab it back in case the command buffer is re-used */ | 3025 | /* need to swab it back in case the command buffer is re-used */ |
3026 | kaddr = kmap_atomic(sg_page(sg), KM_IRQ0); | 3026 | kaddr = kmap_atomic(sg_page(sg)); |
3027 | smp_req = kaddr + sg->offset; | 3027 | smp_req = kaddr + sg->offset; |
3028 | sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32)); | 3028 | sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32)); |
3029 | kunmap_atomic(kaddr, KM_IRQ0); | 3029 | kunmap_atomic(kaddr); |
3030 | break; | 3030 | break; |
3031 | } | 3031 | } |
3032 | default: | 3032 | default: |
@@ -3311,7 +3311,7 @@ sci_io_request_construct_smp(struct device *dev, | |||
3311 | u8 req_len; | 3311 | u8 req_len; |
3312 | u32 cmd; | 3312 | u32 cmd; |
3313 | 3313 | ||
3314 | kaddr = kmap_atomic(sg_page(sg), KM_IRQ0); | 3314 | kaddr = kmap_atomic(sg_page(sg)); |
3315 | smp_req = kaddr + sg->offset; | 3315 | smp_req = kaddr + sg->offset; |
3316 | /* | 3316 | /* |
3317 | * Look at the SMP requests' header fields; for certain SAS 1.x SMP | 3317 | * Look at the SMP requests' header fields; for certain SAS 1.x SMP |
@@ -3337,7 +3337,7 @@ sci_io_request_construct_smp(struct device *dev, | |||
3337 | req_len = smp_req->req_len; | 3337 | req_len = smp_req->req_len; |
3338 | sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32)); | 3338 | sci_swab32_cpy(smp_req, smp_req, sg->length / sizeof(u32)); |
3339 | cmd = *(u32 *) smp_req; | 3339 | cmd = *(u32 *) smp_req; |
3340 | kunmap_atomic(kaddr, KM_IRQ0); | 3340 | kunmap_atomic(kaddr); |
3341 | 3341 | ||
3342 | if (!dma_map_sg(dev, sg, 1, DMA_TO_DEVICE)) | 3342 | if (!dma_map_sg(dev, sg, 1, DMA_TO_DEVICE)) |
3343 | return SCI_FAILURE; | 3343 | return SCI_FAILURE; |