Re: Don't miss the ARM-scsi fix.

[Russell King - ARM Linux <linux@arm.linux.org.uk>]

On Tue, Jul 03, 2007 at 12:21:45PM -0700, Andrew Morton wrote:
> On Tue, 3 Jul 2007 15:03:56 -0400
> Rob Landley <rob@landley.net> wrote:
> 
> > Just making sure this fix winds up in 2.6.23:
> 
> 2.6.22?
> 
> > http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=4454/1
> > 
> > It fixes a regression that occurred between 2.6.20 and 2.6.20-rc1.  Without 
> > it, qemu-system-arm can't use emulated SCSI drives.  It wasn't in -rc7, and 
> > the attached patch Works For Me (tm).
> 
> Should have cc'ed Russell?

It's been applied and is in my tree since yesterday.  I've no idea why
Rob feels that he needs to pull patches out of the patch system.

> > diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
> > index ba58223..ca82901 100644
> > --- a/arch/arm/mach-versatile/pci.c
> > +++ b/arch/arm/mach-versatile/pci.c
> > @@ -117,7 +117,10 @@ static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh
> >  	} else {
> >  		switch (size) {
> >  		case 1:
> > -			v = __raw_readb(addr);
> > +			v = __raw_readl(addr);
> > +			if (where & 2) v >>= 16;
> > +			if (where & 1) v >>= 8;
> 
> Someone's enter key broke?

Probably, but I'd rather have the fix in than worry about that at this
stage.