Skip to content

Commit 00d2904

Browse files
dwmw2bjorn-helgaas
authored andcommitted
ARM/PCI: Use generic pci_mmap_resource_range()
Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent f719582 commit 00d2904

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

arch/arm/include/asm/pci.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ static inline int pci_proc_domain(struct pci_bus *bus)
2929
#define PCI_DMA_BUS_IS_PHYS (1)
3030

3131
#define HAVE_PCI_MMAP
32+
#define ARCH_GENERIC_PCI_MMAP_RESOURCE
3233

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

arch/arm/kernel/bios32.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -597,26 +597,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
597597
return start;
598598
}
599599

600-
int pci_mmap_page_range(struct pci_dev *dev, int bar,
601-
struct vm_area_struct *vma,
602-
enum pci_mmap_state mmap_state, int write_combine)
603-
{
604-
if (mmap_state == pci_mmap_io)
605-
return -EINVAL;
606-
607-
/*
608-
* Mark this as IO
609-
*/
610-
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
611-
612-
if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
613-
vma->vm_end - vma->vm_start,
614-
vma->vm_page_prot))
615-
return -EAGAIN;
616-
617-
return 0;
618-
}
619-
620600
void __init pci_map_io_early(unsigned long pfn)
621601
{
622602
struct map_desc pci_io_desc = {

0 commit comments

Comments
 (0)