From: "tip-bot for Luis R. Rodriguez" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: toshi.kani@hp.com, hpa@zytor.com, tomi.valkeinen@ti.com,
peterz@infradead.org, fengguang.wu@intel.com,
plagnioj@jcrosoft.com, akpm@linux-foundation.org,
frank.blaschka@de.ibm.com, rostedt@goodmis.org,
linux@roeck-us.net, mingo@kernel.org, mcgrof@suse.com,
heiko.carstens@de.ibm.com, treding@nvidia.com,
will.deacon@arm.com, schwidefsky@de.ibm.com,
torvalds@linux-foundation.org, bp@suse.de, tglx@linutronix.de,
linux-kernel@vger.kernel.org
Subject: [tip:x86/mm] s390/io: Add pci_iomap_wc() and pci_iomap_wc_range()
Date: Thu, 27 Aug 2015 23:43:46 -0700 [thread overview]
Message-ID: <tip-ee03c5868e74847ba0bd1e6dccbbe26e6504466d@git.kernel.org> (raw)
In-Reply-To: <1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com>
Commit-ID: ee03c5868e74847ba0bd1e6dccbbe26e6504466d
Gitweb: http://git.kernel.org/tip/ee03c5868e74847ba0bd1e6dccbbe26e6504466d
Author: Luis R. Rodriguez <mcgrof@suse.com>
AuthorDate: Wed, 26 Aug 2015 16:34:10 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 28 Aug 2015 08:04:48 +0200
s390/io: Add pci_iomap_wc() and pci_iomap_wc_range()
The following commit:
1b3d4200c1e0 ("PCI: Add pci_iomap_wc() variants")
Introduced pci_iomap_wc() variants but broke the s390 build,
because s390 requires its own implementation of pcio_iomap*()
calls.
The reason for that is that:
"BAR spaces are not disjunctive on s390 so we need the bar
parameter of pci_iomap to find the corresponding device
and create the mapping cookie"
so it has its own lookup/lock solution and it does not include
asm-generic/pci_iomap.h.
Since it currenty maps ioremap_wc() to ioremap_nocache() and
that's the architecture default we can easily just map the wc
calls to the default calls as well.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Frank Blaschka <frank.blaschka@de.ibm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux390@de.ibm.com
Link: http://lkml.kernel.org/r/1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/s390/include/asm/io.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
index cb5fdf3..437e9af 100644
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@ -57,6 +57,8 @@ static inline void ioport_unmap(void __iomem *p)
*/
#define pci_iomap pci_iomap
#define pci_iounmap pci_iounmap
+#define pci_iomap_wc pci_iomap
+#define pci_iomap_wc_range pci_iomap_range
#define memcpy_fromio(dst, src, count) zpci_memcpy_fromio(dst, src, count)
#define memcpy_toio(dst, src, count) zpci_memcpy_toio(dst, src, count)
prev parent reply other threads:[~2015-08-28 6:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 23:34 [PATCH] S390: add pci_iomap_wc() and pci_iomap_wc_range() Luis R. Rodriguez
2015-08-28 6:06 ` Ingo Molnar
2015-08-28 8:22 ` Guenter Roeck
2015-08-29 0:14 ` Luis R. Rodriguez
2015-08-28 6:43 ` tip-bot for Luis R. Rodriguez [this message]
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=tip-ee03c5868e74847ba0bd1e6dccbbe26e6504466d@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=bp@suse.de \
--cc=fengguang.wu@intel.com \
--cc=frank.blaschka@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mcgrof@suse.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=plagnioj@jcrosoft.com \
--cc=rostedt@goodmis.org \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@linutronix.de \
--cc=tomi.valkeinen@ti.com \
--cc=torvalds@linux-foundation.org \
--cc=toshi.kani@hp.com \
--cc=treding@nvidia.com \
--cc=will.deacon@arm.com \
/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