linux-mips
[Top] [All Lists]

Re: [patch] 2.4: Revert interface removal

To: Ralf Baechle <ralf@oss.sgi.com>, "Maciej W. Rozycki" <macro@ds2.pg.gda.pl>, linux-mips@oss.sgi.com
Subject: Re: [patch] 2.4: Revert interface removal
From: Carsten Langgaard <carstenl@mips.com>
Date: Mon, 05 Aug 2002 15:04:13 +0200
References: <Pine.GSO.3.96.1020805105624.18894C-100000@delta.ds2.pg.gda.pl> <20020805124154.B6365@dea.linux-mips.net> <3D4E5BFE.595DA175@mips.com> <3D4E6743.58776F67@mips.com>
Sender: owner-linux-mips@oss.sgi.com
Ok, I finally figured out what the problem is.
The attached patch fix the problems, please apply.

/Carsten



Carsten Langgaard wrote:

> Ralf, could we please revert the latest changes to 
> include/asm-mips/scatterlist.h
> and include/asm-mips/pci.h
>
> /Carsten
>
> Carsten Langgaard wrote:
>
> > Changing the scatterlist and the pci functions seems to break things in the 
> > IDE
> > interface.
> >
> > /Carsten
> >
> > Ralf Baechle wrote:
> >
> > > On Mon, Aug 05, 2002 at 11:05:40AM +0200, Maciej W. Rozycki wrote:
> > >
> > > >  A recent change to include/asm-mips/scatterlist.h broke
> > > > drivers/scsi/dec_esp.c.  Since 2.4.19 is not the proper version to 
> > > > remove
> > > > interfaces, I'm going to check in the following patch to the 2.4 branch 
> > > > to
> > > > revert the change (with a slightly sanitized type for the dvma_address
> > > > member).
> > > >
> > > >  Any objections?
> > >
> > > Sorry for simply removing the structure, that was an accident.  The
> > > question why the use of struct mmu_sglist still hasn't been replaced by
> > > newer interfaces stays ...
> > >
> > > So please go ahead and commit your patch.
> > >
> > >   Ralf
> >
> > --
> > _    _ ____  ___   Carsten Langgaard Mailto:carstenl@mips.com
> > |\  /|||___)(___   MIPS Denmark        Direct: +45 4486 5527
> > | \/ |||    ____)  Lautrupvang 4B      Switch: +45 4486 5555
> >   TECHNOLOGIES     2750 Ballerup       Fax...: +45 4486 5556
> >                    Denmark           http://www.mips.com
>
> --
> _    _ ____  ___   Carsten Langgaard  Mailto:carstenl@mips.com
> |\  /|||___)(___   MIPS Denmark        Direct: +45 4486 5527
> | \/ |||    ____)  Lautrupvang 4B      Switch: +45 4486 5555
>   TECHNOLOGIES     2750 Ballerup       Fax...: +45 4486 5556
>                    Denmark            http://www.mips.com

--
_    _ ____  ___   Carsten Langgaard   Mailto:carstenl@mips.com
|\  /|||___)(___   MIPS Denmark        Direct: +45 4486 5527
| \/ |||    ____)  Lautrupvang 4B      Switch: +45 4486 5555
  TECHNOLOGIES     2750 Ballerup       Fax...: +45 4486 5556
                   Denmark             http://www.mips.com


Index: arch/mips/kernel/pci-dma.c
===================================================================
RCS file: /cvs/linux/arch/mips/kernel/pci-dma.c,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 pci-dma.c
--- arch/mips/kernel/pci-dma.c  2002/08/01 12:40:14     1.7.2.1
+++ arch/mips/kernel/pci-dma.c  2002/08/05 12:54:19
@@ -30,11 +30,11 @@
 
        if (ret != NULL) {
                memset(ret, 0, size);
+               *dma_handle = virt_to_bus(ret);
 #ifdef CONFIG_NONCOHERENT_IO
                dma_cache_wback_inv((unsigned long) ret, size);
                ret = UNCAC_ADDR(ret);
 #endif
-               *dma_handle = virt_to_bus(ret);
        }
 
        return ret;
Index: include/asm-mips/page.h
===================================================================
RCS file: /cvs/linux/include/asm-mips/page.h,v
retrieving revision 1.14.2.9
diff -u -r1.14.2.9 page.h
--- include/asm-mips/page.h     2002/08/01 12:40:14     1.14.2.9
+++ include/asm-mips/page.h     2002/08/05 12:54:32
@@ -125,8 +125,8 @@
 #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#define UNCAC_ADDR(addr)       ((addr) - (PAGE_OFFSET + UNCAC_BASE))
-#define CAC_ADDR(addr)         ((addr) - (UNCAC_BASE + PAGE_OFFSET))
+#define UNCAC_ADDR(addr)       ((addr) - PAGE_OFFSET + UNCAC_BASE)
+#define CAC_ADDR(addr)         ((addr) - UNCAC_BASE + PAGE_OFFSET)
 
 /*
  * Memory above this physical address will be considered highmem.
Index: include/asm-mips/pci.h
===================================================================
RCS file: /cvs/linux/include/asm-mips/pci.h,v
retrieving revision 1.24.2.7
diff -u -r1.24.2.7 pci.h
--- include/asm-mips/pci.h      2002/08/01 12:40:14     1.24.2.7
+++ include/asm-mips/pci.h      2002/08/05 12:54:32
@@ -180,7 +180,7 @@
                else if (!sg->address && !sg->page)
                        out_of_line_bug();
 
-               if (sg[i].address) {
+               if (sg->address) {
                        dma_cache_wback_inv((unsigned long)sg->address,
                                            sg->length);
                        sg->dma_address = virt_to_bus(sg->address);
@@ -317,7 +317,7 @@
  * returns, or alternatively stop on the first sg_dma_len(sg) which
  * is 0.
  */
-#define sg_dma_address(sg)     ((sg)->address)
+#define sg_dma_address(sg)     ((sg)->dma_address)
 #define sg_dma_len(sg)         ((sg)->length)
 
 #endif /* __KERNEL__ */
<Prev in Thread] Current Thread [Next in Thread>