From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH 5/6] ARM: Don't set TLB ops broadcasting on UP ARMv7 Date: Thu, 2 Sep 2010 09:22:20 -0700 Message-ID: <20100902162220.GO11597@atomide.com> References: <20100817141210.GJ12184@atomide.com> <20100817154035.GD20325@n2100.arm.linux.org.uk> <20100819073810.GR12184@atomide.com> <4C6CFBAF.6020407@canonical.com> <20100819095705.GU12184@atomide.com> <20100819102025.GA32151@n2100.arm.linux.org.uk> <20100820120622.GL25742@atomide.com> <20100830225527.GC11597@atomide.com> <20100902133637.GJ26319@n2100.arm.linux.org.uk> <20100902161659.GJ11597@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:57905 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753509Ab0IBQWU (ORCPT ); Thu, 2 Sep 2010 12:22:20 -0400 Content-Disposition: inline In-Reply-To: <20100902161659.GJ11597@atomide.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Russell King - ARM Linux Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bryan Wu , Will Deacon >>From 8b22546af2ba9a0d96c2f419bfcec1f3c01a414d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 30 Aug 2010 14:03:28 -0700 Subject: [PATCH 5/6] ARM: Don't set TLB ops broadcasting on UP ARMv7 Don't set TLB ops broadcasting on UP ARMv7. Looks like these bits are also different on A8 and A9. Signed-off-by: Tony Lindgren --- arch/arm/mm/proc-v7.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 07fc660..51a063d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -191,7 +191,8 @@ __v7_setup: UP(mov r0, #(1 << 6)) @ fake it for UP tst r0, #(1 << 6) @ SMP/nAMP mode enabled? orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and - mcreq p15, 0, r0, c1, c0, 1 @ TLB ops broadcasting + SMP(mcreq p15, 0, r0, c1, c0, 1) @ TLB ops broadcasting + UP(nop) @ Don't enable on UP #endif adr r12, __v7_setup_stack @ the local stack stmia r12, {r0-r5, r7, r9, r11, lr} -- 1.7.1