From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753915Ab2A3PwO (ORCPT ); Mon, 30 Jan 2012 10:52:14 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:53383 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751742Ab2A3PwM (ORCPT ); Mon, 30 Jan 2012 10:52:12 -0500 From: Arnd Bergmann To: "Michael S. Tsirkin" Subject: Re: [PATCH 1/3] lib: add NO_GENERIC_PCI_IOPORT_MAP Date: Mon, 30 Jan 2012 15:51:46 +0000 User-Agent: KMail/1.12.2 (Linux/3.3.0-rc1; KDE/4.3.2; x86_64; ; ) Cc: Kevin Cernekee , Ralf Baechle , Paul Mundt , Jesse Barnes , Myron Stowe , Paul Gortmaker , Lucas De Marchi , Dmitry Kasatkin , James Morris , "John W. Linville" , Michael Witten , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, linux-arch@vger.kernel.org References: In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201201301551.46907.arnd@arndb.de> X-Provags-ID: V02:K0:cJ6K0n3+KbPZf09E6BUK0YrxBfCnYSoBrcL2kOnh9ta Z2P8/Z+X+GU6rR/g+/zM7CghI7mfTqJ7BU91kWvD/nKk/OWiGt MQk16FklkEyy2egrM0kal8kGhTf2l5wT1XklJJU7McXda5PJCf gbQ0dHXaJKrWSTx2V4LHMDKWcD2or2aCU9BzGo1KTUzw7TC4iN JHMgF3K13CTMsi7QcC+C7+qNx48L0RG1vPGeSATdC09TV2YSnz ZddW6qFv00oHjwZBiFX7UsZQJKvcyW6YqXQwpgItPUUdWd/vj8 ickYhzDOo3wEKax5WKEC94umngbigX3YgvOv3yEzs5eeJBcj42 ofglebNMSiL5kKKPW7y8= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 30 January 2012, Michael S. Tsirkin wrote: > --- a/include/asm-generic/pci_iomap.h > +++ b/include/asm-generic/pci_iomap.h > @@ -15,6 +15,11 @@ 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) > { > index 4b0fdc2..1dfda29 100644 > --- a/lib/pci_iomap.c > +++ b/lib/pci_iomap.c > @@ -9,6 +9,16 @@ > #include > > #ifdef CONFIG_PCI > +#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) > +{ > + return ioport_map(port, nr); > +} > +#endif > /** > * pci_iomap - create a virtual mapping cookie for a PCI BAR > * @dev: PCI device that owns the BAR This looks correct, but it would be nicer to express this with an inline function and keeping the new #ifdef to the header file, like +/* + * 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 Arnd