Re: [PATCH 1/3] lib: add NO_GENERIC_PCI_IOPORT_MAP
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2012-01-31 00:20:12
Also in:
linux-arch, linux-sh, lkml
Subsystem:
generic include/asm header files, library code, pci subsystem, the rest · Maintainers:
Arnd Bergmann, Andrew Morton, Bjorn Helgaas, Linus Torvalds
On Mon, Jan 30, 2012 at 08:04:32PM +0000, Arnd Bergmann wrote:
On Monday 30 January 2012, Michael S. Tsirkin wrote:quoted
quoted
+/* + * Create a virtual mapping cookie for a port on a given PCI device. + * Do not call this directly, it exists to make it easier for architectures + * to override. + */ +#ifdef CONFIG_NO_GENERIC_PCI_IOPORT_MAP +extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port, + unsigned int nr); +#else +static inline void __iomem *__pci_ioport_map(struct pci_dev *dev, + unsigned long port, unsigned int nr) +{ + return ioport_map(port, nr); +} +#endif ArndIt would be nicer in that it would make the kernel a bit smaller for generic architectures but this would need to go into a separate header: it depends on io.h and io.h depends on pci_iomap.h.Adding extra dependencies is not good here, I agree. Maybe a better solution is to use a macro instead of an inline function then: #define __pci_ioport_map(dev, port, nr) ioport_map(port, nr) In general, macros should be avoided, but I think it's the best tradeoff in this case. Arnd
I have an idea: we can make the generic one inline if we keep it in the .c file. So something like the below on top of my patch will probably work. Ack?
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index 2aff58e..2ec1bdb 100644
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h@@ -15,11 +15,6 @@ struct pci_dev; #ifdef CONFIG_PCI /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); -/* Create a virtual mapping cookie for a port on a given PCI device. - * Do not call this directly, it exists to make it easier for architectures - * to override. */ -extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port, - unsigned int nr); #else static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) {
@@ -27,4 +22,12 @@ static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned lon } #endif +#ifdef CONFIG_NO_GENERIC_PCI_IOPORT_MAP +/* Create a virtual mapping cookie for a port on a given PCI device. + * Do not call this directly, it exists to make it easier for architectures + * to override. */ +extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port, + unsigned int nr); +#endif + #endif /* __ASM_GENERIC_IO_H */
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 1dfda29..8102f28 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c@@ -12,9 +12,9 @@ #ifndef CONFIG_NO_GENERIC_PCI_IOPORT_MAP /* Architectures can override ioport mapping while * still using the rest of the generic infrastructure. */ -void __iomem *__pci_ioport_map(struct pci_dev *dev, - unsigned long port, - unsigned int nr) +static inline void __iomem *__pci_ioport_map(struct pci_dev *dev, + unsigned long port, + unsigned int nr) { return ioport_map(port, nr); }