* [PATCH v3 1/3] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h [not found] <20220725020737.1221739-1-shorne@gmail.com> @ 2022-07-25 2:07 ` Stafford Horne 2022-07-25 17:10 ` Bjorn Helgaas 0 siblings, 1 reply; 3+ messages in thread From: Stafford Horne @ 2022-07-25 2:07 UTC (permalink / raw) To: LKML Cc: Bjorn Helgaas, Arnd Bergmann, Stafford Horne, Bjorn Helgaas, linux-pci, linux-arch 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> --- 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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 1/3] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h 2022-07-25 2:07 ` [PATCH v3 1/3] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h Stafford Horne @ 2022-07-25 17:10 ` Bjorn Helgaas 2022-07-25 21:25 ` Stafford Horne 0 siblings, 1 reply; 3+ messages in thread From: Bjorn Helgaas @ 2022-07-25 17:10 UTC (permalink / raw) To: Stafford Horne; +Cc: LKML, Arnd Bergmann, Bjorn Helgaas, linux-pci, linux-arch On Mon, Jul 25, 2022 at 11:07:35AM +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> FWIW, Acked-by: Bjorn Helgaas <bhelgaas@google.com> I assume this will go via some other tree; let me know if otherwise. > --- > 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 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 1/3] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h 2022-07-25 17:10 ` Bjorn Helgaas @ 2022-07-25 21:25 ` Stafford Horne 0 siblings, 0 replies; 3+ messages in thread From: Stafford Horne @ 2022-07-25 21:25 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: LKML, Arnd Bergmann, Bjorn Helgaas, linux-pci, linux-arch On Mon, Jul 25, 2022 at 12:10:59PM -0500, Bjorn Helgaas wrote: > On Mon, Jul 25, 2022 at 11:07:35AM +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> > > FWIW, > > Acked-by: Bjorn Helgaas <bhelgaas@google.com> Thank you, > I assume this will go via some other tree; let me know if otherwise. Yes I plan to send this along with the other patches via the OpenRISC tree. -Stafford ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-25 21:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220725020737.1221739-1-shorne@gmail.com>
2022-07-25 2:07 ` [PATCH v3 1/3] asm-generic: Support NO_IOPORT_MAP in pci_iomap.h Stafford Horne
2022-07-25 17:10 ` Bjorn Helgaas
2022-07-25 21:25 ` Stafford Horne
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).