Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753776Ab0HYE6m (ORCPT ); Wed, 25 Aug 2010 00:58:42 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:59678 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752745Ab0HYE6S (ORCPT ); Wed, 25 Aug 2010 00:58:18 -0400 X-IronPort-AV: E=McAfee;i="5400,1158,6084"; a="52012233" X-IronPort-AV: E=Sophos;i="4.56,265,1280732400"; d="scan'208";a="72366133" From: Jeff Ohlstein To: Russell King Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Walker , Jeff Ohlstein , Russell King , Tony Lindgren , Catalin Marinas , "Kirill A. Shutemov" Subject: [PATCH 03/24] arm: mm: add proc info for ScorpionMP Date: Tue, 24 Aug 2010 21:57:32 -0700 Message-Id: <1282712273-344-4-git-send-email-johlstei@codeaurora.org> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1282712273-344-1-git-send-email-johlstei@codeaurora.org> References: <1282712273-344-1-git-send-email-johlstei@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1916 Lines: 63 From: Daniel Walker ScorpionMP does not have the SMP/nAMP and TLB ops broadcasting bits in ACTLR. Signed-off-by: Daniel Walker Signed-off-by: Jeff Ohlstein --- arch/arm/mm/proc-v7.S | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 7aaf88a..98fd7e5 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -196,6 +196,7 @@ __v7_setup: orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and mcreq p15, 0, r0, c1, c0, 1 @ TLB ops broadcasting #endif +__v7_msm_setup: adr r12, __v7_setup_stack @ the local stack stmia r12, {r0-r5, r7, r9, r11, lr} bl v7_flush_dcache_all @@ -326,6 +327,29 @@ cpu_elf_name: .section ".proc.info.init", #alloc, #execinstr + .type __v7_msm_proc_info, #object +__v7_msm_proc_info: + .long 0x510f0000 @ Required ID value + .long 0xff0f0000 @ 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_msm_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_msm_proc_info, . - __v7_msm_proc_info + /* * Match any ARMv7 processor core. */ -- 1.7.2.1 Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- 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/