Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755796AbbHYI2N (ORCPT ); Tue, 25 Aug 2015 04:28:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38884 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755497AbbHYIZE (ORCPT ); Tue, 25 Aug 2015 04:25:04 -0400 Date: Tue, 25 Aug 2015 01:23:42 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: adaplas@gmail.com, arnd@arndb.de, jgross@suse.com, plagnioj@jcrosoft.com, mingo@kernel.org, luto@amacapital.net, akpm@linux-foundation.org, mcgrof@suse.com, airlied@redhat.com, peterz@infradead.org, daniel.vetter@ffwll.ch, hpa@zytor.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, geert@linux-m68k.org, jg1.han@samsung.com, bp@suse.de, torvalds@linux-foundation.org, sbsiddha@gmail.com, laurent.pinchart@ideasonboard.com Reply-To: torvalds@linux-foundation.org, laurent.pinchart@ideasonboard.com, sbsiddha@gmail.com, geert@linux-m68k.org, jg1.han@samsung.com, tglx@linutronix.de, bp@suse.de, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org, hpa@zytor.com, daniel.vetter@ffwll.ch, mcgrof@suse.com, airlied@redhat.com, peterz@infradead.org, akpm@linux-foundation.org, luto@amacapital.net, jgross@suse.com, arnd@arndb.de, mingo@kernel.org, plagnioj@jcrosoft.com, adaplas@gmail.com In-Reply-To: <1440443613-13696-4-git-send-email-mcgrof@do-not-panic.com> References: <1440443613-13696-4-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar() Git-Commit-ID: 9e517ac88b2443bebc0499c0b477b155d63648a7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6809 Lines: 222 Commit-ID: 9e517ac88b2443bebc0499c0b477b155d63648a7 Gitweb: http://git.kernel.org/tip/9e517ac88b2443bebc0499c0b477b155d63648a7 Author: Luis R. Rodriguez AuthorDate: Mon, 24 Aug 2015 12:13:25 -0700 Committer: Ingo Molnar CommitDate: Tue, 25 Aug 2015 09:59:44 +0200 drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar() Convert the driver from using the x86-specific MTRR code to the architecture-agnostic arch_phys_wc_add(). It will avoid MTRR if write-combining is available, in order to take advantage of that also ensure the ioremapped area is requested as write-combining. There are a few motivations for this: a) Take advantage of PAT when available b) Help bury MTRR code away, MTRR is architecture-specific and on x86 it is being replaced by PAT. c) Help with the goal of eventually using _PAGE_CACHE_UC over _PAGE_CACHE_UC_MINUS on x86 on ioremap_nocache() (see commit de33c442e titled "x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()") The conversion done is expressed by the following Coccinelle SmPL patch, it additionally required manual intervention to address all the ifdeffery and removal of redundant things which arch_phys_wc_add() already addresses such as verbose message about when MTRR fails and doing nothing when we didn't get an MTRR. @ mtrr_found @ expression index, base, size; @@ -index = mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); +index = arch_phys_wc_add(base, size); @ mtrr_rm depends on mtrr_found @ expression mtrr_found.index, mtrr_found.base, mtrr_found.size; @@ -mtrr_del(index, base, size); +arch_phys_wc_del(index); @ mtrr_rm_zero_arg depends on mtrr_found @ expression mtrr_found.index; @@ -mtrr_del(index, 0, 0); +arch_phys_wc_del(index); @ mtrr_rm_fb_info depends on mtrr_found @ struct fb_info *info; expression mtrr_found.index; @@ -mtrr_del(index, info->fix.smem_start, info->fix.smem_len); +arch_phys_wc_del(index); @ ioremap_replace_nocache depends on mtrr_found @ struct fb_info *info; expression base, size; @@ -info->screen_base = ioremap_nocache(base, size); +info->screen_base = ioremap_wc(base, size); @ ioremap_replace_default depends on mtrr_found @ struct fb_info *info; expression base, size; @@ -info->screen_base = ioremap(base, size); +info->screen_base = ioremap_wc(base, size); Signed-off-by: Luis R. Rodriguez Signed-off-by: Borislav Petkov Acked-by: Tomi Valkeinen Cc: Andrew Morton Cc: Andy Lutomirski Cc: Antonino Daplas Cc: Arnd Bergmann Cc: Daniel Vetter Cc: Dave Airlie Cc: Geert Uytterhoeven Cc: H. Peter Anvin Cc: Jean-Christophe Plagniol-Villard Cc: Jingoo Han Cc: Juergen Gross Cc: Laurent Pinchart Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Suresh Siddha Cc: Thomas Gleixner Cc: airlied@linux.ie Cc: benh@kernel.crashing.org Cc: bhelgaas@google.com Cc: dan.j.williams@intel.com Cc: konrad.wilk@oracle.com Cc: linux-fbdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: mst@redhat.com Cc: toshi.kani@hp.com Cc: vinod.koul@intel.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1440443613-13696-4-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- drivers/video/fbdev/kyro/fbdev.c | 33 +++++++++++---------------------- include/video/kyro.h | 4 +--- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/kyro/fbdev.c b/drivers/video/fbdev/kyro/fbdev.c index 65041e1..5bb0153 100644 --- a/drivers/video/fbdev/kyro/fbdev.c +++ b/drivers/video/fbdev/kyro/fbdev.c @@ -22,9 +22,6 @@ #include #include #include -#ifdef CONFIG_MTRR -#include -#endif #include