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

ide: add ide_pktcmd_tf_load() helper

Browse Source 
Add ide_pktcmd_tf_load() helper and convert ATAPI device drivers to use it.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-01-25 22:17:13 +01:00
parent 932aead6d2
commit 2fc5738819
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/ide/ide-cd.c
View File

@@ -922,14 +922,8 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
info->dma = !hwif->dma_setup(drive); info->dma = !hwif->dma_setup(drive);
/* Set up the controller registers. */ /* Set up the controller registers. */
if (IDE_CONTROL_REG) ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL |
HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); IDE_TFLAG_NO_SELECT_MASK, xferlen, info->dma);
HWIF(drive)->OUTB(info->dma, IDE_FEATURE_REG);
HWIF(drive)->OUTB(0, IDE_IREASON_REG);
HWIF(drive)->OUTB(0, IDE_SECTOR_REG);
HWIF(drive)->OUTB(xferlen & 0xff, IDE_BCOUNTL_REG);
HWIF(drive)->OUTB(xferlen >> 8 , IDE_BCOUNTH_REG);
if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) { if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
/* waiting for CDB interrupt, not DMA yet. */ /* waiting for CDB interrupt, not DMA yet. */

9
drivers/ide/ide-floppy.c
View File

@@ -1067,13 +1067,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
dma = !hwif->dma_setup(drive); dma = !hwif->dma_setup(drive);
if (IDE_CONTROL_REG) ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK |
HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); IDE_TFLAG_OUT_DEVICE, bcount, dma);
/* Use PIO/DMA */
hwif->OUTB(dma, IDE_FEATURE_REG);
hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG);
hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG);
HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG);
if (dma) { /* Begin DMA, if necessary */ if (dma) { /* Begin DMA, if necessary */
set_bit(PC_DMA_IN_PROGRESS, &pc->flags); set_bit(PC_DMA_IN_PROGRESS, &pc->flags);

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

@@ -1734,3 +1734,19 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
} }
EXPORT_SYMBOL(ide_do_drive_cmd); EXPORT_SYMBOL(ide_do_drive_cmd);
void ide_pktcmd_tf_load(ide_drive_t *drive, u32 tf_flags, u16 bcount, u8 dma)
{
ide_task_t task;
memset(&task, 0, sizeof(task));
task.tf_flags = IDE_TFLAG_OUT_LBAH | IDE_TFLAG_OUT_LBAM |
IDE_TFLAG_OUT_FEATURE | tf_flags;
task.tf.feature = dma; /* Use PIO/DMA */
task.tf.lbam = bcount & 0xff;
task.tf.lbah = (bcount >> 8) & 0xff;
ide_tf_load(drive, &task);
}
EXPORT_SYMBOL_GPL(ide_pktcmd_tf_load);

9
drivers/ide/ide-tape.c
View File

@@ -2171,12 +2171,9 @@ static ide_startstop_t idetape_issue_packet_command (ide_drive_t *drive, idetape
if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
dma_ok = !hwif->dma_setup(drive); dma_ok = !hwif->dma_setup(drive);
if (IDE_CONTROL_REG) ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK |
hwif->OUTB(drive->ctl, IDE_CONTROL_REG); IDE_TFLAG_OUT_DEVICE, bcount, dma_ok);
hwif->OUTB(dma_ok ? 1 : 0, IDE_FEATURE_REG); /* Use PIO/DMA */
hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG);
hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG);
hwif->OUTB(drive->select.all, IDE_SELECT_REG);
if (dma_ok) /* Will begin DMA later */ if (dma_ok) /* Will begin DMA later */
set_bit(PC_DMA_IN_PROGRESS, &pc->flags); set_bit(PC_DMA_IN_PROGRESS, &pc->flags);
if (test_bit(IDETAPE_DRQ_INTERRUPT, &tape->flags)) { if (test_bit(IDETAPE_DRQ_INTERRUPT, &tape->flags)) {

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

@@ -590,12 +590,8 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
} }
SELECT_DRIVE(drive); SELECT_DRIVE(drive);
if (IDE_CONTROL_REG)
HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
hwif->OUTB(dma, IDE_FEATURE_REG); ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK, bcount, dma);
hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG);
hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG);
if (dma) if (dma)
set_bit(PC_DMA_OK, &pc->flags); set_bit(PC_DMA_OK, &pc->flags);

2
include/linux/ide.h
View File

@@ -968,6 +968,8 @@ extern void QUIRK_LIST(ide_drive_t *);
extern int drive_is_ready(ide_drive_t *); extern int drive_is_ready(ide_drive_t *);
void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8);
/* /*
* taskfile io for disks for now...and builds request from ide_ioctl * taskfile io for disks for now...and builds request from ide_ioctl
*/ */