Skip to content

Commit

Permalink
ide: add struct ide_tp_ops (take 2)
Browse files Browse the repository at this point in the history 
* Add struct ide_tp_ops for transport methods.

* Add 'const struct ide_tp_ops *tp_ops' to struct ide_port_info
  and ide_hwif_t.

* Set the default hwif->tp_ops in ide_init_port_data().

* Set host driver specific hwif->tp_ops in ide_init_port().

* Export ide_exec_command(), ide_read_status(), ide_read_altstatus(),
  ide_read_sff_dma_status(), ide_set_irq(), ide_tf_{load,read}()
  and ata_{in,out}put_data().

* Convert host drivers and core code to use struct ide_tp_ops.

* Remove no longer needed default_hwif_transport().

* Cleanup ide_hwif_t from methods that are now in struct ide_tp_ops.

While at it:

* Use struct ide_port_info in falconide.c and q40ide.c.

* Rename ata_{in,out}put_data() to ide_{in,out}put_data().

v2:

* Fix missing convertion in ns87415.c.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 23, 2008
1 parent d6276b5 commit 374e042
Show file tree
Hide file tree
Showing 23 changed files with 358 additions and 225 deletions.
2 changes: 1 addition & 1 deletion drivers/ide/arm/icside.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ static void icside_dma_timeout(ide_drive_t *drive)
if (icside_dma_test_irq(drive))
return;

ide_dump_status(drive, "DMA timeout", hwif->read_status(hwif));
ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));

icside_dma_end(drive);
}
Expand Down
26 changes: 16 additions & 10 deletions drivers/ide/h8300/ide-h8300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,21 @@ static void h8300_output_data(ide_drive_t *drive, struct request *rq,
mm_outsw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);
}

static const struct ide_tp_ops h8300_tp_ops = {
.exec_command = ide_exec_command,
.read_status = ide_read_status,
.read_altstatus = ide_read_altstatus,
.read_sff_dma_status = ide_read_sff_dma_status,

.set_irq = ide_set_irq,

.tf_load = h8300_tf_load,
.tf_read = h8300_tf_read,

.input_data = h8300_input_data,
.output_data = h8300_output_data,
};

#define H8300_IDE_GAP (2)

static inline void hw_setup(hw_regs_t *hw)
Expand All @@ -169,16 +184,8 @@ static inline void hw_setup(hw_regs_t *hw)
hw->chipset = ide_generic;
}

static inline void hwif_setup(ide_hwif_t *hwif)
{
hwif->tf_load = h8300_tf_load;
hwif->tf_read = h8300_tf_read;

hwif->input_data = h8300_input_data;
hwif->output_data = h8300_output_data;
}

static const struct ide_port_info h8300_port_info = {
.tp_ops = &h8300_tp_ops,
.host_flags = IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_NO_DMA,
};

Expand All @@ -205,7 +212,6 @@ static int __init h8300_ide_init(void)
return -ENOENT;

index = hwif->index;
hwif_setup(hwif);

idx[0] = index;

Expand Down
13 changes: 7 additions & 6 deletions drivers/ide/ide-atapi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
void (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned, int))
{
ide_hwif_t *hwif = drive->hwif;
const struct ide_tp_ops *tp_ops = hwif->tp_ops;
xfer_func_t *xferfunc;
unsigned int temp;
u16 bcount;
Expand All @@ -35,7 +36,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
}

/* Clear the interrupt */
stat = hwif->read_status(hwif);
stat = tp_ops->read_status(hwif);

if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
if (hwif->dma_ops->dma_end(drive) ||
Expand Down Expand Up @@ -140,7 +141,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
if (pc->sg)
io_buffers(drive, pc, temp, 0);
else
hwif->input_data(drive, NULL,
tp_ops->input_data(drive, NULL,
pc->cur_pos, temp);
printk(KERN_ERR "%s: transferred %d of "
"%d bytes\n",
Expand All @@ -157,9 +158,9 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc,
debug_log("The device wants to send us more data than "
"expected - allowing transfer\n");
}
xferfunc = hwif->input_data;
xferfunc = tp_ops->input_data;
} else
xferfunc = hwif->output_data;
xferfunc = tp_ops->output_data;

if ((drive->media == ide_floppy && !scsi && !pc->buf) ||
(drive->media == ide_tape && !scsi && pc->bh) ||
Expand Down Expand Up @@ -188,7 +189,7 @@ static u8 ide_read_ireason(ide_drive_t *drive)
memset(&task, 0, sizeof(task));
task.tf_flags = IDE_TFLAG_IN_NSECT;

drive->hwif->tf_read(drive, &task);
drive->hwif->tp_ops->tf_read(drive, &task);

return task.tf.nsect & 3;
}
Expand Down Expand Up @@ -249,7 +250,7 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,

/* Send the actual packet */
if ((pc->flags & PC_FLAG_ZIP_DRIVE) == 0)
hwif->output_data(drive, NULL, pc->c, 12);
hwif->tp_ops->output_data(drive, NULL, pc->c, 12);

return ide_started;
}
Expand Down
12 changes: 6 additions & 6 deletions drivers/ide/ide-cd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
int stat, err, sense_key;

