From: "Michael S. Tsirkin" <mst@redhat.com>
To: Kevin Cernekee <cernekee@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
Paul Mundt <lethal@linux-sh.org>, Arnd Bergmann <arnd@arndb.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Myron Stowe <myron.stowe@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Lucas De Marchi <lucas.demarchi@profusion.mobi>,
Dmitry Kasatkin <dmitry.kasatkin@intel.com>,
James Morris <jmorris@namei.org>,
"John W. Linville" <linville@tuxdriver.com>,
Michael Witten <mfwitten@gmail.com>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
linux-sh@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [PATCH 1/3] lib: add NO_GENERIC_PCI_IOPORT_MAP
Date: Mon, 30 Jan 2012 14:18:39 +0200 [thread overview]
Message-ID: <d78d91d0166651700cf662a50c87d84da4bdab88.1327877053.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1327877053.git.mst@redhat.com>
Some architectures need to override the way
IO port mapping is does not PCI devices.
Supply a generic function that calls
ioport_map, and make it possible for architectures
to override.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/asm-generic/pci_iomap.h | 5 +++++
lib/Kconfig | 3 +++
lib/pci_iomap.c | 12 +++++++++++-
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index 8de4b73..2aff58e 100644
--- 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)
{
diff --git a/lib/Kconfig b/lib/Kconfig
index 169eb7c..1df1388 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,9 @@ config RATIONAL
config GENERIC_FIND_FIRST_BIT
bool
+config NO_GENERIC_PCI_IOPORT_MAP
+ bool
+
config GENERIC_PCI_IOMAP
bool
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 4b0fdc2..1dfda29 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -9,6 +9,16 @@
#include <linux/export.h>
#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
@@ -34,7 +44,7 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
if (maxlen && len > maxlen)
len = maxlen;
if (flags & IORESOURCE_IO)
- return ioport_map(start, len);
+ return __pci_ioport_map(dev, start, len);
if (flags & IORESOURCE_MEM) {
if (flags & IORESOURCE_CACHEABLE)
return ioremap(start, len);
--
1.7.8.2.325.g247f9
next prev parent reply other threads:[~2012-01-30 12:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 12:18 [PATCH 0/3] arch: fix ioport mapping on mips,sh Michael S. Tsirkin
2012-01-30 12:18 ` Michael S. Tsirkin [this message]
2012-01-30 14:19 ` [PATCH 1/3] lib: add NO_GENERIC_PCI_IOPORT_MAP Shane McDonald
2012-01-30 14:25 ` Michael S. Tsirkin
2012-01-30 15:51 ` Arnd Bergmann
2012-01-30 16:18 ` Michael S. Tsirkin
2012-01-30 20:04 ` Arnd Bergmann
2012-01-31 0:22 ` Michael S. Tsirkin
2012-01-31 15:59 ` Arnd Bergmann
2012-01-31 21:18 ` Michael S. Tsirkin
2012-01-30 12:18 ` [PATCH 2/3] mips: use the the PCI controller's io_map_base Michael S. Tsirkin
2012-01-30 17:49 ` Sergei Shtylyov
2012-01-30 12:19 ` [PATCH 3/3] sh: use the the PCI channels's io_map_base Michael S. Tsirkin
2012-01-30 17:50 ` Sergei Shtylyov
2012-01-30 16:09 ` [PATCH 0/3] arch: fix ioport mapping on mips,sh Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d78d91d0166651700cf662a50c87d84da4bdab88.1327877053.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=arnd@arndb.de \
--cc=cernekee@gmail.com \
--cc=dmitry.kasatkin@intel.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jmorris@namei.org \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-sh@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=lucas.demarchi@profusion.mobi \
--cc=mfwitten@gmail.com \
--cc=myron.stowe@redhat.com \
--cc=paul.gortmaker@windriver.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).