From patchwork Wed Apr 29 21:36: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: 474089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 65777140D4D for ; Wed, 20 May 2015 09:15:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=fdZHiVfF; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752253AbbESXPz (ORCPT ); Tue, 19 May 2015 19:15:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:56343 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752388AbbESXPw (ORCPT ); Tue, 19 May 2015 19:15:52 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 50609AC5D for ; Tue, 19 May 2015 23:15:51 +0000 (UTC) X-Sieve: CMU Sieve 2.3 Received: from prv-mx.provo.novell.com (novprvlin0681.provo.novell.com [130.57.1.19]) by prv1-mh.provo.novell.com with ESMTP (NOT encrypted); Wed, 29 Apr 2015 15:49:30 -0600 Received: from mail-pa0-f47.google.com (209.85.220.47) by prv-mx.provo.novell.com (130.57.1.10) GWAVA SMTP; Wed, 29 Apr 2015 15:49:30 -0600 X-Spam_ID: str=0001.0A010204.554151EA.006C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-GWAVADAT: 0jjcPLCX045Guib47774c48075a1b0298ffdf529f57aa31eab7137b7cef25019fdca7b9b53a8dca117boib3.17boib3.v6 Received: by pabsx10 with SMTP id sx10so39416416pab.3; Wed, 29 Apr 2015 14:49:28 -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=uCYvBuQFWCj3E9L3XiTvO5yrIK/yYehTsjRoPGzygpY=; b=fdZHiVfFMXVbiYZdltd/WfKmirNg6R77E3u2T+/vuQQyo+0iQyzQc8gLDxcmDXu348 OJmv1EpZ3rjAPo3vyfL4vPT9Bl5he0hQmXQ10sbzKFDhu7opMmSQEgZfw/abqDraFpYQ dY31SSvxiSfhlqaKmPtUFNxhvBHTOv9kLSUYGskgLoJ26UUdMrr0UChotD+dvpo37Boh Fve/8bNS4fbkqBTYqaGSv02xO9bNrRNyvAHJBad66nOzvQ+WCr5Vb5S3Dvg9/EBvIRyM Sk31/H/fSnGSxkgFzWNfUdl2dHsyIubbORx/ISyHU+SntKF2M+0jaVhPSH+9QIwpi5Ez uSfA== X-Received: by 10.68.205.197 with SMTP id li5mr2171208pbc.4.1430344168806; Wed, 29 Apr 2015 14:49:28 -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 z5sm153350pbt.54.2015.04.29.14.49.25 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Apr 2015 14:49:27 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 29 Apr 2015 14:47:17 -0700 From: "Luis R. Rodriguez" To: bhelgaas@google.com, mst@redhat.com, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com, airlied@linux.ie, daniel.vetter@intel.com Cc: linux-fbdev@vger.kernel.org, luto@amacapital.net, cocci@systeme.lip6.fr, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , Rob Clark , Laurent Pinchart , Jingoo Han , "Lad, Prabhakar" , Suresh Siddha , Ingo Molnar , Thomas Gleixner , Juergen Gross , Daniel Vetter , Dave Airlie , Antonino Daplas Subject: [PATCH v4 5/5] video: fbdev: vt8623fb: use arch_phys_wc_add() and pci_iomap_wc() Date: Wed, 29 Apr 2015 14:36:12 -0700 Message-Id: <1430343372-687-6-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430343372-687-1-git-send-email-mcgrof@do-not-panic.com> References: <1430343372-687-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 From: "Luis R. Rodriguez" This driver uses the same area for MTRR as for the ioremap(). 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: Rob Clark Cc: Laurent Pinchart Cc: Jingoo Han Cc: "Lad, Prabhakar" 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 Signed-off-by: Luis R. Rodriguez --- drivers/video/fbdev/vt8623fb.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c index ea7f056..60f24828 100644 --- a/drivers/video/fbdev/vt8623fb.c +++ b/drivers/video/fbdev/vt8623fb.c @@ -26,13 +26,9 @@ #include /* Why should fb driver call console functions? because console_lock() */ #include