From patchwork Thu Jul 9 01:54:19 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: 6752371 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 F233DC05AC for ; Thu, 9 Jul 2015 01:57:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEB0E20642 for ; Thu, 9 Jul 2015 01:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FE1020665 for ; Thu, 9 Jul 2015 01:56:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752409AbbGIBzn (ORCPT ); Wed, 8 Jul 2015 21:55:43 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:36541 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320AbbGIBzF (ORCPT ); Wed, 8 Jul 2015 21:55:05 -0400 Received: by pddu5 with SMTP id u5so68144056pdd.3; Wed, 08 Jul 2015 18:55:04 -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=sjjJN5NLHLLbms8BKoxVCb6Z4hLmQxpdRWAVwf8TB10=; b=ar6m7HslYLp/Lf47nF1N5qj/8SgOGJwiqskbs28K1cDCKRwI99Iwjio5rjywZe68H/ /E/FBt/PdjtX+wWkgiZrxwPq25HJGS4AM0xlsse/7QTy7kRb8zU6virkRAP830oIgSHf qtmTLmKI41MOU0V9xSJqWkxhiLAyY+eDxOp2jn6df+pvdrsa44bJd1M70DgFBJMoytoJ 9BHFHYP7I1ven/J6XBB/U8mbP6TZl40H5H5Ylj5ZgFdynT0DNeuS6K1pBD50x5plhtr0 ePK4TkNSwd5ta5lcXh7MjCqJxNv51pNDbbmptrvmk/rgq7+E3Fn6gtVC/qFveF+GilVi jtdw== X-Received: by 10.68.194.137 with SMTP id hw9mr26021365pbc.139.1436406904371; Wed, 08 Jul 2015 18:55:04 -0700 (PDT) Received: from mcgrof@gmail.com ([2601:646:200:bc5b:ca60:ff:feda:57a7]) by smtp.gmail.com with ESMTPSA id on3sm3882615pbc.48.2015.07.08.18.55.01 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 Jul 2015 18:55:03 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 08 Jul 2015 18:55:00 -0700 From: "Luis R. Rodriguez" To: mingo@kernel.org Cc: bp@suse.de, 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" , Antonino Daplas , Daniel Vetter , Dave Airlie , "H. Peter Anvin" , Jean-Christophe Plagniol-Villard , Jingoo Han , Juergen Gross , "Lad, Prabhakar" , Laurent Pinchart , Rob Clark , Suresh Siddha , Thomas Gleixner Subject: [PATCH v9 8/8] drivers/video/fbdev/vt8623fb: Use arch_phys_wc_add() and pci_iomap_wc() Date: Wed, 8 Jul 2015 18:54:19 -0700 Message-Id: <1436406859-1280-9-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436406859-1280-1-git-send-email-mcgrof@do-not-panic.com> References: <1436406859-1280-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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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" 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(). It will avoid MTRRs 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 Acked-by: Tomi Valkeinen Cc: Andrew Morton Cc: Andy Lutomirski Cc: Antonino Daplas Cc: Arnd Bergmann Cc: benh@kernel.crashing.org Cc: bhelgaas@google.com Cc: Daniel Vetter Cc: Dave Airlie Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Jean-Christophe Plagniol-Villard Cc: Jingoo Han Cc: Juergen Gross Cc: "Lad, Prabhakar" Cc: Laurent Pinchart Cc: linux-fbdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: mst@redhat.com Cc: Rob Clark Cc: Suresh Siddha Cc: Thomas Gleixner Cc: toshi.kani@hp.com Link: http://lkml.kernel.org/r/1435195342-26879-10-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Borislav Petkov --- 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 8bac309c24b9..dd0f18e42d3e 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