2022-07-22 21:33:19

by Stafford Horne

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

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 <[email protected]>
Signed-off-by: Stafford Horne <[email protected]>
---
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

2022-07-29 17:15:31

by Bjorn Helgaas

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

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 <[email protected]>
> Signed-off-by: Stafford Horne <[email protected]>

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
>

2022-07-29 21:21:41

by Stafford Horne

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

On Fri, Jul 29, 2022 at 12:04:49PM -0500, Bjorn Helgaas wrote:
> 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 <[email protected]>
> > Signed-off-by: Stafford Horne <[email protected]>
>
> Appended to my pci/header-cleanup-immutable branch for v5.20, thanks!

Thanks, I did have this in the PCI series on my OpenRISC fot-next branch. I
will just rebase that on the pci/header-cleanup-immutable branch to avoid having
the patch there two times.

Also, your updated subject on the commit is much better.

-Stafford

> > ---
> > 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
> >