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

Commit 6a94ca14 authored by David Woodhouse's avatar David Woodhouse Committed by Bjorn Helgaas
Browse files

parisc: 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 903bdbe2

arch/parisc/include/asm/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -200,5 +200,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
}



#define HAVE_PCI_MMAP

#define ARCH_GENERIC_PCI_MMAP_RESOURCE



#endif /* __ASM_PARISC_PCI_H */

arch/parisc/kernel/pci.c

+0 −29
Original line number Diff line number Diff line
@@ -227,35 +227,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)

{

	unsigned long prot;



	/*

	 * I/O space can be accessed via normal processor loads and stores on

	 * this platform but for now we elect not to do this and portable

	 * drivers should not do this anyway.

	 */

	if (mmap_state == pci_mmap_io)

		return -EINVAL;



	if (write_combine)

		return -EINVAL;



	/*

	 * Ignore write-combine; for now only return uncached mappings.

	 */

	prot = pgprot_val(vma->vm_page_prot);

	prot |= _PAGE_NO_CACHE;

	vma->vm_page_prot = __pgprot(prot);



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

		vma->vm_end - vma->vm_start, vma->vm_page_prot);

}



/*

 * A driver is enabling the device.  We make sure that all the appropriate

 * bits are set to allow the device to operate as the driver is expecting.