From patchwork Mon Feb 3 07:16:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Moese X-Patchwork-Id: 316071 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id B0A252C0379 for ; Mon, 3 Feb 2014 18:24:45 +1100 (EST) X-Greylist: delayed 417 seconds by postgrey-1.34 at bilbo; Mon, 03 Feb 2014 18:24:18 EST Received: from mail1.bemta3.messagelabs.com (mail1.bemta3.messagelabs.com [195.245.230.164]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 407732C0078 for ; Mon, 3 Feb 2014 18:24:17 +1100 (EST) Received: from [85.158.137.3:42009] by server-4.bemta-3.messagelabs.com id 89/E2-11750-D624FE25; Mon, 03 Feb 2014 07:17:01 +0000 X-Env-Sender: michael.moese@men.de X-Msg-Ref: server-12.tower-38.messagelabs.com!1391411820!12479082!1 X-Originating-IP: [80.255.6.145] X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10985 invoked from network); 3 Feb 2014 07:17:01 -0000 Received: from unknown (HELO keys.men.de) (80.255.6.145) by server-12.tower-38.messagelabs.com with AES128-SHA encrypted SMTP; 3 Feb 2014 07:17:01 -0000 Received: from MEN-EX1.intra.men.de ([192.168.1.2]) by keys.men.de (PGP Universal service); Mon, 03 Feb 2014 08:17:01 +0100 X-PGP-Universal: processed; by keys.men.de on Mon, 03 Feb 2014 08:17:01 +0100 Received: from localhost.intra.men.de (192.168.6.61) by MEN-EX1.intra.men.de (192.168.1.2) with Microsoft SMTP Server (TLS) id 14.3.158.1; Mon, 3 Feb 2014 08:17:00 +0100 From: Michael Moese To: Benjamin Herrenschmidt , Paul Mackerras Subject: [RFC PATCH] powerpc: add ioremap_wt Date: Mon, 3 Feb 2014 08:16:49 +0100 Message-ID: <1391411809-1845-1-git-send-email-michael.moese@men.de> X-Mailer: git-send-email 1.8.5.3 MIME-Version: 1.0 X-Originating-IP: [192.168.6.61] Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Michael Moese X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Allow for IO memory to be mapped cacheable for performing PCI read bursts. Signed-off-by: Michael Moese --- arch/powerpc/include/asm/io.h | 3 +++ arch/powerpc/mm/pgtable_32.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 45698d5..9591fff 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -631,6 +631,8 @@ static inline void iosync(void) * * * ioremap_wc enables write combining * + * * ioremap_wc enables write thru + * * * iounmap undoes such a mapping and can be hooked * * * __ioremap_at (and the pending __iounmap_at) are low level functions to @@ -652,6 +654,7 @@ extern void __iomem *ioremap(phys_addr_t address, unsigned long size); extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size, unsigned long flags); extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size); +extern void __iomem *ioremap_wt(phys_addr_t address, unsigned long size); #define ioremap_nocache(addr, size) ioremap((addr), (size)) extern void iounmap(volatile void __iomem *addr); diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 51f8795..9ab0a54 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c @@ -141,6 +141,14 @@ ioremap_wc(phys_addr_t addr, unsigned long size) EXPORT_SYMBOL(ioremap_wc); void __iomem * +ioremap_wt(phys_addr_t addr, unsigned long size) +{ + return __ioremap_caller(addr, size, _PAGE_WRITETHRU, + __builtin_return_address(0)); +} +EXPORT_SYMBOL(ioremap_wt); + +void __iomem * ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) { /* writeable implies dirty for kernel addresses */