From: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>,
linux-mips@linux-mips.org, linux-m68k@vger.kernel.org,
linux-ia64@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
linux@openrisc.net, linux-pci@vger.kernel.org,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Chen Liqin <liqin.chen@sunplusct.com>,
Paul Mackerras <paulus@samba.org>,
"H. Peter Anvin" <hpa@zytor.com>,
sparclinux@vger.kernel.org, Guan Xuetao <gxt@mprc.pku.edu.cn>,
Lennox Wu <lennox.wu@gmail.com>, Jonas Bonn <jonas@southpole.se>,
Jesper Nilsson <jesper.nilsson@axis.com>,
Russell King <linux@arm.linux.org.uk>,
linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org,
Helge Deller <deller@gmx.de>,
x86@kernel.org, "James E.J. Bottomley" <jejb@parisc-linux.org>,
Ingo Molnar <mingo@redhat.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-arch@vger.kernel.org, Arend van Spriel <arend@broadcom.com>,
Matt Turner <mattst88@gmail.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Lasse Collin <lasse.collin@tukaani.org>,
Arnd Bergmann <arnd@arndb.de>,
Lucas De Marchi <lucas.demarchi@profusion.mobi>,
microblaze-uclinux@itee.uq.edu.au,
Paul Bolle <pebolle@tiscali.nl>,
Rob Herring <rob.herring@calxeda.com>,
Mikael Starvik <starvik@axis.com>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Franky Lin <frankyl@broadcom.com>,
Thomas Gleixner <tglx@linutronix.de>,
Fabio Baltieri <fabio.baltieri@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Richard Henderson <rth@twiddle.net>,
Michael Ellerman <michael@ellerman.id.au>,
Michal Simek <monstr@monstr.eu>, Tony Luck <tony.luck@intel.com>,
linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com,
Paul Gortmaker <paul.gortmaker@windriver.com>,
linux-kernel@vger.kernel.org, Ralf Baechle <ralf@linux-mips.org>,
Richard Kuo <rkuo@codeaurora.org>,
Kyle McMartin <kyle@mcmartin.ca>,
Paul Mundt <lethal@linux-sh.org>,
linux-alpha@vger.kernel.org, Olof Johansson <olof@lixom.net>,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH-RFC 06/10] mips: switch to GENERIC_PCI_IOMAP
Date: Thu, 24 Nov 2011 22:18:37 +0200 [thread overview]
Message-ID: <66457f7750d7d14229fcf8d0b011aba63185a75d.1322163031.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1322163031.git.mst@redhat.com>
mips copied pci_iomap from generic code, probably to avoid
pulling the rest of iomap.c in. Since that's in
a separate file now, we can reuse the common implementation.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
arch/mips/Kconfig | 1 +
arch/mips/lib/iomap-pci.c | 26 --------------------------
2 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d46f1da..b70c96f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2317,6 +2317,7 @@ config PCI
bool "Support for PCI controller"
depends on HW_HAS_PCI
select PCI_DOMAINS
+ select GENERIC_PCI_IOMAP
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
index 2ab899c..2635b1a 100644
--- a/arch/mips/lib/iomap-pci.c
+++ b/arch/mips/lib/iomap-pci.c
@@ -40,32 +40,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
return (void __iomem *) (ctrl->io_map_base + port);
}
-/*
- * Create a virtual mapping cookie for a PCI BAR (memory or IO)
- */
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-{
- resource_size_t start = pci_resource_start(dev, bar);
- resource_size_t len = pci_resource_len(dev, bar);
- unsigned long flags = pci_resource_flags(dev, bar);
-
- if (!len || !start)
- return NULL;
- if (maxlen && len > maxlen)
- len = maxlen;
- if (flags & IORESOURCE_IO)
- return ioport_map_pci(dev, start, len);
- if (flags & IORESOURCE_MEM) {
- if (flags & IORESOURCE_CACHEABLE)
- return ioremap(start, len);
- return ioremap_nocache(start, len);
- }
- /* What? */
- return NULL;
-}
-
-EXPORT_SYMBOL(pci_iomap);
-
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
{
iounmap(addr);
--
1.7.5.53.gc233e
next prev parent reply other threads:[~2011-11-24 20:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1322163031.git.mst@redhat.com>
2011-11-24 20:15 ` [PATCH-RFC 01/10] lib: move GENERIC_IOMAP to lib/Kconfig Michael S. Tsirkin
2011-11-25 8:41 ` Jesper Nilsson
2011-11-28 20:12 ` Richard Kuo
2011-11-24 20:17 ` [PATCH-RFC 02/10] lib: add GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-11-24 22:07 ` Arnd Bergmann
2011-11-25 0:54 ` Stephen Rothwell
2011-11-25 0:59 ` Stephen Rothwell
2011-11-27 17:12 ` Michael S. Tsirkin
2011-11-24 20:17 ` [PATCH-RFC 03/10] alpha: switch to GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-11-24 20:17 ` [PATCH-RFC 04/10] arm: " Michael S. Tsirkin
2011-11-24 20:18 ` [PATCH-RFC 05/10] microblaze: " Michael S. Tsirkin
2011-11-24 20:18 ` Michael S. Tsirkin [this message]
2012-01-28 22:38 ` [PATCH-RFC 06/10] mips: " Kevin Cernekee
2012-01-29 22:45 ` Michael S. Tsirkin
2011-11-24 20:19 ` [PATCH-RFC 07/10] parisc: " Michael S. Tsirkin
2011-11-24 20:19 ` [PATCH-RFC 08/10] powerpc: " Michael S. Tsirkin
2011-12-04 10:48 ` Michael S. Tsirkin
2011-12-04 20:52 ` Benjamin Herrenschmidt
2011-12-05 6:03 ` Michael S. Tsirkin
2011-11-24 20:20 ` [PATCH-RFC 09/10] sh: " Michael S. Tsirkin
2011-11-24 20:21 ` [PATCH-RFC 10/10] sparc: " Michael S. Tsirkin
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=66457f7750d7d14229fcf8d0b011aba63185a75d.1322163031.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=arend@broadcom.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=deller@gmx.de \
--cc=fabio.baltieri@gmail.com \
--cc=fenghua.yu@intel.com \
--cc=frankyl@broadcom.com \
--cc=geert@linux-m68k.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=hpa@zytor.com \
--cc=ink@jurassic.park.msu.ru \
--cc=jbarnes@virtuousgeek.org \
--cc=jejb@parisc-linux.org \
--cc=jesper.nilsson@axis.com \
--cc=jonas@southpole.se \
--cc=kyle@mcmartin.ca \
--cc=lasse.collin@tukaani.org \
--cc=lennox.wu@gmail.com \
--cc=lethal@linux-sh.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=linux@openrisc.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liqin.chen@sunplusct.com \
--cc=lucas.demarchi@profusion.mobi \
--cc=mattst88@gmail.com \
--cc=michael@ellerman.id.au \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=nicolas.pitre@linaro.org \
--cc=olof@lixom.net \
--cc=paul.gortmaker@windriver.com \
--cc=paulus@samba.org \
--cc=pebolle@tiscali.nl \
--cc=ralf@linux-mips.org \
--cc=rkuo@codeaurora.org \
--cc=rob.herring@calxeda.com \
--cc=rth@twiddle.net \
--cc=sparclinux@vger.kernel.org \
--cc=starvik@axis.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.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).