malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ide-scsi: move idescsi_map_sg() call out from idescsi_issue_pc()

Browse Source 
Move idescsi_map_sg() call out from idescsi_issue_pc()
to idescsi_do_request() as a preparation to adding generic
ide_issue_pc() helper.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-15 21:21:58 +02:00
parent 594c16d8dd
commit 4cc196897d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/ide-scsi.c
View File

@ -514,16 +514,16 @@ static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,
/* Request to transfer the entire buffer at once */ /* Request to transfer the entire buffer at once */
bcount = min(pc->req_xfer, 63 * 1024); bcount = min(pc->req_xfer, 63 * 1024);
if (drive->using_dma && !idescsi_map_sg(drive, pc)) { if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma) {
hwif->sg_mapped = 1; hwif->sg_mapped = 1;
dma = !hwif->dma_ops->dma_setup(drive); dma = !hwif->dma_ops->dma_setup(drive);
hwif->sg_mapped = 0; hwif->sg_mapped = 0;
} }
ide_pktcmd_tf_load(drive, 0, bcount, dma); if (!dma)
pc->flags &= ~PC_FLAG_DMA_OK;
if (dma) ide_pktcmd_tf_load(drive, 0, bcount, dma);
pc->flags |= PC_FLAG_DMA_OK;
if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) { if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
ide_execute_command(drive, WIN_PACKETCMD, &idescsi_transfer_pc, ide_execute_command(drive, WIN_PACKETCMD, &idescsi_transfer_pc,
@ -547,8 +547,12 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
rq->sector, rq->nr_sectors, rq->current_nr_sectors); rq->sector, rq->nr_sectors, rq->current_nr_sectors);
if (blk_sense_request(rq) || blk_special_request(rq)) { if (blk_sense_request(rq) || blk_special_request(rq)) {
return idescsi_issue_pc(drive, struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq->special;
(struct ide_atapi_pc *) rq->special);
if (drive->using_dma && !idescsi_map_sg(drive, pc))
pc->flags |= PC_FLAG_DMA_OK;
return idescsi_issue_pc(drive, pc);
} }
blk_dump_rq_flags(rq, "ide-scsi: unsup command"); blk_dump_rq_flags(rq, "ide-scsi: unsup command");
idescsi_end_request (drive, 0, 0); idescsi_end_request (drive, 0, 0);