Re: Please pull drivers/scsi/dec_esp.c from Linus' git

[Ralf Baechle <ralf@linux-mips.org>]

On Thu, Feb 16, 2006 at 10:17:38AM +0000, Maciej W. Rozycki wrote:
> Date:	Thu, 16 Feb 2006 10:17:38 +0000 (GMT)
> From:	"Maciej W. Rozycki" <macro@linux-mips.org>
> To:	Ralf Baechle <ralf@linux-mips.org>
> cc:	Martin Michlmayr <tbm@cyrius.com>, linux-mips@linux-mips.org
> Subject: Re: Please pull drivers/scsi/dec_esp.c from Linus' git
> Content-Type: TEXT/PLAIN; charset=US-ASCII
> 
> On Wed, 15 Feb 2006, Ralf Baechle wrote:
> 
> > > @@ -230,7 +230,7 @@
> > >  			mem_start = get_tc_base_addr(slot);
> > >  
> > >  			/* Store base addr into esp struct */
> > > -			esp->slot = mem_start;
> > > +			esp->slot = CPHYSADDR(mem_start);
> > >  
> > >  			esp->dregs = 0;
> > >  			esp->eregs = (void *)CKSEG1ADDR(mem_start +
> > 
> > I merged allmost all of the differences from mainline except this one.
> > 
> > Maciej, does this need the CPHYSADDR() op or not here?
> 
>  Of course not as get_tc_base_addr() returns a physical address these 
> days.  Thanks for spotting this bit.

Ok, I sent this bit upstream.

That still leaves below gem to sort out.

  Ralf

diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h
index 65a9b37..81d03d1 100644
--- a/drivers/scsi/NCR53C9x.h
+++ b/drivers/scsi/NCR53C9x.h
@@ -145,12 +145,7 @@
 
 #ifndef MULTIPLE_PAD_SIZES
 
-#ifdef CONFIG_CPU_HAS_WB
-#include <asm/wbflush.h>
-#define esp_write(__reg, __val) do{(__reg) = (__val); wbflush();} while(0)
-#else
-#define esp_write(__reg, __val) ((__reg) = (__val))
-#endif
+#define esp_write(__reg, __val) do{(__reg) = (__val); iob();} while(0)
 #define esp_read(__reg) (__reg)
 
 struct ESP_regs {