From patchwork Sat Nov 10 21:02:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 996001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="d/TczA/6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42sqSd14B1z9s7h for ; Sun, 11 Nov 2018 08:11:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725778AbeKKG5c (ORCPT ); Sun, 11 Nov 2018 01:57:32 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:21159 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbeKKG5b (ORCPT ); Sun, 11 Nov 2018 01:57:31 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42sqFJ0RyGzXW; Sat, 10 Nov 2018 22:01:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541883684; bh=EAkVG0GgG7wtkZUSdJT2MyjnBtwKPq/yMGPbkGJRLUs=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=d/TczA/6g+yAs0+cez1gCwwAXSY2vi1/X+gVkLLRyQWJ1X28jAt8/DesOGtOCVRON UhO6nnZchKu0tvOa5jivhu4VU2RtgLmcs43eH8rbcMnnhnyDpeXdoksGs77Z6vXeaO bM8DCQmO5eD+v9YLpLEZEScAABZfH3XXTJpUuQj14o9g2JBULPxS73FeXyvfPOku81 4pB1kXPKZDiTUQfmtenbFvpWvxXIv/Yi8UPdvGi2mcoxhNSAXPgyGtAAfvbDKb8hXe llDpmqN0M1KCibCXpbCJN16FsORVZb2w7kEdO9sTUjNCIJpQ5E2O1JLaxZh0fN/Zm1 qr6NC91VMCKnw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Sat, 10 Nov 2018 22:02:23 +0100 Message-Id: <86834d26d87aa31ccb48c49e932f01274f1d4058.1541882833.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 3/3] ARM: trusted_foundations: announce firmware version MIME-Version: 1.0 To: linux-arm-kernel@lists.infradead.org Cc: Dmitry Osipenko , linux-tegra@vger.kernel.org, Mark Rutland , Russell King Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Announce Trusted Foundations version for debugging and documentation. Signed-off-by: Michał Mirosław --- arch/arm/firmware/trusted_foundations.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c index 135068119453..e59f44fcda35 100644 --- a/arch/arm/firmware/trusted_foundations.c +++ b/arch/arm/firmware/trusted_foundations.c @@ -30,6 +30,8 @@ #define TF_CACHE_FLUSH 2 #define TF_CACHE_REENABLE 4 +#define TF_GET_PROTOCOL_VERSION 0xfffffffb + #define TF_CPU_PM 0xfffffffc #define TF_CPU_PM_S3 0xffffffe3 #define TF_CPU_PM_S2 0xffffffe6 @@ -39,7 +41,7 @@ static unsigned long cpu_boot_addr; -static void tf_generic_smc(u32 type, u32 arg1, u32 arg2) +static u64 tf_generic_smc(u32 type, u32 arg1, u32 arg2) { register u32 r0 asm("r0") = type; register u32 r1 asm("r1") = arg1; @@ -55,9 +57,10 @@ static void tf_generic_smc(u32 type, u32 arg1, u32 arg2) "mov r4, #0\n\t" "smc #0\n\t" "ldmfd sp!, {r4 - r11}\n\t" - : - : "r" (r0), "r" (r1), "r" (r2) + : "+r" (r0), "+r" (r1) + : "r" (r2) : "memory", "r3", "r12", "lr"); + return ((u64)r1 << 32) | r0; } static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) @@ -110,6 +113,11 @@ static int tf_init_cache(void) } #endif /* CONFIG_CACHE_L2X0 */ +static u32 tf_get_protocol_version(void) +{ + return tf_generic_smc(TF_GET_PROTOCOL_VERSION, 0, 0) >> 48; +} + static const struct firmware_ops trusted_foundations_ops = { .set_cpu_boot_addr = tf_set_cpu_boot_addr, .prepare_idle = tf_prepare_idle, @@ -120,6 +128,12 @@ static const struct firmware_ops trusted_foundations_ops = { void register_trusted_foundations(struct trusted_foundations_platform_data *pd) { + unsigned int protocol = tf_get_protocol_version(); + + pr_info("TF: version %u.%u, protocol %u.%u\n", + pd->version_major, pd->version_minor, + protocol >> 8, protocol & 0xFF); + /* * we are not using version information for now since currently * supported SMCs are compatible with all TF releases @@ -145,5 +159,6 @@ void of_register_trusted_foundations(void) &pdata.version_minor); if (err != 0) panic("Trusted Foundation: missing version-minor property\n"); + register_trusted_foundations(&pdata); }