lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl()

Browse Source 
Also take care of fixing up incorrect TASKFILE_IN_DMA[Q] data phase when
IDE_DRIVE_TASK_RAW_WRITE is requested (no need to do it for TASKFILE_NO_DATA
and TASKFILE_[MULTI]_IN -- it had no chance of working previously).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-03-27 12:46:38 +01:00
parent b6308ee0c5
commit 04d09b0e62
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ide/ide-taskfile.c
View File

@@ -586,7 +586,14 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
if (req_task->in_flags.b.data) if (req_task->in_flags.b.data)
cmd.ftf_flags |= IDE_FTFLAG_IN_DATA; cmd.ftf_flags |= IDE_FTFLAG_IN_DATA;
switch(req_task->data_phase) { if (req_task->req_cmd == IDE_DRIVE_TASK_RAW_WRITE) {
/* fixup data phase if needed */
if (req_task->data_phase == TASKFILE_IN_DMAQ ||
req_task->data_phase == TASKFILE_IN_DMA)
cmd.data_phase = TASKFILE_OUT_DMA;
}
switch (cmd.data_phase) {
case TASKFILE_MULTI_OUT: case TASKFILE_MULTI_OUT:
if (!drive->mult_count) { if (!drive->mult_count) {
/* (hs): give up if multcount is not set */ /* (hs): give up if multcount is not set */
@@ -601,6 +608,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
/* fall through */ /* fall through */
case TASKFILE_OUT_DMAQ: case TASKFILE_OUT_DMAQ:
case TASKFILE_OUT_DMA: case TASKFILE_OUT_DMA:
cmd.tf_flags |= IDE_TFLAG_WRITE;
nsect = taskout / SECTOR_SIZE; nsect = taskout / SECTOR_SIZE;
data_buf = outbuf; data_buf = outbuf;
break; break;
@@ -641,9 +649,6 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg)
} }
} }
if (req_task->req_cmd == IDE_DRIVE_TASK_RAW_WRITE)
cmd.tf_flags |= IDE_TFLAG_WRITE;
err = ide_raw_taskfile(drive, &cmd, data_buf, nsect); err = ide_raw_taskfile(drive, &cmd, data_buf, nsect);
memcpy(req_task->hob_ports, &cmd.tf_array[0], memcpy(req_task->hob_ports, &cmd.tf_array[0],