linux-kernel - [PATCH v6 2/4] drivers/video/fbdev/atyfb: Clarify ioremap() base and length used

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1436491499-3289-3-git-send-email-mcgrof@do-not-panic.com>
Date:	Thu,  9 Jul 2015 18:24:57 -0700
From:	"Luis R. Rodriguez" <mcgrof@...not-panic.com>
To:	mingo@...nel.org
Cc:	bp@...e.de, tomi.valkeinen@...com, airlied@...hat.com,
	arnd@...db.de, dan.j.williams@...el.com, hch@....de,
	luto@...capital.net, hpa@...or.com, tglx@...utronix.de,
	geert@...ux-m68k.org, ralf@...ux-mips.org, hmh@....eng.br,
	ross.zwisler@...ux.intel.com, akpm@...ux-foundation.org,
	jgross@...e.com, benh@...nel.crashing.org, mpe@...erman.id.au,
	tj@...nel.org, x86@...nel.org, mst@...hat.com, toshi.kani@...com,
	stefan.bader@...onical.com, syrjala@....fi,
	ville.syrjala@...ux.intel.com, linux-pci@...r.kernel.org,
	linux-mm@...ck.org, linux-fbdev@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	"Luis R. Rodriguez" <mcgrof@...e.com>,
	Andrzej Hajda <a.hajda@...sung.com>,
	Antonino Daplas <adaplas@...il.com>,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	Davidlohr Bueso <dbueso@...e.de>, Ingo Molnar <mingo@...e.hu>,
	Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Mathias Krause <minipli@...glemail.com>,
	Mel Gorman <mgorman@...e.de>, Rob Clark <robdclark@...il.com>,
	Suresh Siddha <sbsiddha@...il.com>,
	Vlastimil Babka <vbabka@...e.cz>
Subject: [PATCH v6 2/4] drivers/video/fbdev/atyfb: Clarify ioremap() base and length used

From: "Luis R. Rodriguez" <mcgrof@...e.com>

Adjust the ioremap() call for the framebuffer to use the same values we
later use for the framebuffer. This will make it easier to review the
next change.

The size of the framebuffer varies but since this is for PCI we *know*
this defaults to 0x800000. atyfb_setup_generic() is *only* used on PCI
probe.

No functional change.

Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
Cc: airlied@...hat.com
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andrzej Hajda <a.hajda@...sung.com>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Antonino Daplas <adaplas@...il.com>
Cc: benh@...nel.crashing.org
Cc: Daniel Vetter <daniel.vetter@...ll.ch>
Cc: Dave Airlie <airlied@...hat.com>
Cc: Davidlohr Bueso <dbueso@...e.de>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>
Cc: Juergen Gross <jgross@...e.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-fbdev@...r.kernel.org
Cc: linux-pci@...r.kernel.org
Cc: Mathias Krause <minipli@...glemail.com>
Cc: Mel Gorman <mgorman@...e.de>
Cc: mst@...hat.com
Cc: Rob Clark <robdclark@...il.com>
Cc: Suresh Siddha <sbsiddha@...il.com>
Cc: syrjala@....fi
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tomi Valkeinen <tomi.valkeinen@...com>
Cc: Toshi Kani <toshi.kani@...com>
Cc: Ville Syrjälä <syrjala@....fi>
Cc: Vlastimil Babka <vbabka@...e.cz>
Signed-off-by: Borislav Petkov <bp@...e.de>
---
 drivers/video/fbdev/aty/atyfb_base.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 16936bb1f865..513e58df9d3f 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -3489,7 +3489,21 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info,
 
 	/* Map in frame buffer */
 	info->fix.smem_start = addr;
-	info->screen_base = ioremap(addr, 0x800000);
+
+	/*
+	 * The framebuffer is not always 8 MiB that's just the size of the
+	 * PCI BAR. We temporarily abuse smem_len here to store the size
+	 * of the BAR. aty_init() will later correct it to match the actual
+	 * framebuffer size.
+	 *
+	 * On devices that don't have the auxiliary register aperture, the
+	 * registers are housed at the top end of the framebuffer PCI BAR.
+	 * aty_fudge_framebuffer_len() is used to reduce smem_len to not
+	 * overlap with the registers.
+	 */
+	info->fix.smem_len = 0x800000;
+
+	info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
 	if (info->screen_base == NULL) {
 		ret = -ENOMEM;
 		goto atyfb_setup_generic_fail;
-- 
2.3.2.209.gd67f9d5.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/