All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Walker <dwalker@codeaurora.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
	Jeff Ohlstein <johlstei@codeaurora.org>,
	linux-arm-msm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Daniel Walker <dwalker@codeaurora.org>
Subject: [PATCH 3/4] arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM
Date: Thu,  9 Sep 2010 12:58:08 -0700	[thread overview]
Message-ID: <1284062289-10914-4-git-send-email-dwalker@codeaurora.org> (raw)
In-Reply-To: <1284062289-10914-1-git-send-email-dwalker@codeaurora.org>

Setting of these bits can cause issues on other SMP SoC's not produced
by ARM.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/mm/proc-v7.S |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 6a8506d..60cfab9 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -186,13 +186,14 @@ cpu_v7_name:
  *	It is assumed that:
  *	- cache type register is implemented
  */
-__v7_setup:
+__v7_ca9mp_setup:
 #ifdef CONFIG_SMP
 	mrc	p15, 0, r0, c1, c0, 1
 	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
 #endif
+__v7_setup:
 	adr	r12, __v7_setup_stack		@ the local stack
 	stmia	r12, {r0-r5, r7, r9, r11, lr}
 	bl	v7_flush_dcache_all
@@ -323,6 +324,29 @@ cpu_elf_name:
 
 	.section ".proc.info.init", #alloc, #execinstr
 
+	.type   __v7_ca9mp_proc_info, #object
+__v7_ca9mp_proc_info:
+	.long	0x410fc090		@ Required ID value
+	.long	0xff0ffff0		@ Mask for ID
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ | \
+		PMD_FLAGS
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_XN | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ
+	b	__v7_ca9mp_setup
+	.long	cpu_arch_name
+	.long	cpu_elf_name
+	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
+	.long	cpu_v7_name
+	.long	v7_processor_functions
+	.long	v7wbi_tlb_fns
+	.long	v6_user_fns
+	.long	v7_cache_fns
+	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
+
 	/*
 	 * Match any ARMv7 processor core.
 	 */
-- 
1.7.1


WARNING: multiple messages have this Message-ID (diff)
From: dwalker@codeaurora.org (Daniel Walker)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM
Date: Thu,  9 Sep 2010 12:58:08 -0700	[thread overview]
Message-ID: <1284062289-10914-4-git-send-email-dwalker@codeaurora.org> (raw)
In-Reply-To: <1284062289-10914-1-git-send-email-dwalker@codeaurora.org>

Setting of these bits can cause issues on other SMP SoC's not produced
by ARM.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
 arch/arm/mm/proc-v7.S |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 6a8506d..60cfab9 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -186,13 +186,14 @@ cpu_v7_name:
  *	It is assumed that:
  *	- cache type register is implemented
  */
-__v7_setup:
+__v7_ca9mp_setup:
 #ifdef CONFIG_SMP
 	mrc	p15, 0, r0, c1, c0, 1
 	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
 #endif
+__v7_setup:
 	adr	r12, __v7_setup_stack		@ the local stack
 	stmia	r12, {r0-r5, r7, r9, r11, lr}
 	bl	v7_flush_dcache_all
@@ -323,6 +324,29 @@ cpu_elf_name:
 
 	.section ".proc.info.init", #alloc, #execinstr
 
+	.type   __v7_ca9mp_proc_info, #object
+__v7_ca9mp_proc_info:
+	.long	0x410fc090		@ Required ID value
+	.long	0xff0ffff0		@ Mask for ID
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ | \
+		PMD_FLAGS
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_XN | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ
+	b	__v7_ca9mp_setup
+	.long	cpu_arch_name
+	.long	cpu_elf_name
+	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
+	.long	cpu_v7_name
+	.long	v7_processor_functions
+	.long	v7wbi_tlb_fns
+	.long	v6_user_fns
+	.long	v7_cache_fns
+	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
+
 	/*
 	 * Match any ARMv7 processor core.
 	 */
-- 
1.7.1

  parent reply	other threads:[~2010-09-09 19:58 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-09 19:58 [GIT PULL] generic arm MSM changes for v2.6.37 Daniel Walker
2010-09-09 19:58 ` Daniel Walker
2010-09-09 19:58 ` [PATCH 1/4] arm: Kconfig option for ARCH_MSM_SCORPIONMP Daniel Walker
2010-09-09 19:58   ` Daniel Walker
2010-09-10 10:14   ` Sergei Shtylyov
2010-09-10 10:14     ` Sergei Shtylyov
2010-09-10 14:51     ` Uwe Kleine-König
2010-09-10 14:51       ` Uwe Kleine-König
2010-09-10 15:04       ` Daniel Walker
2010-09-10 15:04         ` Daniel Walker
2010-09-11 11:02       ` Sergei Shtylyov
2010-09-11 11:02         ` Sergei Shtylyov
2010-09-10 15:15     ` Lorenzo Pieralisi
2010-09-10 15:15       ` Lorenzo Pieralisi
2010-09-10 20:36   ` Russell King - ARM Linux
2010-09-10 20:36     ` Russell King - ARM Linux
2010-09-10 21:01     ` Daniel Walker
2010-09-10 21:01       ` Daniel Walker
2010-09-09 19:58 ` [PATCH 2/4] arm: dis-allow hotplug on MSM Daniel Walker
2010-09-09 19:58   ` Daniel Walker
2010-09-30  7:19   ` Pavel Machek
2010-09-30  7:19     ` Pavel Machek
2010-09-30 16:45     ` Daniel Walker
2010-09-30 16:45       ` Daniel Walker
2010-09-30 18:09       ` Daniel Walker
2010-09-30 18:09         ` Daniel Walker
2010-09-30 19:52         ` Pavel Machek
2010-09-30 19:52           ` Pavel Machek
2010-09-30 19:55           ` Daniel Walker
2010-09-30 19:55             ` Daniel Walker
2010-09-30 20:02             ` Pavel Machek
2010-09-30 20:02               ` Pavel Machek
2010-09-30 20:08               ` Daniel Walker
2010-09-30 20:08                 ` Daniel Walker
2010-09-30 20:17                 ` Russell King - ARM Linux
2010-09-30 20:17                   ` Russell King - ARM Linux
2010-09-30 20:40                   ` Daniel Walker
2010-09-30 20:40                     ` Daniel Walker
2010-09-30 20:48                     ` Russell King - ARM Linux
2010-09-30 20:48                       ` Russell King - ARM Linux
2010-09-09 19:58 ` Daniel Walker [this message]
2010-09-09 19:58   ` [PATCH 3/4] arm: mm: add proc info for ARM11MPCore/Cortex-A9 from ARM Daniel Walker
2010-09-13 12:05   ` Catalin Marinas
2010-09-13 12:05     ` Catalin Marinas
2010-09-09 19:58 ` [PATCH 4/4] GIC: Dont disable INT in ack callback Daniel Walker
2010-09-09 19:58   ` Daniel Walker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284062289-10914-4-git-send-email-dwalker@codeaurora.org \
    --to=dwalker@codeaurora.org \
    --cc=catalin.marinas@arm.com \
    --cc=johlstei@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.