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

Commit 6ffb6641 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-floppy: start DMA engine in idefloppy_transfer_pc1() 



Start DMA engine and set PC_FLAG_DMA_IN_PROGRESS flag in
idefloppy_transfer_pc1() instead of idefloppy_issue_pc()
so the Status Register and the Interrupt Reason Register
are checked first.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5e331095

drivers/ide/ide-floppy.c

+10 −6
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	idefloppy_floppy_t *floppy = drive->driver_data;

	struct ide_atapi_pc *pc = floppy->pc;

	ide_expiry_t *expiry;

	unsigned int timeout;

	ide_startstop_t startstop;
@@ -568,6 +569,12 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive) 


	ide_set_handler(drive, &idefloppy_pc_intr, timeout, expiry);



	/* Begin DMA, if necessary */

	if (pc->flags & PC_FLAG_DMA_OK) {

		pc->flags |= PC_FLAG_DMA_IN_PROGRESS;

		hwif->dma_ops->dma_start(drive);

	}



	if ((floppy->flags & IDEFLOPPY_FLAG_ZIP_DRIVE) == 0)

		/* Send the actual packet */

		hwif->output_data(drive, NULL, floppy->pc->c, 12);
@@ -633,13 +640,10 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, 
	if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma)

		dma = !hwif->dma_ops->dma_setup(drive);



	ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma);

	if (!dma)

		pc->flags &= ~PC_FLAG_DMA_OK;



	if (dma) {

		/* Begin DMA, if necessary */

		pc->flags |= PC_FLAG_DMA_IN_PROGRESS;

		hwif->dma_ops->dma_start(drive);

	}

	ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma);



	if (floppy->flags & IDEFLOPPY_FLAG_DRQ_INTERRUPT) {

		/* Issue the packet command */