Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753006AbbFLJFU (ORCPT ); Fri, 12 Jun 2015 05:05:20 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:56214 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750853AbbFLJFL (ORCPT ); Fri, 12 Jun 2015 05:05:11 -0400 Message-ID: <557AA08E.6050606@ti.com> Date: Fri, 12 Jun 2015 12:04:14 +0300 From: Tomi Valkeinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "Luis R. Rodriguez" CC: , , , , , , , , , , , , , , , , , "Luis R. Rodriguez" Subject: Re: [PATCH v4 3/3] video: fbdev: vesafb: use arch_phys_wc_add() References: <1433436288-16792-1-git-send-email-mcgrof@do-not-panic.com> <1433436288-16792-4-git-send-email-mcgrof@do-not-panic.com> In-Reply-To: <1433436288-16792-4-git-send-email-mcgrof@do-not-panic.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xp6FBBjTRexLOb0hHjnk0l0MG0AWonsoW" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6758 Lines: 205 --xp6FBBjTRexLOb0hHjnk0l0MG0AWonsoW Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 04/06/15 19:44, Luis R. Rodriguez wrote: > From: "Luis R. Rodriguez" >=20 > This driver uses the same area for MTRR as for the ioremap_wc(), if > anything it just uses a smaller size in case MTRR reservation fails. > ioremap_wc() API is already used to take advantage of architecture > write-combining when available. >=20 > 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. >=20 > There are a few motivations for this: >=20 > a) Take advantage of PAT when available >=20 > b) Help bury MTRR code away, MTRR is architecture specific and on > x86 its replaced by PAT >=20 > 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()") >=20 > 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. >=20 > @ mtrr_found @ > expression index, base, size; > @@ >=20 > -index =3D mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); > +index =3D arch_phys_wc_add(base, size); >=20 > @ mtrr_rm depends on mtrr_found @ > expression mtrr_found.index, mtrr_found.base, mtrr_found.size; > @@ >=20 > -mtrr_del(index, base, size); > +arch_phys_wc_del(index); >=20 > @ mtrr_rm_zero_arg depends on mtrr_found @ > expression mtrr_found.index; > @@ >=20 > -mtrr_del(index, 0, 0); > +arch_phys_wc_del(index); >=20 > @ mtrr_rm_fb_info depends on mtrr_found @ > struct fb_info *info; > expression mtrr_found.index; > @@ >=20 > -mtrr_del(index, info->fix.smem_start, info->fix.smem_len); > +arch_phys_wc_del(index); >=20 > @ ioremap_replace_nocache depends on mtrr_found @ > struct fb_info *info; > expression base, size; > @@ >=20 > -info->screen_base =3D ioremap_nocache(base, size); > +info->screen_base =3D ioremap_wc(base, size); >=20 > @ ioremap_replace_default depends on mtrr_found @ > struct fb_info *info; > expression base, size; > @@ >=20 > -info->screen_base =3D ioremap(base, size); > +info->screen_base =3D ioremap_wc(base, size); >=20 > Generated-by: Coccinelle SmPL > Cc: Toshi Kani > 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: Rob Clark > Cc: Jingoo Han > Cc: Wolfram Sang > Cc: Tomi Valkeinen > Cc: linux-fbdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Luis R. Rodriguez > --- > drivers/video/fbdev/vesafb.c | 29 ++++++++--------------------- > 1 file changed, 8 insertions(+), 21 deletions(-) >=20 > diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.= c > index 3db3908..528fe91 100644 > --- a/drivers/video/fbdev/vesafb.c > +++ b/drivers/video/fbdev/vesafb.c > @@ -19,10 +19,9 @@ > #include > #include > #include > +#include > =20 > #include