Commit-ID: ee03c5868e74847ba0bd1e6dccbbe26e6504466d
Gitweb: http://git.kernel.org/tip/ee03c5868e74847ba0bd1e6dccbbe26e6504466d
Author: Luis R. Rodriguez <mcg...@suse.com>
AuthorDate: Wed, 26 Aug 2015 16:34:10 -0700
Committer: Ingo Molnar <mi...@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...@intel.com>
Signed-off-by: Luis R. Rodriguez <mcg...@suse.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Borislav Petkov <b...@suse.de>
Cc: Fengguang Wu <fengguang...@intel.com>
Cc: Frank Blaschka <frank.blasc...@de.ibm.com>
Cc: Guenter Roeck <li...@roeck-us.net>
Cc: Heiko Carstens <heiko.carst...@de.ibm.com>
Cc: Jean-Christophe Plagniol-Villard <plagn...@jcrosoft.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Martin Schwidefsky <schwidef...@de.ibm.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: Thierry Reding <tred...@nvidia.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Tomi Valkeinen <tomi.valkei...@ti.com>
Cc: Toshi Kani <toshi.k...@hp.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: linux-fb...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linux...@de.ibm.com
Link:
http://lkml.kernel.org/r/1440632050-23648-1-git-send-email-mcg...@do-not-panic.com
Signed-off-by: Ingo Molnar <mi...@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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
