From patchwork Wed May 20 23:08:11 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: 6450961 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6B4EF9F38D for ; Wed, 20 May 2015 23:15:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D090C2041E for ; Wed, 20 May 2015 23:15:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37F03202EB for ; Wed, 20 May 2015 23:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241AbbETXO4 (ORCPT ); Wed, 20 May 2015 19:14:56 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:36204 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874AbbETXOz (ORCPT ); Wed, 20 May 2015 19:14:55 -0400 Received: by pdfh10 with SMTP id h10so85551871pdf.3; Wed, 20 May 2015 16:14:54 -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=6s4sR77Pz6cA49vsjSyz0YgbG1jkXKaZllDR1lwTG7Q=; b=EyUMiBOVuHf29lwV23f/JK2M5RfqPeoaDzcbmP8driVIz9DRLEbdZ+LTueM2YgKQri FnKTv6xEmbhXKDD8nR+NEwV3NNb1XWxFo9PpZpPr9EnIrUI9z1i6cOAA+U1Bw5vSg5l0 h8piEEOJmee6Iw+S9FtsHrqnB6nBup5rtJXt9XogK7okGsSrvLTM3N5b1ArUoWvZveSo TIXCW8X+MYkHh4kGZjPmG7pb0aRnUhjHICK0OJLo3Y01x/7wIgF1zIfiAzsXhdK91Nz4 tSXJLkiVOcNXcDtE8wDSdAr/OoR6VKxJWQ+UFr1TqWPbYzp/LZyYw6/nYNLYcoH8mo02 1M+g== X-Received: by 10.68.215.35 with SMTP id of3mr67497088pbc.50.1432163694518; Wed, 20 May 2015 16:14:54 -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 zt9sm17255696pac.9.2015.05.20.16.14.51 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 20 May 2015 16:14:53 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 20 May 2015 16:12:43 -0700 From: "Luis R. Rodriguez" To: bhelgaas@google.com Cc: tomi.valkeinen@ti.com, airlied@linux.ie, linux-fbdev@vger.kernel.org, luto@amacapital.net, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xensource.com, "Luis R. Rodriguez" , Laurent Pinchart , Geert Uytterhoeven , "Lad, Prabhakar" , Suresh Siddha , Ingo Molnar , Thomas Gleixner , Juergen Gross , Daniel Vetter , Dave Airlie , Antonino Daplas , Jean-Christophe Plagniol-Villard Subject: [PATCH v6 2/4] video: fbdev: arkfb: use arch_phys_wc_add() and pci_iomap_wc() Date: Wed, 20 May 2015 16:08:11 -0700 Message-Id: <1432163293-20965-3-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432163293-20965-1-git-send-email-mcgrof@do-not-panic.com> References: <1432163293-20965-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" 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: Laurent Pinchart Cc: Geert Uytterhoeven 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 Acked-by: Tomi Valkeinen Signed-off-by: Luis R. Rodriguez --- drivers/video/fbdev/arkfb.c | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c index b305a1e..6a317de 100644 --- a/drivers/video/fbdev/arkfb.c +++ b/drivers/video/fbdev/arkfb.c @@ -26,13 +26,9 @@ #include /* Why should fb driver call console functions? because console_lock() */ #include