Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00d2904f authored by David Woodhouse's avatar David Woodhouse Committed by Bjorn Helgaas
Browse files

ARM/PCI: Use generic pci_mmap_resource_range() 



Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f7195824

arch/arm/include/asm/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define PCI_DMA_BUS_IS_PHYS     (1)



#define HAVE_PCI_MMAP

#define ARCH_GENERIC_PCI_MMAP_RESOURCE



static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

arch/arm/kernel/bios32.c

+0 −20
Original line number Diff line number Diff line
@@ -597,26 +597,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
	return start;

}



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)

{

	if (mmap_state == pci_mmap_io)

		return -EINVAL;



	/*

	 * Mark this as IO

	 */

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);



	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			     vma->vm_end - vma->vm_start,

			     vma->vm_page_prot))

		return -EAGAIN;



	return 0;

}



void __init pci_map_io_early(unsigned long pfn)

{

	struct map_desc pci_io_desc = {