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

ide: add support for arbitrary transfer lengths to ide_pio_bytes()

Browse Source 
Add support for arbitrary transfer lengths to ide_pio_bytes()
and then inline ide_pio_multi() into ide_pio_datablock().

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
2009-03-31 20:14:59 +02:00
parent 2eba082709
commit 7a00798b1a
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
} }
static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
unsigned int write, unsigned int nr_bytes) unsigned int write, unsigned int len)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct scatterlist *sg = hwif->sg_table; struct scatterlist *sg = hwif->sg_table;
@@ -202,10 +202,14 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
u8 *buf; u8 *buf;
cursg = cmd->cursg; cursg = cmd->cursg;
if (!cursg) { if (cursg == NULL)
cursg = sg; cursg = cmd->cursg = sg;
cmd->cursg = sg;
} while (len) {
unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);
if (nr_bytes > PAGE_SIZE)
nr_bytes = PAGE_SIZE;
page = sg_page(cursg); page = sg_page(cursg);
offset = cursg->offset + cmd->cursg_ofs; offset = cursg->offset + cmd->cursg_ofs;
@@ -223,7 +227,7 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
cmd->cursg_ofs += nr_bytes; cmd->cursg_ofs += nr_bytes;
if (cmd->cursg_ofs == cursg->length) { if (cmd->cursg_ofs == cursg->length) {
cmd->cursg = sg_next(cmd->cursg); cursg = cmd->cursg = sg_next(cmd->cursg);
cmd->cursg_ofs = 0; cmd->cursg_ofs = 0;
} }
@@ -237,21 +241,16 @@ static void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
local_irq_restore(flags); local_irq_restore(flags);
#endif #endif
len -= nr_bytes;
} }
static void ide_pio_multi(ide_drive_t *drive, struct ide_cmd *cmd,
unsigned int write)
{
unsigned int nsect;
nsect = min_t(unsigned int, cmd->nleft >> 9, drive->mult_count);
while (nsect--)
ide_pio_bytes(drive, cmd, write, SECTOR_SIZE);
} }
static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd, static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
unsigned int write) unsigned int write)
{ {
unsigned int nr_bytes;
u8 saved_io_32bit = drive->io_32bit; u8 saved_io_32bit = drive->io_32bit;
if (cmd->tf_flags & IDE_TFLAG_FS) if (cmd->tf_flags & IDE_TFLAG_FS)
@@ -263,9 +262,11 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
touch_softlockup_watchdog(); touch_softlockup_watchdog();
if (cmd->tf_flags & IDE_TFLAG_MULTI_PIO) if (cmd->tf_flags & IDE_TFLAG_MULTI_PIO)
ide_pio_multi(drive, cmd, write); nr_bytes = min_t(unsigned, cmd->nleft, drive->mult_count << 9);
else else
ide_pio_bytes(drive, cmd, write, SECTOR_SIZE); nr_bytes = SECTOR_SIZE;
ide_pio_bytes(drive, cmd, write, nr_bytes);
drive->io_32bit = saved_io_32bit; drive->io_32bit = saved_io_32bit;
} }