diff options
author | David Woodhouse <dwmw@amazon.co.uk> | 2017-04-12 13:25:54 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-18 13:01:42 -0500 |
commit | ae749c7ab475de2c9c427058db19921c91846e89 (patch) | |
tree | 0fbb5e8de9c0827c196f5296409622beb5e9aec9 /arch/powerpc/include/asm/pci.h | |
parent | 03a064b431eb5cb0a91012699ac1e4d6302b327d (diff) | |
download | linux-ae749c7ab475de2c9c427058db19921c91846e89.tar.gz linux-ae749c7ab475de2c9c427058db19921c91846e89.tar.bz2 linux-ae749c7ab475de2c9c427058db19921c91846e89.zip |
PCI: Add arch_can_pci_mmap_wc() macro
Most of the almost-identical versions of pci_mmap_page_range() silently
ignore the 'write_combine' argument and give uncached mappings.
Yet we allow the PCIIOC_WRITE_COMBINE ioctl in /proc/bus/pci, expose the
'resourceX_wc' file in sysfs, and allow an attempted mapping to apparently
succeed.
To fix this, introduce a macro arch_can_pci_mmap_wc() which indicates
whether the platform can do a write-combining mapping. On x86 this ends up
being pat_enabled(), while the few other platforms that support it can just
set it to a literal '1'.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
-rw-r--r-- | arch/powerpc/include/asm/pci.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 93eded8d3843..b5b68c6a10b1 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -81,8 +81,9 @@ struct vm_area_struct; int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, enum pci_mmap_state mmap_state, int write_combine); -/* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */ -#define HAVE_PCI_MMAP 1 +/* Tell drivers/pci/proc.c that we have pci_mmap_page_range() and it does WC */ +#define HAVE_PCI_MMAP 1 +#define arch_can_pci_mmap_wc() 1 extern int pci_legacy_read(struct pci_bus *bus, loff_t port, u32 *val, size_t count); |