x86_64: only reserve the first 1MB of IO space for CalIOC2

Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 22c2d6250bffbe19bb6aeebbb6da491009da352e..6b76e2fc9249ac1ca52c521f2e99b46a1c20a08c 100644 (file)
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -806,13 +806,13 @@ static void __init calgary_reserve_regions(struct pci_dev *dev)
        iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES);
 
        /* avoid the BIOS/VGA first 640KB-1MB region */
-       /* for CalIOC2 - avoid the entire first 2MB */
+       /* for CalIOC2 - avoid the entire first MB */
        if (is_calgary(dev->device)) {
                start = (640 * 1024);
                npages = ((1024 - 640) * 1024) >> PAGE_SHIFT;
        } else { /* calioc2 */
                start = 0;
-               npages = (2 * 1024 * 1024) >> PAGE_SHIFT;
+               npages = (1 * 1024 * 1024) >> PAGE_SHIFT;
        }
        iommu_range_reserve(tbl, start, npages);