linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/4] it8213/piix/slc90e66: don't change DMA settings when programming PIO
@ 2007-07-20 10:25 Bartlomiej Zolnierkiewicz
  2007-07-20 17:31 ` Sergei Shtylyov
  0 siblings, 1 reply; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-07-20 10:25 UTC (permalink / raw)
  To: linux-ide


Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/pci/it8213.c   |   16 ++++++----------
 drivers/ide/pci/piix.c     |   17 +++++++----------
 drivers/ide/pci/slc90e66.c |   17 +++++++----------
 3 files changed, 20 insertions(+), 30 deletions(-)

Index: b/drivers/ide/pci/it8213.c
===================================================================
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -134,6 +134,11 @@ static int it8213_tune_chipset(ide_drive
 	u16			reg4042, reg4a;
 	u8			reg48, reg54, reg55;
 
+	if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
+		it8213_tune_pio(drive, speed - XFER_PIO_0);
+		return ide_config_drive_speed(drive, speed);
+	}
+
 	pci_read_config_word(dev, maslave, &reg4042);
 	pci_read_config_byte(dev, 0x48, &reg48);
 	pci_read_config_word(dev, 0x4a, &reg4a);
@@ -153,12 +158,6 @@ static int it8213_tune_chipset(ide_drive
 		case XFER_MW_DMA_1:
 		case XFER_SW_DMA_2:
 			break;
-		case XFER_PIO_4:
-		case XFER_PIO_3:
-		case XFER_PIO_2:
-		case XFER_PIO_1:
-		case XFER_PIO_0:
-			break;
 		default:
 			return -1;
 	}
@@ -190,10 +189,7 @@ static int it8213_tune_chipset(ide_drive
 			pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
 	}
 
-	if (speed > XFER_PIO_4)
-		it8213_tune_pio(drive, it8213_dma_2_pio(speed));
-	else
-		it8213_tune_pio(drive, speed - XFER_PIO_0);
+	it8213_tune_pio(drive, it8213_dma_2_pio(speed));
 
 	return ide_config_drive_speed(drive, speed);
 }
Index: b/drivers/ide/pci/piix.c
===================================================================
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/piix.c	Version 0.51	Jul 6, 2007
+ *  linux/drivers/ide/pci/piix.c	Version 0.52	Jul 14, 2007
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
@@ -243,6 +243,11 @@ static int piix_tune_chipset(ide_drive_t
 	u16			reg4042, reg4a;
 	u8			reg48, reg54, reg55;
 
+	if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
+		piix_tune_pio(drive, speed - XFER_PIO_0);
+		return ide_config_drive_speed(drive, speed);
+	}
+
 	pci_read_config_word(dev, maslave, &reg4042);
 	sitre = (reg4042 & 0x4000) ? 1 : 0;
 	pci_read_config_byte(dev, 0x48, &reg48);
@@ -260,11 +265,6 @@ static int piix_tune_chipset(ide_drive_t
 		case XFER_MW_DMA_2:
 		case XFER_MW_DMA_1:
 		case XFER_SW_DMA_2:	break;
-		case XFER_PIO_4:
-		case XFER_PIO_3:
-		case XFER_PIO_2:
-		case XFER_PIO_1:
-		case XFER_PIO_0:	break;
 		default:		return -1;
 	}
 
@@ -294,10 +294,7 @@ static int piix_tune_chipset(ide_drive_t
 			pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
 	}
 
-	if (speed > XFER_PIO_4)
-		piix_tune_pio(drive, piix_dma_2_pio(speed));
-	else
-		piix_tune_pio(drive, speed - XFER_PIO_0);
+	piix_tune_pio(drive, piix_dma_2_pio(speed));
 
 	return ide_config_drive_speed(drive, speed);
 }
Index: b/drivers/ide/pci/slc90e66.c
===================================================================
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c	Version 0.15	Jul 6, 2007
+ *  linux/drivers/ide/pci/slc90e66.c	Version 0.16	Jul 14, 2007
  *
  *  Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
@@ -110,6 +110,11 @@ static int slc90e66_tune_chipset(ide_dri
 	int u_speed = 0, u_flag = 1 << drive->dn;
 	u16			reg4042, reg44, reg48, reg4a;
 
+	if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
+		slc90e66_tune_pio(drive, speed - XFER_PIO_0);
+		return ide_config_drive_speed(drive, speed);
+	}
+
 	pci_read_config_word(dev, maslave, &reg4042);
 	sitre = (reg4042 & 0x4000) ? 1 : 0;
 	pci_read_config_word(dev, 0x44, &reg44);
@@ -125,11 +130,6 @@ static int slc90e66_tune_chipset(ide_dri
 		case XFER_MW_DMA_2:
 		case XFER_MW_DMA_1:
 		case XFER_SW_DMA_2:	break;
-		case XFER_PIO_4:
-		case XFER_PIO_3:
-		case XFER_PIO_2:
-		case XFER_PIO_1:
-		case XFER_PIO_0:        break;
 		default:		return -1;
 	}
 
@@ -149,10 +149,7 @@ static int slc90e66_tune_chipset(ide_dri
 			pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
 	}
 
-	if (speed > XFER_PIO_4)
-		slc90e66_tune_pio(drive, slc90e66_dma_2_pio(speed));
-	else
-		slc90e66_tune_pio(drive, speed - XFER_PIO_0);
+	slc90e66_tune_pio(drive, slc90e66_dma_2_pio(speed));
 
 	return ide_config_drive_speed(drive, speed);
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] it8213/piix/slc90e66: don't change DMA settings when programming PIO
  2007-07-20 10:25 [PATCH 2/4] it8213/piix/slc90e66: don't change DMA settings when programming PIO Bartlomiej Zolnierkiewicz
@ 2007-07-20 17:31 ` Sergei Shtylyov
  2007-07-22 18:47   ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2007-07-20 17:31 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide

