[patch 14/17] aic7xxx: ahc_pci_write_config() fix

[patch 14/17] aic7xxx: ahc_pci_write_config() fix

[akpm]

From: Denis Vlasenko <vda@ilport.com.ua>

Fix ahc_pci_write_config's (wrong order of arguments).

Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/aic7xxx/aic7xxx_pci.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff -puN drivers/scsi/aic7xxx/aic7xxx_pci.c~aic7xxx-ahc_pci_write_config-fix drivers/scsi/aic7xxx/aic7xxx_pci.c
--- devel/drivers/scsi/aic7xxx/aic7xxx_pci.c~aic7xxx-ahc_pci_write_config-fix	2006-04-10 00:19:55.000000000 -0700
+++ devel-akpm/drivers/scsi/aic7xxx/aic7xxx_pci.c	2006-04-10 00:19:55.000000000 -0700
@@ -2036,12 +2036,12 @@ ahc_pci_resume(struct ahc_softc *ahc)
 	 * that the OS doesn't know about and rely on our chip
 	 * reset handler to handle the rest.
 	 */
-	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4,
-			     ahc->bus_softc.pci_softc.devconfig);
-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1,
-			     ahc->bus_softc.pci_softc.command);
-	ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1,
-			     ahc->bus_softc.pci_softc.csize_lattime);
+	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG,
+			     ahc->bus_softc.pci_softc.devconfig, /*bytes*/4);
+	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
+			     ahc->bus_softc.pci_softc.command, /*bytes*/1);
+	ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME,
+			     ahc->bus_softc.pci_softc.csize_lattime, /*bytes*/1);
 	if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) {
 		struct	seeprom_descriptor sd;
 		u_int	sxfrctl1;
_

Re: [patch 14/17] aic7xxx: ahc_pci_write_config() fix

[Chiaki]

Can anyone explain with these incorrect(?) calls
how the current aic7xxx has been working for me for a few months?
Sorry, I am not using the latest and greatest kernel version, still...

Linux duron 2.6.15.6-test-tmscsim #6 Wed Mar 29 02:02:01 JST 2006 i686 GNU/Linux

And the version of aci7xxx driver : from the
output of demsg:
scsi0 : Adaptec AIC7XXX EISA/VLB/PCI SCSI HBA DRIVER, Rev 7.0


Are these parameters one of those not so important
parameters? Yet, it might explain the problem of Mutt Hamlet and
a few others.




akpm@osdl.org wrote:
> From: Denis Vlasenko <vda@ilport.com.ua>
> 
> Fix ahc_pci_write_config's (wrong order of arguments).
> 
> Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
> Cc: James Bottomley <James.Bottomley@steeleye.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
> 
>  drivers/scsi/aic7xxx/aic7xxx_pci.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff -puN drivers/scsi/aic7xxx/aic7xxx_pci.c~aic7xxx-ahc_pci_write_config-fix drivers/scsi/aic7xxx/aic7xxx_pci.c
> --- devel/drivers/scsi/aic7xxx/aic7xxx_pci.c~aic7xxx-ahc_pci_write_config-fix	2006-04-10 00:19:55.000000000 -0700
> +++ devel-akpm/drivers/scsi/aic7xxx/aic7xxx_pci.c	2006-04-10 00:19:55.000000000 -0700
> @@ -2036,12 +2036,12 @@ ahc_pci_resume(struct ahc_softc *ahc)
>  	 * that the OS doesn't know about and rely on our chip
>  	 * reset handler to handle the rest.
>  	 */
> -	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4,
> -			     ahc->bus_softc.pci_softc.devconfig);
> -	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1,
> -			     ahc->bus_softc.pci_softc.command);
> -	ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1,
> -			     ahc->bus_softc.pci_softc.csize_lattime);
> +	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG,
> +			     ahc->bus_softc.pci_softc.devconfig, /*bytes*/4);
> +	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
> +			     ahc->bus_softc.pci_softc.command, /*bytes*/1);
> +	ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME,
> +			     ahc->bus_softc.pci_softc.csize_lattime, /*bytes*/1);
>  	if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) {
>  		struct	seeprom_descriptor sd;
>  		u_int	sxfrctl1;
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 


-- 
int main(void){int j=2006;/*(c)2006 cishikawa. */
char t[] ="<CI> @abcdefghijklmnopqrstuvwxyz.,\n\"";
char *i ="d>qtCIuqivb,gCwe\np@.ietCIuqi\"tqkvv is>dnamz";
while(*i)((j+=(int)strchr(t,*i++)-(int)t),(j%=sizeof t-1),
(putchar(t[j])));return 0;}/* under GPL */

Re: [patch 14/17] aic7xxx: ahc_pci_write_config() fix

[James Bottomley]

On Fri, 2006-04-21 at 03:59 +0900, Chiaki wrote:
> Can anyone explain with these incorrect(?) calls
> how the current aic7xxx has been working for me for a few months?
> Sorry, I am not using the latest and greatest kernel version, still...

The problem calls are in the resume method ... If you don't suspend your
system, you won't see them.

James