From patchwork Thu Jun 25 01:22:16 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: 6671601 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4FE68C05AC for ; Thu, 25 Jun 2015 01:31:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 704D220574 for ; Thu, 25 Jun 2015 01:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4418120557 for ; Thu, 25 Jun 2015 01:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751972AbbFYBbN (ORCPT ); Wed, 24 Jun 2015 21:31:13 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:34686 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751724AbbFYBbM (ORCPT ); Wed, 24 Jun 2015 21:31:12 -0400 Received: by pdbep18 with SMTP id ep18so20086003pdb.1; Wed, 24 Jun 2015 18:31:11 -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:in-reply-to:references; bh=OG6ELibgWt7Jyrjnvj8mswel4PRf59U8Wv1obsXw+l8=; b=UTxwilHFtmSW6pqyt4x7W2xHykkQbRzgm2eZ9uWp8kzXqZi/XKbIMIk+TwtiElI57K zhHMOD0SIoCmWTyVvKo8OSW59MFKN6xH4lYdpkcWdruihVAq38n2gw9jxUrEPdrvSj/k uNpf/7t1QAO4KOf/n9Qy4rdXJvW8HQ2kkXP+mj6jBwPrpJNfrSyjh03PwyuuzUl5cWze 5i/ZmaYxokGtRWI3hPrHmo+54ZVr9L4dyjT6SKuyL+X9CHI3Exbug/PSyjvCWoyoN4Lb LkRni4RBafGuRSI9dc5qcvyqqH/ACrQkDO6RAfElSAQKK/QSVGUrbS6at5t5xO4K25Tt 2hWQ== X-Received: by 10.70.103.70 with SMTP id fu6mr87254761pdb.22.1435195871681; Wed, 24 Jun 2015 18:31:11 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id fe10sm28108044pdb.59.2015.06.24.18.31.08 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 24 Jun 2015 18:31:10 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 24 Jun 2015 18:29:00 -0700 From: "Luis R. Rodriguez" To: bp@suse.de Cc: mingo@kernel.org, arnd@arndb.de, bhelgaas@google.com, luto@amacapital.net, akpm@linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, tomi.valkeinen@ti.com, mst@redhat.com, toshi.kani@hp.com, linux-fbdev@vger.kernel.org, xen-devel@lists.xensource.com, benh@kernel.crashing.org, "Luis R. Rodriguez" , Jingoo Han , Geert Uytterhoeven , Laurent Pinchart , Suresh Siddha , Ingo Molnar , Thomas Gleixner , Juergen Gross , Daniel Vetter , Dave Airlie , Antonino Daplas , Jean-Christophe Plagniol-Villard Subject: [PATCH v8 3/9] video: fbdev: kyrofb: use arch_phys_wc_add() and pci_ioremap_wc_bar() Date: Wed, 24 Jun 2015 18:22:16 -0700 Message-Id: <1435195342-26879-4-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435195342-26879-1-git-send-email-mcgrof@do-not-panic.com> References: <1435195342-26879-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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=unavailable 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" Convert the driver from using the x86 specific MTRR code to the architecture agnostic arch_phys_wc_add(). arch_phys_wc_add() will avoid MTRR if write-combining is available, in order to take advantage of that also ensure the ioremap'd 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 its 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 #ifdery 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); Generated-by: Coccinelle SmPL Cc: Jingoo Han Cc: Geert Uytterhoeven Cc: Laurent Pinchart Cc: Suresh Siddha Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Juergen Gross Cc: Daniel Vetter Cc: Andy Lutomirski Cc: Dave Airlie Cc: Antonino Daplas Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Acked-by: Tomi Valkeinen Signed-off-by: Luis R. Rodriguez --- 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