Bartlomiej Zolnierkiewicz wrote:

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> Index: b/drivers/ide/pci/it8213.c
> ===================================================================
> --- a/drivers/ide/pci/it8213.c
> +++ b/drivers/ide/pci/it8213.c
> @@ -134,6 +134,11 @@ static int it8213_tune_chipset(ide_drive
>  	u16			reg4042, reg4a;
>  	u8			reg48, reg54, reg55;
>  
> +	if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
> +		it8213_tune_pio(drive, speed - XFER_PIO_0);
> +		return ide_config_drive_speed(drive, speed);
> +	}
> +
>  	pci_read_config_word(dev, maslave, &reg4042);
>  	pci_read_config_byte(dev, 0x48, &reg48);
>  	pci_read_config_word(dev, 0x4a, &reg4a);
> @@ -153,12 +158,6 @@ static int it8213_tune_chipset(ide_drive
>  		case XFER_MW_DMA_1:
>  		case XFER_SW_DMA_2:
>  			break;
> -		case XFER_PIO_4:
> -		case XFER_PIO_3:
> -		case XFER_PIO_2:
> -		case XFER_PIO_1:
> -		case XFER_PIO_0:
> -			break;

    Erm, why nmot just change this part, i.e. call it8213_tune_pio() and
ide_config_drive_speed() here? Would have been simpler...

>  		default:
>  			return -1;
>  	}
> @@ -190,10 +189,7 @@ static int it8213_tune_chipset(ide_drive
>  			pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
>  	}
>  
> -	if (speed > XFER_PIO_4)
> -		it8213_tune_pio(drive, it8213_dma_2_pio(speed));
> -	else
> -		it8213_tune_pio(drive, speed - XFER_PIO_0);
> +	it8213_tune_pio(drive, it8213_dma_2_pio(speed));
>  
>  	return ide_config_drive_speed(drive, speed);
>  }
[...]

    The same comment for 2 other drivers...

MBR, Sergei

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] it8213/piix/slc90e66: don't change DMA settings when programming PIO
  2007-07-20 17:31 ` Sergei Shtylyov
@ 2007-07-22 18:47   ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2007-07-22 18:47 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: linux-ide

On Friday 20 July 2007, Sergei Shtylyov wrote:
> Bartlomiej Zolnierkiewicz wrote:
> 
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> 
> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

added

> > Index: b/drivers/ide/pci/it8213.c
> > ===================================================================
> > --- a/drivers/ide/pci/it8213.c
> > +++ b/drivers/ide/pci/it8213.c
> > @@ -134,6 +134,11 @@ static int it8213_tune_chipset(ide_drive
> >  	u16			reg4042, reg4a;
> >  	u8			reg48, reg54, reg55;
> >  
> > +	if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
> > +		it8213_tune_pio(drive, speed - XFER_PIO_0);
> > +		return ide_config_drive_speed(drive, speed);
> > +	}
> > +
> >  	pci_read_config_word(dev, maslave, &reg4042);
> >  	pci_read_config_byte(dev, 0x48, &reg48);
> >  	pci_read_config_word(dev, 0x4a, &reg4a);
> > @@ -153,12 +158,6 @@ static int it8213_tune_chipset(ide_drive
> >  		case XFER_MW_DMA_1:
> >  		case XFER_SW_DMA_2:
> >  			break;
> > -		case XFER_PIO_4:
> > -		case XFER_PIO_3:
> > -		case XFER_PIO_2:
> > -		case XFER_PIO_1:
> > -		case XFER_PIO_0:
> > -			break;
> 
>     Erm, why nmot just change this part, i.e. call it8213_tune_pio() and
> ide_config_drive_speed() here? Would have been simpler...

to get rid of unnecessary PCI reads

> >  		default:
> >  			return -1;
> >  	}
> > @@ -190,10 +189,7 @@ static int it8213_tune_chipset(ide_drive
> >  			pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);
> >  	}
> >  
> > -	if (speed > XFER_PIO_4)
> > -		it8213_tune_pio(drive, it8213_dma_2_pio(speed));
> > -	else
> > -		it8213_tune_pio(drive, speed - XFER_PIO_0);
> > +	it8213_tune_pio(drive, it8213_dma_2_pio(speed));
> >  
> >  	return ide_config_drive_speed(drive, speed);
> >  }
> [...]
> 
>     The same comment for 2 other drivers...

ditto

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-22 18:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-20 10:25 [PATCH 2/4] it8213/piix/slc90e66: don't change DMA settings when programming PIO Bartlomiej Zolnierkiewicz
2007-07-20 17:31 ` Sergei Shtylyov
2007-07-22 18:47   ` Bartlomiej Zolnierkiewicz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).