Re: [PATCH] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h

Bjorn Helgaas
2022-07-29T17:04:53Z

On Sat, Jul 23, 2022 at 06:22:48AM +0900, Stafford Horne wrote:
> When building OpenRISC PCI which has no ioport_map we get the following build
> error.
>
> lib/pci_iomap.c: In function 'pci_iomap_range':
> CC drivers/i2c/i2c-core-base.o
> ./include/asm-generic/pci_iomap.h:29:41: error: implicit declaration of function 'ioport_map'; did you mean 'ioremap'? [-Werror=implicit-function-declaration]
> 29 | #define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
> | ^~~~~~~~~~
> lib/pci_iomap.c:44:24: note: in expansion of macro '__pci_ioport_map'
> 44 | return __pci_ioport_map(dev, start, len);
> | ^~~~~~~~~~~~~~~~
>
> This patch adds a NULL definition of __pci_ioport_map for architetures
> which do not support ioport_map.
>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Stafford Horne <shorne@gmail.com>

Appended to my pci/header-cleanup-immutable branch for v5.20, thanks!

> ---
> The Kconfig I am using to test this is here:
> https://github.com/stffrdhrn/linux/commits/or1k-virt-4
>
> include/asm-generic/pci_iomap.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
> index 5a2f9bf53384..8fbb0a55545d 100644
> --- a/include/asm-generic/pci_iomap.h
> +++ b/include/asm-generic/pci_iomap.h
> @@ -25,6 +25,8 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
> #ifdef CONFIG_NO_GENERIC_PCI_IOPORT_MAP
> extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
> unsigned int nr);
> +#elif !defined(CONFIG_HAS_IOPORT_MAP)
> +#define __pci_ioport_map(dev, port, nr) NULL
> #else
> #define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
> #endif
> --
> 2.36.1
>