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

ide-scsi: merge idescsi_input_buffers() and idescsi_output_buffers()

Browse Source 
* Merge idescsi_input_buffers() and idescsi_output_buffers()
  into ide_scsi_io_buffers() helper.

While at it:

* Log device name instead of driver name on error.

* Use xfer_func_t.

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:52 +02:00
parent 6c60bd8ea7
commit 3e52fb4d1f
1 changed files with 25 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,14 +129,15 @@ static inline idescsi_scsi_t *drive_to_idescsi(ide_drive_t *ide_drive)
#define IDESCSI_PC_RQ 90 #define IDESCSI_PC_RQ 90
/* /*
* PIO data transfer routines using the scatter gather table. * PIO data transfer routine using the scatter gather table.
*/ */
static void idescsi_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc, static void ide_scsi_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
unsigned int bcount) unsigned int bcount, int write)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
int count; xfer_func_t *xf = write ? hwif->output_data : hwif->input_data;
char *buf; char *buf;
int count;
while (bcount) { while (bcount) {
count = min(pc->sg->length - pc->b_count, bcount); count = min(pc->sg->length - pc->b_count, bcount);
@@ -145,13 +146,13 @@ static void idescsi_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
local_irq_save(flags); local_irq_save(flags);
buf = kmap_atomic(sg_page(pc->sg), KM_IRQ0) + buf = kmap_atomic(sg_page(pc->sg), KM_IRQ0) +
pc->sg->offset; pc->sg->offset;
hwif->input_data(drive, NULL, buf + pc->b_count, count); xf(drive, NULL, buf + pc->b_count, count);
kunmap_atomic(buf - pc->sg->offset, KM_IRQ0); kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
local_irq_restore(flags); local_irq_restore(flags);
} else { } else {
buf = sg_virt(pc->sg); buf = sg_virt(pc->sg);
hwif->input_data(drive, NULL, buf + pc->b_count, count); xf(drive, NULL, buf + pc->b_count, count);
} }
bcount -= count; pc->b_count += count; bcount -= count; pc->b_count += count;
if (pc->b_count == pc->sg->length) { if (pc->b_count == pc->sg->length) {
@@ -163,45 +164,10 @@ static void idescsi_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
} }
if (bcount) { if (bcount) {
printk (KERN_ERR "ide-scsi: scatter gather table too small, discarding data\n"); printk(KERN_ERR "%s: scatter gather table too small, %s\n",
ide_pad_transfer(drive, 0, bcount); drive->name, write ? "padding with zeros"
} : "discarding data");
} ide_pad_transfer(drive, write, bcount);
static void idescsi_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
unsigned int bcount)
{
ide_hwif_t *hwif = drive->hwif;
int count;
char *buf;
while (bcount) {
count = min(pc->sg->length - pc->b_count, bcount);
if (PageHighMem(sg_page(pc->sg))) {
unsigned long flags;
local_irq_save(flags);
buf = kmap_atomic(sg_page(pc->sg), KM_IRQ0) +
pc->sg->offset;
hwif->output_data(drive, NULL, buf + pc->b_count, count);
kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
local_irq_restore(flags);
} else {
buf = sg_virt(pc->sg);
hwif->output_data(drive, NULL, buf + pc->b_count, count);
}
bcount -= count; pc->b_count += count;
if (pc->b_count == pc->sg->length) {
if (!--pc->sg_cnt)
break;
pc->sg = sg_next(pc->sg);
pc->b_count = 0;
}
}
if (bcount) {
printk (KERN_ERR "ide-scsi: scatter gather table too small, padding with zeros\n");
ide_pad_transfer(drive, 1, bcount);
} }
} }
@@ -370,6 +336,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_atapi_pc *pc = scsi->pc; struct ide_atapi_pc *pc = scsi->pc;
struct request *rq = pc->rq; struct request *rq = pc->rq;
xfer_func_t *xferfunc;
unsigned int temp; unsigned int temp;
u16 bcount; u16 bcount;
u8 stat, ireason; u8 stat, ireason;
@@ -445,8 +412,8 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
temp = pc->buf_size - pc->xferred; temp = pc->buf_size - pc->xferred;
if (temp) { if (temp) {
if (pc->sg) if (pc->sg)
idescsi_input_buffers(drive, pc, ide_scsi_io_buffers(drive, pc,
temp); temp, 0);
else else
hwif->input_data(drive, NULL, hwif->input_data(drive, NULL,
pc->cur_pos, temp); pc->cur_pos, temp);
@@ -464,16 +431,16 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
printk (KERN_NOTICE "ide-scsi: The scsi wants to send us more data than expected - allowing transfer\n"); printk (KERN_NOTICE "ide-scsi: The scsi wants to send us more data than expected - allowing transfer\n");
#endif /* IDESCSI_DEBUG_LOG */ #endif /* IDESCSI_DEBUG_LOG */
} }
if (pc->sg) xferfunc = hwif->input_data;
idescsi_input_buffers(drive, pc, bcount); } else
else xferfunc = hwif->output_data;
hwif->input_data(drive, NULL, pc->cur_pos, bcount);
} else { if (pc->sg)
if (pc->sg) ide_scsi_io_buffers(drive, pc, bcount,
idescsi_output_buffers(drive, pc, bcount); !!(pc->flags & PC_FLAG_WRITING));
else else
hwif->output_data(drive, NULL, pc->cur_pos, bcount); xferfunc(drive, NULL, pc->cur_pos, bcount);
}
/* Update the current position */ /* Update the current position */
pc->xferred += bcount; pc->xferred += bcount;
pc->cur_pos += bcount; pc->cur_pos += bcount;