diff options
author | Muli Ben-Yehuda <muli@il.ibm.com> | 2007-07-21 11:11:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:11 -0400 |
commit | e8f204147149e48d72e9c1e321ee72452169e34a (patch) | |
tree | 3797066c2375a59125fc03b95279293845ba43b3 /arch/x86_64 | |
parent | 8bcf77055cc88228263f936b2ecf69c017906cb2 (diff) |
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>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/pci-calgary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c index 22c2d6250bff..6b76e2fc9249 100644 --- 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) | |||
806 | iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES); | 806 | iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES); |
807 | 807 | ||
808 | /* avoid the BIOS/VGA first 640KB-1MB region */ | 808 | /* avoid the BIOS/VGA first 640KB-1MB region */ |
809 | /* for CalIOC2 - avoid the entire first 2MB */ | 809 | /* for CalIOC2 - avoid the entire first MB */ |
810 | if (is_calgary(dev->device)) { | 810 | if (is_calgary(dev->device)) { |
811 | start = (640 * 1024); | 811 | start = (640 * 1024); |
812 | npages = ((1024 - 640) * 1024) >> PAGE_SHIFT; | 812 | npages = ((1024 - 640) * 1024) >> PAGE_SHIFT; |
813 | } else { /* calioc2 */ | 813 | } else { /* calioc2 */ |
814 | start = 0; | 814 | start = 0; |
815 | npages = (2 * 1024 * 1024) >> PAGE_SHIFT; | 815 | npages = (1 * 1024 * 1024) >> PAGE_SHIFT; |
816 | } | 816 | } |
817 | iommu_range_reserve(tbl, start, npages); | 817 | iommu_range_reserve(tbl, start, npages); |
818 | 818 | ||