From patchwork Wed Aug 26 23:34:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 7080631 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 18EDC9F1C2 for ; Wed, 26 Aug 2015 23:34:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D9262091C for ; Wed, 26 Aug 2015 23:34:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11D2620940 for ; Wed, 26 Aug 2015 23:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725AbbHZXeQ (ORCPT ); Wed, 26 Aug 2015 19:34:16 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34897 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752047AbbHZXeP (ORCPT ); Wed, 26 Aug 2015 19:34:15 -0400 Received: by pacdd16 with SMTP id dd16so3165054pac.2; Wed, 26 Aug 2015 16:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=CcfqXR9LtBxU3yTbzhJOXcxO3GEvc2mkizuqs0N9HaE=; b=bRBJeFTe8M1707N4YUsOsYk/kefeasI05386/4SMEvQs9loEIIrklqCAbKhW+/wEd6 UIendYC2NsDirmATvVv519apZLPgY8lQvZqIqL2eJ3QeIT7j/w0d90NjAz7Ru3fONLuo Pq2GtLyXUQ7MV6gHFaVGt5LNiRbg9AfJShoAKAoeTUYxPjhhcuqFuiGRNZGz2HiEOHah 574S3l3SxDkm74cvDfnKtPBP2xO65U5KMZw8eFP6QrepHHF7faAV/X0K8dyhsL+f6D8k dCmIpLt0oVvMp7OSzNZ1zbN00NjFGTMqsi5uvDrbwvf/FAZCCl2lzOJvqp/ZyaGwkz4d zKkA== X-Received: by 10.67.12.166 with SMTP id er6mr2422877pad.40.1440632054453; Wed, 26 Aug 2015 16:34:14 -0700 (PDT) Received: from mcgrof@gmail.com ([2601:646:200:bc5b:ca60:ff:feda:57a7]) by smtp.gmail.com with ESMTPSA id fa1sm170114pbb.35.2015.08.26.16.34.11 (version=TLS1 cipher=RC4-SHA bits=128/128); Wed, 26 Aug 2015 16:34:13 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 26 Aug 2015 16:34:11 -0700 From: "Luis R. Rodriguez" To: mingo@kernel.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, linux-s390@vger.kernel.org Cc: bp@suse.de, linux@roeck-us.net, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, fengguang.wu@intel.com, akpm@linux-foundation.org, rostedt@goodmis.org, "Luis R. Rodriguez" Subject: [PATCH] S390: add pci_iomap_wc() and pci_iomap_wc_range() Date: Wed, 26 Aug 2015 16:34:10 -0700 Message-Id: <1440632050-23648-1-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" S390 requires its own implementation of pcio_iomap*() calls is because it has its "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" -- in summary, it has its own lookup/lock solution. 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. Cc: Guenter Roeck Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Borislav Petkov Cc: Ingo Molnar Cc: Fengguang Wu Cc: Andrew Morton Cc: Steven Rostedt Reported-by: 0 day bot Signed-off-by: Luis R. Rodriguez --- This broke through some series that went into Ingo's tip tree which I added. As such I *think* this should go through Ingo's tip tree. Let me know. Up to you guys. 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 cb5fdf3a78fc..437e9af96688 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)