Commit f094d4d8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: sanitize ide_build_sglist() and ide_destroy_dmatable()



* Move ide_map_sg() calls out from ide_build_sglist()
  to ide_dma_prepare().

* Pass command to ide_destroy_dmatable().

* Rename ide_build_sglist() to ide_dma_map_sg()
  and ide_destroy_dmatable() to ide_dma_unmap_sg().

There should be no functional changes caused by this patch.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 88b4132e
...@@ -326,6 +326,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) ...@@ -326,6 +326,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
{ {
struct ide_atapi_pc *pc = drive->pc; struct ide_atapi_pc *pc = drive->pc;
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_cmd *cmd = &hwif->cmd;
struct request *rq = hwif->rq; struct request *rq = hwif->rq;
const struct ide_tp_ops *tp_ops = hwif->tp_ops; const struct ide_tp_ops *tp_ops = hwif->tp_ops;
xfer_func_t *xferfunc; xfer_func_t *xferfunc;
...@@ -346,7 +347,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) ...@@ -346,7 +347,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
drive->waiting_for_dma = 0; drive->waiting_for_dma = 0;
rc = hwif->dma_ops->dma_end(drive); rc = hwif->dma_ops->dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
if (rc || (drive->media == ide_tape && (stat & ATA_ERR))) { if (rc || (drive->media == ide_tape && (stat & ATA_ERR))) {
if (drive->media == ide_floppy) if (drive->media == ide_floppy)
......
...@@ -640,7 +640,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) ...@@ -640,7 +640,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
drive->dma = 0; drive->dma = 0;
drive->waiting_for_dma = 0; drive->waiting_for_dma = 0;
dma_error = hwif->dma_ops->dma_end(drive); dma_error = hwif->dma_ops->dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
if (dma_error) { if (dma_error) {
printk(KERN_ERR PFX "%s: DMA %s error\n", drive->name, printk(KERN_ERR PFX "%s: DMA %s error\n", drive->name,
write ? "write" : "read"); write ? "write" : "read");
......
...@@ -89,17 +89,16 @@ static const struct drive_list_entry drive_blacklist[] = { ...@@ -89,17 +89,16 @@ static const struct drive_list_entry drive_blacklist[] = {
ide_startstop_t ide_dma_intr(ide_drive_t *drive) ide_startstop_t ide_dma_intr(ide_drive_t *drive)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_cmd *cmd = &hwif->cmd;
u8 stat = 0, dma_stat = 0; u8 stat = 0, dma_stat = 0;
drive->waiting_for_dma = 0; drive->waiting_for_dma = 0;
dma_stat = hwif->dma_ops->dma_end(drive); dma_stat = hwif->dma_ops->dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
stat = hwif->tp_ops->read_status(hwif); stat = hwif->tp_ops->read_status(hwif);
if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) { if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) {
if (!dma_stat) { if (!dma_stat) {
struct ide_cmd *cmd = &hwif->cmd;
if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
ide_finish_cmd(drive, cmd, stat); ide_finish_cmd(drive, cmd, stat);
else else
...@@ -119,8 +118,8 @@ int ide_dma_good_drive(ide_drive_t *drive) ...@@ -119,8 +118,8 @@ int ide_dma_good_drive(ide_drive_t *drive)
} }
/** /**
* ide_build_sglist - map IDE scatter gather for DMA I/O * ide_dma_map_sg - map IDE scatter gather for DMA I/O
* @drive: the drive to build the DMA table for * @drive: the drive to map the DMA table for
* @cmd: command * @cmd: command
* *
* Perform the DMA mapping magic necessary to access the source or * Perform the DMA mapping magic necessary to access the source or
...@@ -129,23 +128,19 @@ int ide_dma_good_drive(ide_drive_t *drive) ...@@ -129,23 +128,19 @@ int ide_dma_good_drive(ide_drive_t *drive)
* operate in a portable fashion. * operate in a portable fashion.
*/ */
static int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd) static int ide_dma_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct scatterlist *sg = hwif->sg_table; struct scatterlist *sg = hwif->sg_table;
int i; int i;
ide_map_sg(drive, cmd);
if (cmd->tf_flags & IDE_TFLAG_WRITE) if (cmd->tf_flags & IDE_TFLAG_WRITE)
cmd->sg_dma_direction = DMA_TO_DEVICE; cmd->sg_dma_direction = DMA_TO_DEVICE;
else else
cmd->sg_dma_direction = DMA_FROM_DEVICE; cmd->sg_dma_direction = DMA_FROM_DEVICE;
i = dma_map_sg(hwif->dev, sg, cmd->sg_nents, cmd->sg_dma_direction); i = dma_map_sg(hwif->dev, sg, cmd->sg_nents, cmd->sg_dma_direction);
if (i == 0) if (i) {
ide_map_sg(drive, cmd);
else {
cmd->orig_sg_nents = cmd->sg_nents; cmd->orig_sg_nents = cmd->sg_nents;
cmd->sg_nents = i; cmd->sg_nents = i;
} }
...@@ -154,7 +149,7 @@ static int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd) ...@@ -154,7 +149,7 @@ static int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd)
} }
/** /**
* ide_destroy_dmatable - clean up DMA mapping * ide_dma_unmap_sg - clean up DMA mapping
* @drive: The drive to unmap * @drive: The drive to unmap
* *
* Teardown mappings after DMA has completed. This must be called * Teardown mappings after DMA has completed. This must be called
...@@ -164,15 +159,14 @@ static int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd) ...@@ -164,15 +159,14 @@ static int ide_build_sglist(ide_drive_t *drive, struct ide_cmd *cmd)
* time. * time.
*/ */
void ide_destroy_dmatable(ide_drive_t *drive) void ide_dma_unmap_sg(ide_drive_t *drive, struct ide_cmd *cmd)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_cmd *cmd = &hwif->cmd;
dma_unmap_sg(hwif->dev, hwif->sg_table, cmd->orig_sg_nents, dma_unmap_sg(hwif->dev, hwif->sg_table, cmd->orig_sg_nents,
cmd->sg_dma_direction); cmd->sg_dma_direction);
} }
EXPORT_SYMBOL_GPL(ide_destroy_dmatable); EXPORT_SYMBOL_GPL(ide_dma_unmap_sg);
/** /**
* ide_dma_off_quietly - Generic DMA kill * ide_dma_off_quietly - Generic DMA kill
...@@ -471,6 +465,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ...@@ -471,6 +465,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
const struct ide_dma_ops *dma_ops = hwif->dma_ops; const struct ide_dma_ops *dma_ops = hwif->dma_ops;
struct ide_cmd *cmd = &hwif->cmd;
struct request *rq; struct request *rq;
ide_startstop_t ret = ide_stopped; ide_startstop_t ret = ide_stopped;
...@@ -482,7 +477,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ...@@ -482,7 +477,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
printk(KERN_WARNING "%s: DMA timeout error\n", drive->name); printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
drive->waiting_for_dma = 0; drive->waiting_for_dma = 0;
(void)dma_ops->dma_end(drive); (void)dma_ops->dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
ret = ide_error(drive, "dma timeout error", ret = ide_error(drive, "dma timeout error",
hwif->tp_ops->read_status(hwif)); hwif->tp_ops->read_status(hwif));
} else { } else {
...@@ -495,7 +490,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ...@@ -495,7 +490,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
hwif->tp_ops->read_status(hwif)); hwif->tp_ops->read_status(hwif));
drive->waiting_for_dma = 0; drive->waiting_for_dma = 0;
(void)dma_ops->dma_end(drive); (void)dma_ops->dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
} }
} }
...@@ -572,14 +567,19 @@ int ide_dma_prepare(ide_drive_t *drive, struct ide_cmd *cmd) ...@@ -572,14 +567,19 @@ int ide_dma_prepare(ide_drive_t *drive, struct ide_cmd *cmd)
const struct ide_dma_ops *dma_ops = drive->hwif->dma_ops; const struct ide_dma_ops *dma_ops = drive->hwif->dma_ops;
if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 || if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
(dma_ops->dma_check && dma_ops->dma_check(drive, cmd)) || (dma_ops->dma_check && dma_ops->dma_check(drive, cmd)))
ide_build_sglist(drive, cmd) == 0) goto out;
return 1; ide_map_sg(drive, cmd);
if (dma_ops->dma_setup(drive, cmd)) { if (ide_dma_map_sg(drive, cmd) == 0)
ide_destroy_dmatable(drive); goto out_map;
ide_map_sg(drive, cmd); if (dma_ops->dma_setup(drive, cmd))
return 1; goto out_dma_unmap;
}
drive->waiting_for_dma = 1; drive->waiting_for_dma = 1;
return 0; return 0;
out_dma_unmap:
ide_dma_unmap_sg(drive, cmd);
out_map:
ide_map_sg(drive, cmd);
out:
return 1;
} }
...@@ -277,11 +277,12 @@ static void sgiioc4_dma_host_set(ide_drive_t *drive, int on) ...@@ -277,11 +277,12 @@ static void sgiioc4_dma_host_set(ide_drive_t *drive, int on)
sgiioc4_clearirq(drive); sgiioc4_clearirq(drive);
} }
static void static void sgiioc4_resetproc(ide_drive_t *drive)
sgiioc4_resetproc(ide_drive_t * drive)
{ {
struct ide_cmd *cmd = &drive->hwif->cmd;
sgiioc4_dma_end(drive); sgiioc4_dma_end(drive);
ide_destroy_dmatable(drive); ide_dma_unmap_sg(drive, cmd);
sgiioc4_clearirq(drive); sgiioc4_clearirq(drive);
} }
......
...@@ -1445,8 +1445,7 @@ int ide_allocate_dma_engine(ide_hwif_t *); ...@@ -1445,8 +1445,7 @@ int ide_allocate_dma_engine(ide_hwif_t *);
void ide_release_dma_engine(ide_hwif_t *); void ide_release_dma_engine(ide_hwif_t *);
int ide_dma_prepare(ide_drive_t *, struct ide_cmd *); int ide_dma_prepare(ide_drive_t *, struct ide_cmd *);
void ide_dma_unmap_sg(ide_drive_t *, struct ide_cmd *);
void ide_destroy_dmatable(ide_drive_t *);
#ifdef CONFIG_BLK_DEV_IDEDMA_SFF #ifdef CONFIG_BLK_DEV_IDEDMA_SFF
int config_drive_for_dma(ide_drive_t *); int config_drive_for_dma(ide_drive_t *);
...@@ -1481,7 +1480,8 @@ static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int erro ...@@ -1481,7 +1480,8 @@ static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int erro
static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; } static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
static inline int ide_dma_prepare(ide_drive_t *drive, static inline int ide_dma_prepare(ide_drive_t *drive,
struct ide_cmd *cmd) { return 1; } struct ide_cmd *cmd) { return 1; }
static inline void ide_destroy_dmatable(ide_drive_t *drive) { ; } static inline void ide_dma_unmap_sg(ide_drive_t *drive,
struct ide_cmd *cmd) { ; }
#endif /* CONFIG_BLK_DEV_IDEDMA */ #endif /* CONFIG_BLK_DEV_IDEDMA */
#ifdef CONFIG_BLK_DEV_IDEACPI #ifdef CONFIG_BLK_DEV_IDEACPI
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment