video: fbdev: neofb: use arch_phys_wc_add() and ioremap_wc()

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: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 44f99a60bb9b768a9bcef3e8f3520dd0636d6222..db023a97d1eaedca6dc1d1c8929330c4a993f390 100644 (file)
--- a/drivers/video/fbdev/neofb.c
+++ b/drivers/video/fbdev/neofb.c
@@ -71,11 +71,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
-
-#ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
-#endif
-
 #include <video/vga.h>
 #include <video/neomagic.h>
 
@@ -1710,6 +1705,7 @@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
                         int video_len)
 {
        //unsigned long addr;
+       struct neofb_par *par = info->par;
 
        DBG("neo_map_video");
 
@@ -1723,7 +1719,7 @@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
        }
 
        info->screen_base =
-           ioremap(info->fix.smem_start, info->fix.smem_len);
+           ioremap_wc(info->fix.smem_start, info->fix.smem_len);
        if (!info->screen_base) {
                printk("neofb: unable to map screen memory\n");
                release_mem_region(info->fix.smem_start,
@@ -1733,11 +1729,8 @@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
                printk(KERN_INFO "neofb: mapped framebuffer at %p\n",
                       info->screen_base);
 
-#ifdef CONFIG_MTRR
-       ((struct neofb_par *)(info->par))->mtrr =
-               mtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),
-                               MTRR_TYPE_WRCOMB, 1);
-#endif
+       par->wc_cookie = arch_phys_wc_add(info->fix.smem_start,
+                                         pci_resource_len(dev, 0));
 
        /* Clear framebuffer, it's all white in memory after boot */
        memset_io(info->screen_base, 0, info->fix.smem_len);
@@ -1754,16 +1747,11 @@ static int neo_map_video(struct fb_info *info, struct pci_dev *dev,
 
 static void neo_unmap_video(struct fb_info *info)
 {
-       DBG("neo_unmap_video");
+       struct neofb_par *par = info->par;
 
-#ifdef CONFIG_MTRR
-       {
-               struct neofb_par *par = info->par;
+       DBG("neo_unmap_video");
 
-               mtrr_del(par->mtrr, info->fix.smem_start,
-                        info->fix.smem_len);
-       }
-#endif
+       arch_phys_wc_del(par->wc_cookie);
        iounmap(info->screen_base);
        info->screen_base = NULL;
 

diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index bc5013e8059d562cbffd46c214c7c7e485abf76d..91e225a6107d4ab000984b6634b1f43402f3d496 100644 (file)
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -159,10 +159,7 @@ struct neofb_par {
        unsigned char VCLK3NumeratorHigh;
        unsigned char VCLK3Denominator;
        unsigned char VerticalExt;
-
-#ifdef CONFIG_MTRR
-       int mtrr;
-#endif
+       int wc_cookie;
        u8 __iomem *mmio_vbase;
        u8 cursorOff;
        u8 *cursorPad;          /* Must die !! */