linux-kernel - RE: [ 028/108] ARM: imx: armadillo5x0: Fix illegal register access

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: <86D15885F63D1143A519F161FB828EAF165AA3@039-SN2MPN1-011.039d.mgd.msft.net>
Date:	Sun, 7 Oct 2012 23:37:30 +0000
From:	Estevam Fabio-R49496 <r49496@...escale.com>
To:	Ben Hutchings <ben@...adent.org.uk>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"stable@...r.kernel.org" <stable@...r.kernel.org>
CC:	"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
	"alan@...rguk.ukuu.org.uk" <alan@...rguk.ukuu.org.uk>,
	Arnd Bergmann <arnd@...db.de>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: RE: [ 028/108] ARM: imx: armadillo5x0: Fix illegal register access

No, please drop it from 3.2-stable.

This one should only go to 3.5/3.6 stable trees.

Otherwise it will break 3.2-stable.

Regards,

Fabio Estevam
________________________________________
From: Ben Hutchings [ben@...adent.org.uk]
Sent: Sunday, October 07, 2012 5:59 PM
To: linux-kernel@...r.kernel.org; stable@...r.kernel.org
Cc: akpm@...ux-foundation.org; alan@...rguk.ukuu.org.uk; Estevam Fabio-R49496; Arnd Bergmann; Sascha Hauer
Subject: [ 028/108] ARM: imx: armadillo5x0: Fix illegal register access

3.2-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Fabio Estevam <fabio.estevam@...escale.com>

commit 35495173e1df621dff0e9a244accbe32cd28a98f upstream.

Since commit eb92044eb (ARM i.MX3: Make ccm base address a variable )
it is necessary to pass the CCM register base as a variable.

Fix the CCM register access in mach-armadillo5x0 by passing mx3_ccm_base and
avoid illegal accesses.

Also applies to v3.5

Reported-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Fabio Estevam <fabio.estevam@...escale.com>
Acked-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Sascha Hauer <s.hauer@...gutronix.de>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
 arch/arm/mach-imx/mach-armadillo5x0.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c
index 2c6ab32..5985ed1 100644
--- a/arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -526,7 +526,8 @@ static void __init armadillo5x0_init(void)
        imx31_add_mxc_nand(&armadillo5x0_nand_board_info);

        /* set NAND page size to 2k if not configured via boot mode pins */
-       __raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);
+       __raw_writel(__raw_readl(mx3_ccm_base + MXC_CCM_RCSR) |
+                                       (1 << 30), mx3_ccm_base + MXC_CCM_RCSR);

        /* RTC */
        /* Get RTC IRQ and register the chip */




--
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/