aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLiviu Dudau <Liviu.Dudau@arm.com>2014-09-29 10:29:30 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-09-30 19:08:57 -0400
commit8b921acfeffdb0b45085da862fc301a2d25ed2cf (patch)
tree4772e01279a51f92b80f22b1a5f57356c08b9bdc /include
parentcbe4097f8ae699ebbdaf8c95ecab38d47e0bd5da (diff)
PCI: Add pci_remap_iospace() to map bus I/O resources
Add pci_remap_iospace() to map bus I/O resources into the CPU virtual address space. Architectures with special needs may provide their own version, but most should be able to use this one. This function is useful for PCI host bridge drivers that need to map the PCI I/O resources into virtual memory space. [bhelgaas: phys_addr description, drop temporary "err" variable] Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> CC: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/pgtable.h4
-rw-r--r--include/linux/pci.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index 53b2acc38213..977e545a64c3 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -249,6 +249,10 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
249#define pgprot_writecombine pgprot_noncached 249#define pgprot_writecombine pgprot_noncached
250#endif 250#endif
251 251
252#ifndef pgprot_device
253#define pgprot_device pgprot_noncached
254#endif
255
252/* 256/*
253 * When walking page tables, get the address of the next boundary, 257 * When walking page tables, get the address of the next boundary,
254 * or the end address of the range if that comes earlier. Although no 258 * or the end address of the range if that comes earlier. Although no
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 150da2d644e7..b4995fdfffb1 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1100,6 +1100,9 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
1100 resource_size_t), 1100 resource_size_t),
1101 void *alignf_data); 1101 void *alignf_data);
1102 1102
1103
1104int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
1105
1103static inline dma_addr_t pci_bus_address(struct pci_dev *pdev, int bar) 1106static inline dma_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
1104{ 1107{
1105 struct pci_bus_region region; 1108 struct pci_bus_region region;