From patchwork Tue Feb 25 22:17:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 25326 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3CBC320543 for ; Tue, 25 Feb 2014 22:18:14 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id to1sf3990225ieb.7 for ; Tue, 25 Feb 2014 14:18:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=EH3daAcnO89Oj2X102sMtwH4fwiymn9nMQ+UvlUBPuQ=; b=WfFqiz7oiPSqpniqlCJQMfbDxBX/pKCKrd59ZRhzBW6DlfqzD8ZMip23jxbL06Z/3v 2pjsojhv+vIRPrYO2mEpjI1zn9viZKiVEHXvU9W3iEjMZ941dEetUBcwEW9IiaDVO2Sx wo/WNJe/LsZFHV0c76YrG43r3PGjg106GtwsxD+WjDwoTOlMXqNAYIifI1Wdzc511cwY jGNLA1TOTuMs25wDlwDkbKA47x3++W98Nm1VQx/6v4R14v/4VKB5zG1IdcbIoFJHn73h MzeStlBEIL2t4Kg/rjgiiisXm6kMS6vxb4BzwrjkKiU+7vdKZnZrl5U5QOjv4Hxh217o bMYw== X-Gm-Message-State: ALoCoQkmZQ4lyww9XWrdnS/h4ttUKYYn35weLj//iD82f6a3a0zDVcgzLLps7Y85u6Rm7Y6A1NAW X-Received: by 10.182.65.168 with SMTP id y8mr1778761obs.38.1393366693697; Tue, 25 Feb 2014 14:18:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.5 with SMTP id q5ls2503328qgd.99.gmail; Tue, 25 Feb 2014 14:18:13 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr2976201vej.22.1393366693531; Tue, 25 Feb 2014 14:18:13 -0800 (PST) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id io9si7182098vcb.137.2014.02.25.14.18.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 14:18:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id c14so1267737vea.0 for ; Tue, 25 Feb 2014 14:18:13 -0800 (PST) X-Received: by 10.52.23.68 with SMTP id k4mr2544672vdf.24.1393366693390; Tue, 25 Feb 2014 14:18:13 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp171312vcz; Tue, 25 Feb 2014 14:18:12 -0800 (PST) X-Received: by 10.69.21.106 with SMTP id hj10mr2274219pbd.87.1393366692283; Tue, 25 Feb 2014 14:18:12 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si4968233pbl.191.2014.02.25.14.18.11; Tue, 25 Feb 2014 14:18:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753467AbaBYWSG (ORCPT + 26 others); Tue, 25 Feb 2014 17:18:06 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:4314 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530AbaBYWSE (ORCPT ); Tue, 25 Feb 2014 17:18:04 -0500 X-IronPort-AV: E=Sophos;i="4.97,542,1389772800"; d="scan'208";a="16790664" Received: from irvexchcas06.broadcom.com (HELO IRVEXCHCAS06.corp.ad.broadcom.com) ([10.9.208.53]) by mail-gw1-out.broadcom.com with ESMTP; 25 Feb 2014 14:55:14 -0800 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 25 Feb 2014 14:18:04 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.174.1; Tue, 25 Feb 2014 14:18:04 -0800 Received: from mail.broadcom.com (lbrmn-lnxub70.ric.broadcom.com [10.136.8.215]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id DB03AEEBC0; Tue, 25 Feb 2014 14:18:02 -0800 (PST) From: Markus Mayer To: Matt Porter , Christian Daudt CC: ARM Kernel List , "Linux Kernel Mailing List" Subject: [PATCH 1/4] ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared Date: Tue, 25 Feb 2014 14:17:43 -0800 Message-ID: <1393366666-28625-2-git-send-email-markus.mayer@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393366666-28625-1-git-send-email-markus.mayer@linaro.org> References: <1393366666-28625-1-git-send-email-markus.mayer@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: markus.mayer@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In preparation for future SoCs, move kona_l2_cache_init() from board specific board_bcm281xx.c to shared kona.c, so multiple SoC families can make use of it. Also change the return type to "void", since we never look at the return code anyway. Signed-off-by: Markus Mayer --- arch/arm/mach-bcm/board_bcm281xx.c | 26 +------------------------- arch/arm/mach-bcm/kona.c | 30 +++++++++++++++++++++++++++++- arch/arm/mach-bcm/kona.h | 3 ++- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index cb3dc36..4874f56 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -12,37 +12,13 @@ */ #include -#include -#include -#include +#include #include #include -#include -#include -#include "bcm_kona_smc.h" #include "kona.h" -static int __init kona_l2_cache_init(void) -{ - if (!IS_ENABLED(CONFIG_CACHE_L2X0)) - return 0; - - if (bcm_kona_smc_init() < 0) { - pr_info("Kona secure API not available. Skipping L2 init\n"); - return 0; - } - - bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); - - /* - * The aux_val and aux_mask have no effect since L2 cache is already - * enabled. Pass 0s for aux_val and 1s for aux_mask for default value. - */ - return l2x0_of_init(0, ~0); -} - static void bcm_board_setup_restart(void) { struct device_node *np; diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c index 6939d90..2f1db29 100644 --- a/arch/arm/mach-bcm/kona.c +++ b/arch/arm/mach-bcm/kona.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Broadcom Corporation + * Copyright (C) 2012-2014 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -12,10 +12,38 @@ */ #include +#include +#include #include +#include "bcm_kona_smc.h" #include "kona.h" +void __init kona_l2_cache_init(void) +{ + int ret; + + if (!IS_ENABLED(CONFIG_CACHE_L2X0)) + return; + + ret = bcm_kona_smc_init(); + if (ret) { + pr_info("Secure API not available (%d). Skipping L2 init.\n", + ret); + return; + } + + bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); + + /* + * The aux_val and aux_mask have no effect since L2 cache is already + * enabled. Pass 0s for aux_val and 1s for aux_mask for default value. + */ + ret = l2x0_of_init(0, ~0); + if (ret) + pr_err("Couldn't enable L2 cache: %d\n", ret); +} + static void __iomem *watchdog_base; void bcm_kona_setup_restart(void) diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h index 291eca3..f42aef8 100644 --- a/arch/arm/mach-bcm/kona.h +++ b/arch/arm/mach-bcm/kona.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Broadcom Corporation + * Copyright (C) 2012-2014 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -13,5 +13,6 @@ #include +void __init kona_l2_cache_init(void); void bcm_kona_setup_restart(void); void bcm_kona_restart(enum reboot_mode mode, const char *cmd);