From patchwork Fri Mar 20 23:18:12 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: 6062251 Return-Path: X-Original-To: patchwork-linux-fbdev@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 B38B4BF90F for ; Sat, 21 Mar 2015 00:09:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99122203F4 for ; Sat, 21 Mar 2015 00:09:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65BFA2041D for ; Sat, 21 Mar 2015 00:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751174AbbCUAJX (ORCPT ); Fri, 20 Mar 2015 20:09:23 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:36591 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbbCUAJW (ORCPT ); Fri, 20 Mar 2015 20:09:22 -0400 Received: by pdbcz9 with SMTP id cz9so122692316pdb.3; Fri, 20 Mar 2015 17:09:22 -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=lbnVFqoarrVhqzeL/NvR8FXMa8Hyfa8/hAip/euUr6c=; b=CO0+Qdvu7dRQg446Ode5uEy8vAYqwth9rx0Qnyz0qX6TloORqTgCw+GLwzF7xqvqqg IkTgE0NZ5gB1UE4cT7BizKFZz/xOGcTMW+oN0/9SgECsefWT6/anl6Avz0AAvk8VyOo4 udsdOu3061k+V5o6zM6PAm2UFfPCtyoWHvmXuDY0vGy8i1OG6lFSNuDtOdp5ucyl0Evp JwK5HbhTboQy/52z7w3OBAe6KoP8ZRAonCSGqx64pIzVqNOo26v3H1Na3wxLPPZwndmF LssgjUg3eQt9Z7oE+pTdBztPB2fOPbdejc0oHnoAot/esPgoNO35QUU2E7kHRE3JLKIy DcMQ== X-Received: by 10.70.53.170 with SMTP id c10mr123422642pdp.148.1426896562263; Fri, 20 Mar 2015 17:09:22 -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 l2sm193259pbq.30.2015.03.20.17.09.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 20 Mar 2015 17:09:20 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Fri, 20 Mar 2015 17:07:10 -0700 From: "Luis R. Rodriguez" To: luto@amacapital.net, mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, jgross@suse.com, JBeulich@suse.com, bp@suse.de, suresh.b.siddha@intel.com, venkatesh.pallipadi@intel.com, airlied@redhat.com Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, "Luis R. Rodriguez" , Ingo Molnar , Daniel Vetter , Antonino Daplas , Jean-Christophe Plagniol-Villard , Tomi Valkeinen Subject: [PATCH v1 22/47] staging: sm750fb: use arch_phys_wc_add() and ioremap_wc() Date: Fri, 20 Mar 2015 16:18:12 -0700 Message-Id: <1426893517-2511-23-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426893517-2511-1-git-send-email-mcgrof@do-not-panic.com> References: <1426893517-2511-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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" The same area used for ioremap() is used for the MTRR area. 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() (de33c442e) 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: Suresh Siddha Cc: Venkatesh Pallipadi 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 Signed-off-by: Luis R. Rodriguez --- drivers/staging/sm750fb/sm750.c | 34 ++++------------------------------ drivers/staging/sm750fb/sm750.h | 3 --- drivers/staging/sm750fb/sm750_hw.c | 3 +-- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index aa0888c..ea59471 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -16,9 +16,6 @@ #include #include #include -#ifdef CONFIG_MTRR -#include -#endif #include #include "sm750.h" #include "sm750_hw.h" @@ -47,9 +44,7 @@ typedef int (*PROC_SPEC_INITHW)(struct lynx_share*,struct pci_dev*); /* common var for all device */ static int g_hwcursor = 1; static int g_noaccel = 0; -#ifdef CONFIG_MTRR static int g_nomtrr = 0; -#endif static const char * g_fbmode[] = {NULL,NULL}; static const char * g_def_fbmode = "800x600-16@60"; static char * g_settings = NULL; @@ -1102,11 +1097,8 @@ static int lynxfb_pci_probe(struct pci_dev * pdev, pr_info("share->revid = %02x\n",share->revid); share->pdev = pdev; -#ifdef CONFIG_MTRR share->mtrr_off = g_nomtrr; share->mtrr.vram = 0; - share->mtrr.vram_added = 0; -#endif share->accel_off = g_noaccel; share->dual = g_dualview; spin_lock_init(&share->slock); @@ -1134,22 +1126,9 @@ static int lynxfb_pci_probe(struct pci_dev * pdev, goto err_map; } -#ifdef CONFIG_MTRR - if(!share->mtrr_off){ - pr_info("enable mtrr\n"); - share->mtrr.vram = mtrr_add(share->vidmem_start, - share->vidmem_size, - MTRR_TYPE_WRCOMB,1); - - if(share->mtrr.vram < 0){ - /* don't block driver with the failure of MTRR */ - pr_err("Unable to setup MTRR.\n"); - }else{ - share->mtrr.vram_added = 1; - pr_info("MTRR added succesfully\n"); - } - } -#endif + if (!share->mtrr_off) + share->mtrr.vram = arch_phys_wc_add(share->vidmem_start, + share->vidmem_size); memset(share->pvMem,0,share->vidmem_size); @@ -1250,10 +1229,7 @@ static void __exit lynxfb_pci_remove(struct pci_dev * pdev) /* release frame buffer*/ framebuffer_release(info); } -#ifdef CONFIG_MTRR - if(share->mtrr.vram_added) - mtrr_del(share->mtrr.vram,share->vidmem_start,share->vidmem_size); -#endif + arch_phys_wc_del(share->mtrr.vram); // pci_release_regions(pdev); iounmap(share->pvReg); @@ -1297,10 +1273,8 @@ static int __init lynxfb_setup(char * options) /* options that mean for any lynx chips are configured here */ if(!strncmp(opt,"noaccel",strlen("noaccel"))) g_noaccel = 1; -#ifdef CONFIG_MTRR else if(!strncmp(opt,"nomtrr",strlen("nomtrr"))) g_nomtrr = 1; -#endif else if(!strncmp(opt,"dual",strlen("dual"))) g_dualview = 1; else diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index 0847d2b..5528912 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -51,13 +51,10 @@ struct lynx_share{ struct lynx_accel accel; int accel_off; int dual; -#ifdef CONFIG_MTRR int mtrr_off; struct{ int vram; - int vram_added; }mtrr; -#endif /* all smi graphic adaptor got below attributes */ unsigned long vidmem_start; unsigned long vidreg_start; diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index c44a50b..203a0a1 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -85,8 +85,7 @@ int hw_sm750_map(struct lynx_share* share,struct pci_dev* pdev) } #endif - share->pvMem = ioremap(share->vidmem_start, - share->vidmem_size); + share->pvMem = ioremap_wc(share->vidmem_start, share->vidmem_size); if(!share->pvMem){ pr_err("Map video memory failed\n");