Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1622093

[PATCH v2 14/27] mn10300: Use generic pci_mmap_resource_range()

Show all headers | View raw

From: David Woodhouse <dwmw@amazon.co.uk>

This was setting vma->vm_flags |= VM_LOCKED. Not sure why...

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 arch/mn10300/include/asm/pci.h          |  1 +
 arch/mn10300/unit-asb2305/pci-asb2305.c | 24 ------------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h
index 082b6de..d276549 100644
--- a/arch/mn10300/include/asm/pci.h
+++ b/arch/mn10300/include/asm/pci.h
@@ -74,6 +74,7 @@ static inline int pci_controller_num(struct pci_dev *dev)
 }
 
 #define HAVE_PCI_MMAP
+#define ARCH_GENERIC_PCI_MMAP_RESOURCE
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c
index 4abbbd5..e0f4617 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.c
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.c
@@ -210,27 +210,3 @@ void __init pcibios_resource_survey(void)
 	pcibios_allocate_resources(0);
 	pcibios_allocate_resources(1);
 }
-
-int pci_mmap_page_range(struct pci_dev *dev, int bar,
-			struct vm_area_struct *vma,
-			enum pci_mmap_state mmap_state, int write_combine)
-{
-	unsigned long prot;
-
-	/* Leave vm_pgoff as-is, the PCI space address is the physical
-	 * address on this platform.
-	 */
-	vma->vm_flags |= VM_LOCKED;
-
-	prot = pgprot_val(vma->vm_page_prot);
-	prot &= ~_PAGE_CACHE;
-	vma->vm_page_prot = __pgprot(prot);
-
-	/* Write-combine setting is ignored */
-	if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-			       vma->vm_end - vma->vm_start,
-			       vma->vm_page_prot))
-		return -EAGAIN;
-
-	return 0;
-}
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/27] PCI resource mmap cleanup David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 18/27] x86: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 06/27] pci: Move multiple declarations of pci_mmap_page_range() to <linux/pci.h> David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 07/27] pci: Add arch_can_pci_mmap_io() on architectures which can mmap() I/O space David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 01/27] pci: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 21/27] microblaze: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 04/27] xtensa: Do not mmap PCI BARs to userspace as write-through David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 19/27] pci: Add I/O BAR support to generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:30 +0200
  [PATCH v2 05/27] pci: Add arch_can_pci_mmap_wc() macro David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 22/27] xtensa: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 14/27] mn10300: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
    Re: [PATCH v2 14/27] mn10300: Use generic pci_mmap_resource_range() David Howells <dhowells@redhat.com> - 2017-04-13 11:30 +0200
  [PATCH v2 02/27] pci: Fix another sanity check bug in /proc/pci mmap David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 08/27] pci: Use BAR index in sysfs attr->private instead of resource pointer David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 17/27] unicore: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 25/27] ia64: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
    Re: [PATCH v2 25/27] ia64: Use generic pci_mmap_resource_range() Tony Luck <tony.luck@gmail.com> - 2017-04-12 23:50 +0200
      Re: [PATCH v2 25/27] ia64: Use generic pci_mmap_resource_range() Thomas Gleixner <tglx@linutronix.de> - 2017-04-13 00:00 +0200
      Re: [PATCH v2 25/27] ia64: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-13 10:40 +0200
  [PATCH v2 10/27] pci: Add pci_mmap_resource_range() and use it for ARM64 David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
    Re: [PATCH v2 10/27] pci: Add pci_mmap_resource_range() and use it for ARM64 David Howells <dhowells@redhat.com> - 2017-04-13 11:30 +0200
  [PATCH v2 09/27] pci: Add BAR index argument to pci_mmap_page_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 26/27] sparc: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 20/27] powerpc: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 13/27] mips: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 11/27] arm: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 16/27] sh: Use generic pci_mmap_resource_range() David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  [PATCH v2 03/27] pci: Only allow WC mmap on prefetchable resources David Woodhouse <dwmw2@infradead.org> - 2017-04-12 14:40 +0200
  Re: [PATCH v2 00/27] PCI resource mmap cleanup Bjorn Helgaas <helgaas@kernel.org> - 2017-04-18 20:30 +0200
    Re: [PATCH v2 00/27] PCI resource mmap cleanup Bjorn Helgaas <helgaas@kernel.org> - 2017-04-18 21:00 +0200
    Re: [PATCH v2 00/27] PCI resource mmap cleanup David Woodhouse <dwmw2@infradead.org> - 2017-04-19 09:30 +0200
      Re: [PATCH v2 00/27] PCI resource mmap cleanup Bjorn Helgaas <bhelgaas@google.com> - 2017-04-19 20:40 +0200

csiph-web