lkml.org 
[lkml]   [2009]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 4/9] ide: move ide_dma_timeout_retry() to ide-dma.c
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH] ide: move ide_dma_timeout_retry() to ide-dma.c

    Move ide_dma_timeout_retry() to ide-dma.c and add static inline
    version for CONFIG_BLK_DEV_IDEDMA=n.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-dma.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
    drivers/ide/ide-io.c | 57 --------------------------------------------------
    include/linux/ide.h | 2 +
    3 files changed, 59 insertions(+), 57 deletions(-)

    Index: b/drivers/ide/ide-dma.c
    ===================================================================
    --- a/drivers/ide/ide-dma.c
    +++ b/drivers/ide/ide-dma.c
    @@ -464,6 +464,63 @@ void ide_dma_timeout(ide_drive_t *drive)
    }
    EXPORT_SYMBOL_GPL(ide_dma_timeout);

    +/*
    + * un-busy the port etc, and clear any pending DMA status. we want to
    + * retry the current request in pio mode instead of risking tossing it
    + * all away
    + */
    +ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
    +{
    + ide_hwif_t *hwif = drive->hwif;
    + struct request *rq;
    + ide_startstop_t ret = ide_stopped;
    +
    + /*
    + * end current dma transaction
    + */
    +
    + if (error < 0) {
    + 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->tp_ops->read_status(hwif));
    + } else {
    + printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
    + hwif->dma_ops->dma_timeout(drive);
    + }
    +
    + /*
    + * disable dma for now, but remember that we did so because of
    + * a timeout -- we'll reenable after we finish this next request
    + * (or rather the first chunk of it) in pio.
    + */
    + drive->dev_flags |= IDE_DFLAG_DMA_PIO_RETRY;
    + drive->retry_pio++;
    + ide_dma_off_quietly(drive);
    +
    + /*
    + * un-busy drive etc and make sure request is sane
    + */
    +
    + rq = hwif->rq;
    + if (!rq)
    + goto out;
    +
    + hwif->rq = NULL;
    +
    + rq->errors = 0;
    +
    + if (!rq->bio)
    + goto out;
    +
    + rq->sector = rq->bio->bi_sector;
    + rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;
    + rq->hard_cur_sectors = rq->current_nr_sectors;
    + rq->buffer = bio_data(rq->bio);
    +out:
    + return ret;
    +}
    +
    void ide_release_dma_engine(ide_hwif_t *hwif)
    {
    if (hwif->dmatable_cpu) {
    Index: b/drivers/ide/ide-io.c
    ===================================================================
    --- a/drivers/ide/ide-io.c
    +++ b/drivers/ide/ide-io.c
    @@ -816,63 +816,6 @@ plug_device_2:
    blk_plug_device(q);
    }

    -/*
    - * un-busy the port etc, and clear any pending DMA status. we want to
    - * retry the current request in pio mode instead of risking tossing it
    - * all away
    - */
    -static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
    -{
    - ide_hwif_t *hwif = drive->hwif;
    - struct request *rq;
    - ide_startstop_t ret = ide_stopped;
    -
    - /*
    - * end current dma transaction
    - */
    -
    - if (error < 0) {
    - 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->tp_ops->read_status(hwif));
    - } else {
    - printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
    - hwif->dma_ops->dma_timeout(drive);
    - }
    -
    - /*
    - * disable dma for now, but remember that we did so because of
    - * a timeout -- we'll reenable after we finish this next request
    - * (or rather the first chunk of it) in pio.
    - */
    - drive->dev_flags |= IDE_DFLAG_DMA_PIO_RETRY;
    - drive->retry_pio++;
    - ide_dma_off_quietly(drive);
    -
    - /*
    - * un-busy drive etc and make sure request is sane
    - */
    -
    - rq = hwif->rq;
    - if (!rq)
    - goto out;
    -
    - hwif->rq = NULL;
    -
    - rq->errors = 0;
    -
    - if (!rq->bio)
    - goto out;
    -
    - rq->sector = rq->bio->bi_sector;
    - rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;
    - rq->hard_cur_sectors = rq->current_nr_sectors;
    - rq->buffer = bio_data(rq->bio);
    -out:
    - return ret;
    -}
    -
    static void ide_plug_device(ide_drive_t *drive)
    {
    struct request_queue *q = drive->queue;
    Index: b/include/linux/ide.h
    ===================================================================
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -1465,6 +1465,7 @@ static inline int config_drive_for_dma(i

    void ide_dma_lost_irq(ide_drive_t *);
    void ide_dma_timeout(ide_drive_t *);
    +ide_startstop_t ide_dma_timeout_retry(ide_drive_t *, int);

    #else
    static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }
    @@ -1476,6 +1477,7 @@ static inline void ide_dma_on(ide_drive_
    static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
    static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
    static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
    +static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; }
    static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
    #endif /* CONFIG_BLK_DEV_IDEDMA */


    \
     
     \ /
      Last update: 2009-01-15 21:23    [W:0.028 / U:0.296 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site