Re: IDE{,-SCSI} trouble [2.5.20]

[Russell King <rmk@arm.linux.org.uk>]

On Tue, Jun 04, 2002 at 02:37:55PM -0700, Adam J. Richter wrote:
> --- linux/drivers/ide/icside.c	2002-06-03 00:46:21.000000000 -0700
> +++ linux-2.5.20/drivers/ide/icside.c	2002-06-02 18:44:41.000000000 -0700
> @@ -275,9 +275,8 @@
>  #define NR_ENTRIES 256
>  #define TABLE_SIZE (NR_ENTRIES * 8)
>  
> -static int ide_build_sglist(struct ata_device *drive, struct request *rq)
> +static int ide_build_sglist(struct ata_channel *ch, struct request *rq)
>  {
> -	struct ata_channel *ch = drive->channel;
>  	struct scatterlist *sg = ch->sg_table;
>  	int nents;
>  

Umm, you sure this is right?  ide_build_sglist takes an ata_channel
argument in my 2.5.20.

If this is reversed, you also forgot to change where it is used in
icside.c.  Besides that, one of the recent changes from Martin broke
the driver rather disgustingly again.  The following patch fixes this
breakage such that:

1. we won't issue *WRITE* commands to the drive when trying to
   *READ* data from said drive.
2. allows icside.c to build again.

Luckily, (2) prevents its use in 2.5.20, which is a god-send given the
effects that (1) could have.  Martin, could you please be more careful
with your editing in future?  Maybe using '#error' if you're not able
to fix stuff up properly?

--- orig/drivers/ide/icside.c	Mon Jun  3 10:24:34 2002
+++ linux/drivers/ide/icside.c	Mon Jun  3 11:54:42 2002
@@ -517,33 +517,6 @@
 	return 0;
 }
 
-static int icside_dma_read(struct ata_device *drive, struct request *rq)
-{
-	struct ata_channel *ch = drive->channel;
-	unsigned int cmd;
-
-	if (icside_dma_common(drive, rq, DMA_MODE_READ))
-		return 1;
-
-	if (drive->type != ATA_DISK)
-		return 0;
-
-	ide_set_handler(drive, icside_dmaintr, WAIT_CMD, NULL);
-
-	if ((rq->flags & REQ_DRIVE_ACB) && drive->addressing == 1) {
-		struct ata_taskfile *args = rq->special;
-		cmd = args->taskfile.command;
-	} else if (drive->addressing) {
-		cmd = WIN_READDMA_EXT;
-	} else {
-		cmd = WIN_READDMA;
-	}
-
-	OUT_BYTE(cmd, IDE_COMMAND_REG);
-	enable_dma(ch->hw.dma);
-	return 0;
-}
-
 static int icside_dma_init(struct ata_device *drive, struct request *rq)
 {
 	struct ata_channel *ch = drive->channel;
@@ -559,11 +532,11 @@
 
 	if ((rq->flags & REQ_DRIVE_ACB) && drive->addressing == 1) {
 		struct ata_taskfile *args = rq->special;
-		cmd = args->taskfile.command;
+		cmd = args->cmd;
 	} else if (drive->addressing) {
-		cmd = WIN_WRITEDMA_EXT;
+		cmd = rq_data_dir(rq) == WRITE ? WIN_WRITEDMA_EXT : WIN_READDMA_EXT;
 	} else {
-		cmd = WIN_WRITEDMA;
+		cmd = rq_data_dir(rq) == WRITE ? WIN_WRITEDMA : WIN_READDMA;
 	}
 	OUT_BYTE(cmd, IDE_COMMAND_REG);
 


-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html