]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] Alchemy: fix off by two error in __fixup_bigphys_addr()
authorSergei Shtylyov <sshtylyov@ru.mvista.com>
Mon, 10 Dec 2007 17:36:50 +0000 (20:36 +0300)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 14 Dec 2007 17:34:29 +0000 (17:34 +0000)
the PCI specific code in this function doesn't check for the address range
being under the upper bound of the PCI memory window correctly -- fix this,
somewhat beautifying the code around the check, while at it...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/au1000/common/setup.c

index a90d425d4651a66c0e805d47511ecb86d0b866db..d885e3848ec6c0842057341e2322cf53fcd29438 100644 (file)
@@ -137,12 +137,11 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
 
 #ifdef CONFIG_PCI
        {
-               u32 start, end;
+               u32 start = (u32)Au1500_PCI_MEM_START;
+               u32 end   = (u32)Au1500_PCI_MEM_END;
 
-               start = (u32)Au1500_PCI_MEM_START;
-               end = (u32)Au1500_PCI_MEM_END;
-               /* check for pci memory window */
-               if ((phys_addr >= start) && ((phys_addr + size) < end))
+               /* Check for PCI memory window */
+               if (phys_addr >= start && (phys_addr + size - 1) <= end)
                        return (phys_t)
                               ((phys_addr - start) + Au1500_PCI_MEM_START);
        }