From patchwork Mon Dec 17 06:18:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 206775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 853502C0093 for ; Mon, 17 Dec 2012 17:19:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751882Ab2LQGS7 (ORCPT ); Mon, 17 Dec 2012 01:18:59 -0500 Received: from hqemgate03.nvidia.com ([216.228.121.140]:12980 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806Ab2LQGS5 (ORCPT ); Mon, 17 Dec 2012 01:18:57 -0500 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Sun, 16 Dec 2012 22:22:16 -0800 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Sun, 16 Dec 2012 22:18:44 -0800 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Sun, 16 Dec 2012 22:18:44 -0800 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.279.1; Sun, 16 Dec 2012 22:18:44 -0800 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw01.nvidia.com with MailMarshal (v6,7,2,8378) id ; Sun, 16 Dec 2012 22:18:57 -0800 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id qBH6INSF022585; Sun, 16 Dec 2012 22:18:42 -0800 (PST) From: Hiroshi Doyu To: CC: Hiroshi Doyu , Grant Likely , Rob Herring , Rob Landley , Stephen Warren , Russell King , , , , Subject: [PATCH 4/4] ARM: tegra: Set SCU base address dynamically from DT Date: Mon, 17 Dec 2012 08:18:04 +0200 Message-ID: <1355725087-11363-4-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355725087-11363-1-git-send-email-hdoyu@nvidia.com> References: <1355725087-11363-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Set Snoop Control Unit(SCU) register base address dynamically from DT. Signed-off-by: Hiroshi Doyu --- arch/arm/mach-tegra/platsmp.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index 1b926df..45c0b79 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -36,7 +38,7 @@ extern void tegra_secondary_startup(void); -static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE); +static void __iomem *scu_base; #define EVP_CPU_RESET_VECTOR \ (IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE) + 0x100) @@ -143,14 +145,28 @@ done: return status; } +static const struct of_device_id cortex_a9_scu_match[] __initconst = { + { .compatible = "arm,cortex-a9-scu", }, + {} +}; + /* * Initialise the CPU possible map early - this describes the CPUs * which may be present or become present in the system. */ static void __init tegra_smp_init_cpus(void) { - unsigned int i, ncores = scu_get_core_count(scu_base); + struct device_node *np; + unsigned int i, ncores = 1; + + np = of_find_matching_node(NULL, cortex_a9_scu_match); + if (!np) + return; + scu_base = of_iomap(np, 0); + if (!scu_base) + return; + ncores = scu_get_core_count(scu_base); if (ncores > nr_cpu_ids) { pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", ncores, nr_cpu_ids); @@ -166,7 +182,8 @@ static void __init tegra_smp_init_cpus(void) static void __init tegra_smp_prepare_cpus(unsigned int max_cpus) { tegra_cpu_reset_handler_init(); - scu_enable(scu_base); + if (scu_base) + scu_enable(scu_base); } struct smp_operations tegra_smp_ops __initdata = {