/* check for errors */
stat = hwif->read_status(hwif);
stat = hwif->tp_ops->read_status(hwif);

if (stat_ret)
*stat_ret = stat;
Expand Down Expand Up @@ -590,7 +590,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive,
cmd_len = ATAPI_MIN_CDB_BYTES;

/* send the command to the device */
hwif->output_data(drive, NULL, rq->cmd, cmd_len);
hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);

/* start the DMA if need be */
if (info->dma)
Expand Down Expand Up @@ -627,7 +627,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq,
* Some drives (ASUS) seem to tell us that status info is
* available. Just get it and ignore.
*/
(void)hwif->read_status(hwif);
(void)hwif->tp_ops->read_status(hwif);
return 0;
} else {
/* drive wants a command packet, or invalid ireason... */
Expand Down Expand Up @@ -990,10 +990,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)

if (ireason == 0) {
write = 1;
xferfunc = hwif->output_data;
xferfunc = hwif->tp_ops->output_data;
} else {
write = 0;
xferfunc = hwif->input_data;
xferfunc = hwif->tp_ops->input_data;
}

/* transfer data */
Expand Down Expand Up @@ -1200,7 +1200,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
if (info->cd_flags & IDE_CD_FLAG_SEEKING) {
ide_hwif_t *hwif = drive->hwif;
unsigned long elapsed = jiffies - info->start_seek;
int stat = hwif->read_status(hwif);
int stat = hwif->tp_ops->read_status(hwif);

if ((stat & SEEK_STAT) != SEEK_STAT) {
if (elapsed < IDECD_SEEK_TIMEOUT) {
Expand Down
12 changes: 6 additions & 6 deletions drivers/ide/ide-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)
u8 stat = 0, dma_stat = 0;

dma_stat = hwif->dma_ops->dma_end(drive);
stat = hwif->read_status(hwif);
stat = hwif->tp_ops->read_status(hwif);

if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {
if (!dma_stat) {
Expand Down Expand Up @@ -335,7 +335,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
static int dma_timer_expiry (ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
u8 dma_stat = hwif->read_sff_dma_status(hwif);
u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);

printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",
drive->name, dma_stat);
Expand Down Expand Up @@ -370,7 +370,7 @@ void ide_dma_host_set(ide_drive_t *drive, int on)
{
ide_hwif_t *hwif = HWIF(drive);
u8 unit = (drive->select.b.unit & 0x01);
u8 dma_stat = hwif->read_sff_dma_status(hwif);
u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);

if (on)
dma_stat |= (1 << (5 + unit));
Expand Down Expand Up @@ -482,7 +482,7 @@ int ide_dma_setup(ide_drive_t *drive)
outb(reading, hwif->dma_base + ATA_DMA_CMD);

/* read DMA status for INTR & ERROR flags */
dma_stat = hwif->read_sff_dma_status(hwif);
dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);

/* clear INTR & ERROR flags */
if (mmio)
Expand Down Expand Up @@ -551,7 +551,7 @@ int __ide_dma_end (ide_drive_t *drive)
}

/* get DMA status */
dma_stat = hwif->read_sff_dma_status(hwif);
dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);

if (mmio)
/* clear the INTR & ERROR bits */
Expand All @@ -574,7 +574,7 @@ EXPORT_SYMBOL(__ide_dma_end);
int ide_dma_test_irq(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
u8 dma_stat = hwif->read_sff_dma_status(hwif);
u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);

/* return 1 if INTR asserted */
if ((dma_stat & 4) == 4)
Expand Down
8 changes: 4 additions & 4 deletions drivers/ide/ide-floppy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,9 @@ static void ide_floppy_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,

data = bvec_kmap_irq(bvec, &flags);
if (direction)
hwif->output_data(drive, NULL, data, count);
hwif->tp_ops->output_data(drive, NULL, data, count);
else
hwif->input_data(drive, NULL, data, count);
hwif->tp_ops->input_data(drive, NULL, data, count);
bvec_kunmap_irq(data, &flags);

bcount -= count;
Expand Down Expand Up @@ -402,7 +402,7 @@ static int idefloppy_transfer_pc(ide_drive_t *drive)
idefloppy_floppy_t *floppy = drive->driver_data;

/* Send the actual packet */
drive->hwif->output_data(drive, NULL, floppy->pc->c, 12);
drive->hwif->tp_ops->output_data(drive, NULL, floppy->pc->c, 12);

/* Timeout for the packet command */
return IDEFLOPPY_WAIT_CMD;
Expand Down Expand Up @@ -954,7 +954,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
u8 stat;

local_irq_save(flags);
stat = hwif->read_status(hwif);
stat = hwif->tp_ops->read_status(hwif);
local_irq_restore(flags);

progress_indication = ((stat & SEEK_STAT) == 0) ? 0 : 0x10000;
Expand Down
32 changes: 16 additions & 16 deletions drivers/ide/ide-io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
tf->error = err;
tf->status = stat;

