Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ca5377 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b6a45a0b

drivers/ide/ide-dma.c

+57 −0
Original line number Diff line number Diff line
@@ -470,6 +470,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) {

drivers/ide/ide-io.c

+0 −57
Original line number Diff line number Diff line
@@ -819,63 +819,6 @@ void do_ide_request(struct request_queue *q) 
		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;

include/linux/ide.h

+2 −0
Original line number Diff line number Diff line
@@ -1467,6 +1467,7 @@ static inline int config_drive_for_dma(ide_drive_t *drive) { return 0; } 


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; }
@@ -1478,6 +1479,7 @@ static inline void ide_dma_on(ide_drive_t *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 */