diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:37 -0500 |
| commit | 299af12a7270f098d714e1625634a453e6846411 (patch) | |
| tree | 69c60e29058a81ebb66375c5e6315f8e5b2e0150 /include | |
| parent | 03b482e2432c48a8108fc7159ce42ee4d60ca393 (diff) | |
| parent | f5810e5c329238b8553ebd98b914bdbefd8e6737 (diff) | |
| download | linux-299af12a7270f098d714e1625634a453e6846411.tar.bz2 | |
Merge branch 'remotes/lorenzo/pci/pci-iomap'
- Remove useless __KERNEL__ preprocessor guard in sparc io_32.h (Lorenzo
Pieralisi)
- Move ioremap/iounmap declaration so it's visible in asm-generic/io.h
(Lorenzo Pieralisi)
- Fix memory leak in generic !CONFIG_GENERIC_IOMAP pci_iounmap()
implementation (Lorenzo Pieralisi)
* remotes/lorenzo/pci/pci-iomap:
asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() implementation
sparc32: Move ioremap/iounmap declaration before asm-generic/io.h include
sparc32: Remove useless io_32.h __KERNEL__ preprocessor guard
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/io.h | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index dabf8cb7203b..9ea83d80eb6f 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -911,18 +911,6 @@ static inline void iowrite64_rep(volatile void __iomem *addr, #include <linux/vmalloc.h> #define __io_virt(x) ((void __force *)(x)) -#ifndef CONFIG_GENERIC_IOMAP -struct pci_dev; -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); - -#ifndef pci_iounmap -#define pci_iounmap pci_iounmap -static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) -{ -} -#endif -#endif /* CONFIG_GENERIC_IOMAP */ - /* * Change virtual addresses to physical addresses and vv. * These are pretty trivial @@ -1016,6 +1004,16 @@ static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) port &= IO_SPACE_LIMIT; return (port > MMIO_UPPER_LIMIT) ? NULL : PCI_IOBASE + port; } +#define __pci_ioport_unmap __pci_ioport_unmap +static inline void __pci_ioport_unmap(void __iomem *p) +{ + uintptr_t start = (uintptr_t) PCI_IOBASE; + uintptr_t addr = (uintptr_t) p; + + if (addr >= start && addr < start + IO_SPACE_LIMIT) + return; + iounmap(p); +} #endif #ifndef ioport_unmap @@ -1030,6 +1028,23 @@ extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ #endif /* CONFIG_HAS_IOPORT_MAP */ +#ifndef CONFIG_GENERIC_IOMAP +struct pci_dev; +extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); + +#ifndef __pci_ioport_unmap +static inline void __pci_ioport_unmap(void __iomem *p) {} +#endif + +#ifndef pci_iounmap +#define pci_iounmap pci_iounmap +static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) +{ + __pci_ioport_unmap(p); +} +#endif +#endif /* CONFIG_GENERIC_IOMAP */ + /* * Convert a virtual cached pointer to an uncached pointer */ |