Commit 11998b31 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move ide_map_sg() call out of ->dma_setup method (take 2) 



Move ide_map_sg() call from ->dma_setup implementations and
ide_destroy_dmatable() one from *_build_dmatable() to ide_dma_prepare().

There should be no functional changes caused by this patch.

Sergei:
Removed 'use_pio_instead' labels and replaced 'goto' with 'return 0' --
that required no changes to the follow-up patches...

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

drivers/ide/au1xxx-ide.c

+2 −7
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 
			if (++count >= PRD_ENTRIES) {

				printk(KERN_WARNING "%s: DMA table too small\n",

				       drive->name);

				goto use_pio_instead;

				return 0;

			}



			/* Lets enable intr for the last descriptor only */
@@ -272,9 +272,6 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 
	if (count)

		return 1;



 use_pio_instead:

	ide_destroy_dmatable(drive);



	return 0; /* revert to PIO for this request */

}
@@ -290,10 +287,8 @@ static void auide_dma_start(ide_drive_t *drive ) 


static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)

{

	if (auide_build_dmatable(drive, cmd) == 0) {

		ide_map_sg(drive, cmd);

	if (auide_build_dmatable(drive, cmd) == 0)

		return 1;

	}



	drive->waiting_for_dma = 1;

	return 0;

drivers/ide/ide-dma-sff.c

+0 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ use_pio_instead: 
	printk(KERN_ERR "%s: %s\n", drive->name,

		count ? "DMA table too small" : "empty DMA table?");



	ide_destroy_dmatable(drive);



	return 0; /* revert to PIO for this request */

}

EXPORT_SYMBOL_GPL(ide_build_dmatable);

drivers/ide/ide-dma.c

+6 −2
Original line number Diff line number Diff line
@@ -570,8 +570,12 @@ int ide_dma_prepare(ide_drive_t *drive, struct ide_cmd *cmd) 


	if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||

	    (dma_ops->dma_check && dma_ops->dma_check(drive, cmd)) ||

	    ide_build_sglist(drive, cmd) == 0 ||

	    dma_ops->dma_setup(drive, cmd))

	    ide_build_sglist(drive, cmd) == 0)

		return 1;

	if (dma_ops->dma_setup(drive, cmd)) {

		ide_destroy_dmatable(drive);

		ide_map_sg(drive, cmd);

		return 1;

	}

	return 0;

}

drivers/ide/pmac.c

+3 −8
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 
				       "switching to PIO on Ohare chipset\n", drive->name);

				pmif->broken_dma_warn = 1;

			}

			goto use_pio_instead;

			return 0;

		}

		while (cur_len) {

			unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00;
@@ -1463,7 +1463,7 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 
			if (count++ >= MAX_DCMDS) {

				printk(KERN_WARNING "%s: DMA table too small\n",

				       drive->name);

				goto use_pio_instead;

				return 0;

			}

			st_le16(&table->command, wr? OUTPUT_MORE: INPUT_MORE);

			st_le16(&table->req_count, tc);
@@ -1492,9 +1492,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) 


	printk(KERN_DEBUG "%s: empty DMA table?\n", drive->name);



use_pio_instead:

	ide_destroy_dmatable(drive);



	return 0; /* revert to PIO for this request */

}
@@ -1510,10 +1507,8 @@ static int pmac_ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) 
	u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4);

	u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);



	if (pmac_ide_build_dmatable(drive, cmd) == 0) {

		ide_map_sg(drive, cmd);

	if (pmac_ide_build_dmatable(drive, cmd) == 0)

		return 1;

	}



	/* Apple adds 60ns to wrDataSetup on reads */

	if (ata4 && (pmif->timings[unit] & TR_66_UDMA_EN)) {

drivers/ide/scc_pata.c

+1 −3
Original line number Diff line number Diff line
@@ -321,10 +321,8 @@ static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) 
	u8 dma_stat;



	/* fall back to pio! */

	if (ide_build_dmatable(drive, cmd) == 0) {

		ide_map_sg(drive, cmd);

	if (ide_build_dmatable(drive, cmd) == 0)

		return 1;

	}



	/* PRD table */

	out_be32((void __iomem *)(hwif->dma_base + 8), hwif->dmatable_dma);

CRA Git | Maintained and supported by SUSTech CRA and CCSE