aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/pci.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-10-28 20:46:18 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-29 00:25:49 -0400
commit8b150478aeb1a8edb9015c2f7ac4da637ff65c45 (patch)
tree621b038b9c041fe82b708c6c5cbee655be2a519a /arch/ppc64/kernel/pci.c
parentd49b340124a34fcb8bceda472558ccef7232c16f (diff)
[PATCH] ppc: make phys_mem_access_prot() work with pfns instead of addresses
Change the phys_mem_access_prot() function to take a pfn instead of an address. This allows mmap64() to work on /dev/mem for addresses above 4G on 32-bit architectures. We start with a pfn in mmap_mem(), so there's no need to convert to an address; in fact, it's actively bad, since the conversion can overflow when the address is above 4G. Similarly fix the ppc32 page_is_ram() function to avoid a conversion to an address by directly comparing to max_pfn. Working with max_pfn instead of high_memory fixes page_is_ram() to give the right answer for highmem pages. Signed-off-by: Roland Dreier <rolandd@cisco.com> Cc: Anton Blanchard <anton@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/pci.c')
-rw-r--r--arch/ppc64/kernel/pci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index b2fb6746f00b..3d2106b022a1 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -726,16 +726,17 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
726 * above routine 726 * above routine
727 */ 727 */
728pgprot_t pci_phys_mem_access_prot(struct file *file, 728pgprot_t pci_phys_mem_access_prot(struct file *file,
729 unsigned long offset, 729 unsigned long pfn,
730 unsigned long size, 730 unsigned long size,
731 pgprot_t protection) 731 pgprot_t protection)
732{ 732{
733 struct pci_dev *pdev = NULL; 733 struct pci_dev *pdev = NULL;
734 struct resource *found = NULL; 734 struct resource *found = NULL;
735 unsigned long prot = pgprot_val(protection); 735 unsigned long prot = pgprot_val(protection);
736 unsigned long offset = pfn << PAGE_SHIFT;
736 int i; 737 int i;
737 738
738 if (page_is_ram(offset >> PAGE_SHIFT)) 739 if (page_is_ram(pfn))
739 return __pgprot(prot); 740 return __pgprot(prot);
740 741
741 prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; 742 prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;