From patchwork Thu Feb 26 21:59:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 5896161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6C4989F536 for ; Thu, 26 Feb 2015 22:02:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DE9F20374 for ; Thu, 26 Feb 2015 22:02:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AFBC420398 for ; Thu, 26 Feb 2015 22:02:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YR6TY-0000qh-Tq; Thu, 26 Feb 2015 22:00:08 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YR6TR-0000VP-4z for linux-arm-kernel@lists.infradead.org; Thu, 26 Feb 2015 22:00:02 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id E55F0140DB9; Thu, 26 Feb 2015 21:59:40 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id D753F140DBC; Thu, 26 Feb 2015 21:59:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from galak-ubuntu.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: galak@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id F3546140DB9; Thu, 26 Feb 2015 21:59:39 +0000 (UTC) From: Kumar Gala To: linux-arm-msm@vger.kernel.org Subject: [PATCH 2/4] ARM: qcom: Cleanup scm interface to only export what is needed Date: Thu, 26 Feb 2015 15:59:34 -0600 Message-Id: <1424987976-14531-2-git-send-email-galak@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1424987976-14531-1-git-send-email-galak@codeaurora.org> References: <1424987976-14531-1-git-send-email-galak@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150226_140001_251568_E4E863AC X-CRM114-Status: GOOD ( 12.93 ) X-Spam-Score: -0.0 (/) Cc: olof@lixom.net, arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kumar Gala X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Now that scom boot interface is merged we don't need export scm_call anymore. Some other minor cleanups related to boot interface to only export what is needed by scm_set_boot_addr(). Signed-off-by: Kumar Gala --- arch/arm/mach-qcom/scm.c | 7 ++++--- arch/arm/mach-qcom/scm.h | 7 ------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c index e20db10..5147666 100644 --- a/arch/arm/mach-qcom/scm.c +++ b/arch/arm/mach-qcom/scm.c @@ -249,8 +249,8 @@ static void scm_inv_range(unsigned long start, unsigned long end) * response buffers is taken care of by scm_call; however, callers are * responsible for any other cached buffers passed over to the secure world. */ -int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len, - void *resp_buf, size_t resp_len) +static int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len, + void *resp_buf, size_t resp_len) { int ret; struct scm_command *cmd; @@ -287,7 +287,6 @@ out: free_scm_command(cmd); return ret; } -EXPORT_SYMBOL(scm_call); u32 scm_get_version(void) { @@ -325,6 +324,8 @@ u32 scm_get_version(void) } EXPORT_SYMBOL(scm_get_version); +#define SCM_SVC_BOOT 0x1 +#define SCM_BOOT_ADDR 0x1 /* * Set the cold/warm boot address for one of the CPU cores. */ diff --git a/arch/arm/mach-qcom/scm.h b/arch/arm/mach-qcom/scm.h index cfe6935..d73c378 100644 --- a/arch/arm/mach-qcom/scm.h +++ b/arch/arm/mach-qcom/scm.h @@ -12,13 +12,6 @@ #ifndef __MACH_SCM_H #define __MACH_SCM_H -#define SCM_SVC_BOOT 0x1 -#define SCM_SVC_PIL 0x2 - -extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len, - void *resp_buf, size_t resp_len); - -#define SCM_BOOT_ADDR 0x1 #define SCM_FLAG_COLDBOOT_CPU1 0x01 #define SCM_FLAG_COLDBOOT_CPU2 0x08 #define SCM_FLAG_COLDBOOT_CPU3 0x20