From 9fcc51b9a452f479b1ee131742624ab29ac4b10f Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Mon, 10 Dec 2007 20:36:50 +0300 Subject: [PATCH] --- yaml --- r: 74851 b: refs/heads/master c: b87bb40b62310328e908d580e013e0575b05886c h: refs/heads/master i: 74849: 0f22ec746530b5b1071d5b0f3e348760d4722b52 74847: 5551ffc75e6c48c84c92fc896514faaae86e22b8 v: v3 --- [refs] | 2 +- trunk/arch/mips/au1000/common/setup.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 84e010d5f059..06a417b8a3df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd99d9661c72fe251b842705f2e7cfaa4918a13c +refs/heads/master: b87bb40b62310328e908d580e013e0575b05886c diff --git a/trunk/arch/mips/au1000/common/setup.c b/trunk/arch/mips/au1000/common/setup.c index a90d425d4651..d885e3848ec6 100644 --- a/trunk/arch/mips/au1000/common/setup.c +++ b/trunk/arch/mips/au1000/common/setup.c @@ -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); }