Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754332AbbETTqi (ORCPT ); Wed, 20 May 2015 15:46:38 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45263 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbbETTqg (ORCPT ); Wed, 20 May 2015 15:46:36 -0400 Date: Wed, 20 May 2015 21:46:32 +0200 From: "Luis R. Rodriguez" To: Tomi Valkeinen Cc: "Luis R. Rodriguez" , plagnioj@jcrosoft.com, hpa@zytor.com, linux-fbdev@vger.kernel.org, luto@amacapital.net, cocci@systeme.lip6.fr, Toshi Kani , Suresh Siddha , Ingo Molnar , Thomas Gleixner , Juergen Gross , Daniel Vetter , Dave Airlie , Antonino Daplas , Rob Clark , Jingoo Han , Wolfram Sang , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/3] video: fbdev: vesafb: add missing mtrr_del() for added MTRR Message-ID: <20150520194632.GY23057@wotan.suse.de> References: <1429648850-17902-1-git-send-email-mcgrof@do-not-panic.com> <1429648850-17902-3-git-send-email-mcgrof@do-not-panic.com> <555C594E.1010607@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <555C594E.1010607@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4381 Lines: 125 On Wed, May 20, 2015 at 12:52:14PM +0300, Tomi Valkeinen wrote: > Hi Luis, > > On 21/04/15 23:40, Luis R. Rodriguez wrote: > > From: "Luis R. Rodriguez" > > > > The MTRR added was never being deleted. > > > > 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: Rob Clark > > Cc: Jingoo Han > > Cc: Wolfram Sang > > 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/vesafb.c | 30 ++++++++++++++++++++++++------ > > 1 file changed, 24 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c > > index 191156b..a2261d0 100644 > > --- a/drivers/video/fbdev/vesafb.c > > +++ b/drivers/video/fbdev/vesafb.c > > @@ -29,6 +29,10 @@ > > > > /* --------------------------------------------------------------------- */ > > > > +struct vesafb_par { > > + int wc_cookie; > > +}; > > + > > static struct fb_var_screeninfo vesafb_defined = { > > .activate = FB_ACTIVATE_NOW, > > .height = -1, > > @@ -175,7 +179,16 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green, > > > > static void vesafb_destroy(struct fb_info *info) > > { > > +#ifdef CONFIG_MTRR > > + struct vesafb_par *par = info->par; > > +#endif > > + > > fb_dealloc_cmap(&info->cmap); > > + > > +#ifdef CONFIG_MTRR > > + if (par->wc_cookie >= 0) > > + mtrr_del(par->wc_cookie, 0, 0); > > +#endif > > if (info->screen_base) > > iounmap(info->screen_base); > > release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size); > > @@ -228,6 +241,7 @@ static int vesafb_setup(char *options) > > static int vesafb_probe(struct platform_device *dev) > > { > > struct fb_info *info; > > + struct vesafb_par *par; > > int i, err; > > unsigned int size_vmode; > > unsigned int size_remap; > > @@ -297,8 +311,8 @@ static int vesafb_probe(struct platform_device *dev) > > return -ENOMEM; > > } > > platform_set_drvdata(dev, info); > > - info->pseudo_palette = info->par; > > - info->par = NULL; > > + info->pseudo_palette = NULL; > > + par = info->par; > > > > /* set vesafb aperture size for generic probing */ > > info->apertures = alloc_apertures(1); > > @@ -407,17 +421,17 @@ static int vesafb_probe(struct platform_device *dev) > > if (mtrr == 3) { > > #ifdef CONFIG_MTRR > > unsigned int temp_size = size_total; > > - int rc; > > > > /* Find the largest power-of-two */ > > temp_size = roundup_pow_of_two(temp_size); > > > > /* Try and find a power of two to add */ > > do { > > - rc = mtrr_add(vesafb_fix.smem_start, temp_size, > > - MTRR_TYPE_WRCOMB, 1); > > + par->wc_cookie = mtrr_add(vesafb_fix.smem_start, > > + temp_size, > > + MTRR_TYPE_WRCOMB, 1); > > temp_size >>= 1; > > - } while (temp_size >= PAGE_SIZE && rc == -EINVAL); > > + } while (temp_size >= PAGE_SIZE && par->wc_cookie == -EINVAL); > > #endif > > info->screen_base = ioremap_wc(vesafb_fix.smem_start, vesafb_fix.smem_len); > > } else { > > @@ -462,6 +476,10 @@ static int vesafb_probe(struct platform_device *dev) > > fb_info(info, "%s frame buffer device\n", info->fix.id); > > return 0; > > err: > > +#ifdef CONFIG_MTRR > > + if (par->wc_cookie >= 0) > > + mtrr_del(par->wc_cookie, 0, 0); > > +#endif > > if (info->screen_base) > > iounmap(info->screen_base); > > framebuffer_release(info); > > Hmm, this looks a bit odd... You're removing the pseudo_palette, and > using its memory for mtrr cookie? You are totally right, sorry, will spin a v3. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/