drive->hwif->tf_read(drive, task);
drive->hwif->tp_ops->tf_read(drive, task);

if (task->tf_flags & IDE_TFLAG_DYN)
kfree(task);
Expand Down Expand Up @@ -381,7 +381,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
if (err == ABRT_ERR) {
if (drive->select.b.lba &&
/* some newer drives don't support WIN_SPECIFY */
hwif->read_status(hwif) == WIN_SPECIFY)
hwif->tp_ops->read_status(hwif) == WIN_SPECIFY)
return ide_stopped;
} else if ((err & BAD_CRC) == BAD_CRC) {
/* UDMA crc error, just retry the operation */
Expand All @@ -407,7 +407,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
return ide_stopped;
}

if (hwif->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
rq->errors |= ERROR_RESET;

if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
Expand All @@ -434,9 +434,9 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u
/* add decoding error stuff */
}

if (hwif->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
/* force an abort */
hwif->exec_command(hwif, WIN_IDLEIMMEDIATE);
hwif->tp_ops->exec_command(hwif, WIN_IDLEIMMEDIATE);

if (rq->errors >= ERROR_MAX) {
ide_kill_rq(drive, rq);
Expand Down Expand Up @@ -710,7 +710,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
#ifdef DEBUG
printk("%s: DRIVE_CMD (null)\n", drive->name);
#endif
ide_end_drive_cmd(drive, hwif->read_status(hwif),
ide_end_drive_cmd(drive, hwif->tp_ops->read_status(hwif),
ide_read_error(drive));

return ide_stopped;
Expand Down Expand Up @@ -755,7 +755,7 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
if (rc)
printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
SELECT_DRIVE(drive);
hwif->set_irq(hwif, 1);
hwif->tp_ops->set_irq(hwif, 1);
rc = ide_wait_not_busy(hwif, 100000);
if (rc)
printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
Expand Down Expand Up @@ -1042,7 +1042,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
* quirk_list may not like intr setups/cleanups
*/
if (drive->quirk_list != 1)
hwif->set_irq(hwif, 0);
hwif->tp_ops->set_irq(hwif, 0);
}
hwgroup->hwif = hwif;
hwgroup->drive = drive;
Expand Down Expand Up @@ -1142,7 +1142,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
(void)hwif->dma_ops->dma_end(drive);
ret = ide_error(drive, "dma timeout error",
hwif->read_status(hwif));
hwif->tp_ops->read_status(hwif));
} else {
printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
hwif->dma_ops->dma_timeout(drive);
Expand Down Expand Up @@ -1267,7 +1267,7 @@ void ide_timer_expiry (unsigned long data)
} else
startstop =
ide_error(drive, "irq timeout",
hwif->read_status(hwif));
hwif->tp_ops->read_status(hwif));
}
drive->service_time = jiffies - drive->service_start;
spin_lock_irq(&ide_lock);
Expand Down Expand Up @@ -1323,7 +1323,7 @@ static void unexpected_intr (int irq, ide_hwgroup_t *hwgroup)
*/
do {
if (hwif->irq == irq) {
stat = hwif->read_status(hwif);
stat = hwif->tp_ops->read_status(hwif);

if (!OK_STAT(stat, READY_STAT, BAD_STAT)) {
/* Try to not flood the console with msgs */
Expand Down Expand Up @@ -1414,7 +1414,7 @@ irqreturn_t ide_intr (int irq, void *dev_id)
* Whack the status register, just in case
* we have a leftover pending IRQ.
*/
(void)hwif->read_status(hwif);
(void)hwif->tp_ops->read_status(hwif);
#endif /* CONFIG_BLK_DEV_IDEPCI */
}
spin_unlock_irqrestore(&ide_lock, flags);
Expand Down Expand Up @@ -1531,9 +1531,9 @@ void ide_pktcmd_tf_load(ide_drive_t *drive, u32 tf_flags, u16 bcount, u8 dma)
task.tf.lbah = (bcount >> 8) & 0xff;

ide_tf_dump(drive->name, &task.tf);
hwif->set_irq(hwif, 1);
hwif->tp_ops->set_irq(hwif, 1);
SELECT_MASK(drive, 0);
hwif->tf_load(drive, &task);
hwif->tp_ops->tf_load(drive, &task);
}

EXPORT_SYMBOL_GPL(ide_pktcmd_tf_load);
Expand All @@ -1545,9 +1545,9 @@ void ide_pad_transfer(ide_drive_t *drive, int write, int len)

while (len > 0) {
if (write)
hwif->output_data(drive, NULL, buf, min(4, len));
hwif->tp_ops->output_data(drive, NULL, buf, min(4, len));
else
hwif->input_data(drive, NULL, buf, min(4, len));
hwif->tp_ops->input_data(drive, NULL, buf, min(4, len));
len -= 4;
}
}
Expand Down
Loading

0 comments on commit 374e042

Please sign in to comment.