From patchwork Tue Nov 5 01:27:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 11226833 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27DC313A4 for ; Tue, 5 Nov 2019 01:28:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05859214E0 for ; Tue, 5 Nov 2019 01:28:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="ia+JQkMr"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="l2aGfd/k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730297AbfKEB1y (ORCPT ); Mon, 4 Nov 2019 20:27:54 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:37562 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730292AbfKEB1x (ORCPT ); Mon, 4 Nov 2019 20:27:53 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3C98860D86; Tue, 5 Nov 2019 01:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572917272; bh=ujj1b7RPl198M9oiUQIZdqw/uHoWTXBQ1u5lGMzny+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ia+JQkMrnxeyHfQGEWihDEItxzqOp148LAUfUe1LHkj14hbts/kn8A9F227zwLNtQ MX5zqju2J0t3GDq5yS+9eePqr0ttMUcJwAEBg75eqvyGXGcpoC6K09Ij5rs1lWBqQn 6fb5DCxErKlcJMWK/8jOzkqvpSgZoLAQZi3uvAQU= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from eberman-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: eberman@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7C82460D74; Tue, 5 Nov 2019 01:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572917270; bh=ujj1b7RPl198M9oiUQIZdqw/uHoWTXBQ1u5lGMzny+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l2aGfd/kQJF4kRBOQmAOnau0FSZeT2jW+ieDsuWcKaV6UbGOB/jOc/OVN8y3vzECF CmA6/em/QagPNDdbXWP/2mwTxnW8pPnMhDPLsXz61b5W1zRT0Oqn0RKCaIP0ZINaZv p6rpPJ66y15H5MgkM/I6bwOSWfPg4mT507VrdEdE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7C82460D74 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=eberman@codeaurora.org From: Elliot Berman To: bjorn.andersson@linaro.org, saiprakash.ranjan@codeaurora.org, agross@kernel.org Cc: tsoni@codeaurora.org, sidgup@codeaurora.org, psodagud@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Elliot Berman Subject: [PATCH 04/17] firmware: qcom_scm: Remove unused qcom_scm_get_version Date: Mon, 4 Nov 2019 17:27:23 -0800 Message-Id: <1572917256-24205-5-git-send-email-eberman@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572917256-24205-1-git-send-email-eberman@codeaurora.org> References: <1572917256-24205-1-git-send-email-eberman@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Remove unused qcom_scm_get_version. Signed-off-by: Elliot Berman Reviewed-by: Bjorn Andersson Reviewed-by: Vinod Koul --- drivers/firmware/qcom_scm-32.c | 36 ------------------------------------ include/linux/qcom_scm.h | 2 -- 2 files changed, 38 deletions(-) diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c index b09fddf..b7f9f28 100644 --- a/drivers/firmware/qcom_scm-32.c +++ b/drivers/firmware/qcom_scm-32.c @@ -291,42 +291,6 @@ static s32 qcom_scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) return r0; } -u32 qcom_scm_get_version(void) -{ - int context_id; - static u32 version = -1; - register u32 r0 asm("r0"); - register u32 r1 asm("r1"); - - if (version != -1) - return version; - - mutex_lock(&qcom_scm_lock); - - r0 = 0x1 << 8; - r1 = (u32)&context_id; - do { - asm volatile( - __asmeq("%0", "r0") - __asmeq("%1", "r1") - __asmeq("%2", "r0") - __asmeq("%3", "r1") -#ifdef REQUIRES_SEC - ".arch_extension sec\n" -#endif - "smc #0 @ switch to secure world\n" - : "=r" (r0), "=r" (r1) - : "r" (r0), "r" (r1) - : "r2", "r3", "r12"); - } while (r0 == QCOM_SCM_INTERRUPTED); - - version = r1; - mutex_unlock(&qcom_scm_lock); - - return version; -} -EXPORT_SYMBOL(qcom_scm_get_version); - /** * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus * @entry: Entry point function for the cpus diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index f8b6525..05a1c7a 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -59,7 +59,6 @@ extern bool qcom_scm_hdcp_available(void); extern int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp); extern int qcom_scm_qsmmu500_wait_safe_toggle(bool en); -extern u32 qcom_scm_get_version(void); extern bool qcom_scm_is_available(void); #else @@ -101,7 +100,6 @@ static inline int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) { return -ENODEV; } static inline int qcom_scm_qsmmu500_wait_safe_toggle(bool en) { return -ENODEV; } -static inline u32 qcom_scm_get_version(void) { return 0; } static inline bool qcom_scm_is_available(void) { return false; } #endif #endif