From patchwork Sat Nov 10 21:18:09 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: 10677443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A420914E2 for ; Sat, 10 Nov 2018 21:18:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9116A2957B for ; Sat, 10 Nov 2018 21:18:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82C162BE49; Sat, 10 Nov 2018 21:18:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3CAC32957B for ; Sat, 10 Nov 2018 21:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References :In-Reply-To:Message-Id:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mUAewLklGJjIucD8cdlbSMGv003F9wX7x7dKKe5yJBc=; b=exD4fBfPBNsrAF PX2JlsYfwocXZw6eUwBj1CfXLCvFAw0UPw4hpSwAjXAbGv36ORqVZOVllUGM9Ui3gedkn0jUyrjN4 krTidduzK5IlKwXxDktwlqQFQhLMHmgMU0RwXEfIp3kNhOPgQ6C3yOO7azOzVT+VCrEqLJkfUt2ch MoALukJpg9muJ3zEJQ77l4EA04uvYlwqwiBiaRdC1NUMVZ+M/iUwW1/t+AY5kWYQXo2PpBjMJff5v HLtiTTW5yADgaZflQ0dT/Q3HziyYOMdkif5dzY6HkHyF9DzXKZlmk2/4BUxrEDJTDWKnh7ocwvlb9 6HbBbfj/HlLiOaI1Uf1g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLaeH-0000SN-MU; Sat, 10 Nov 2018 21:18:33 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLae8-0000Jr-15 for linux-arm-kernel@bombadil.infradead.org; Sat, 10 Nov 2018 21:18:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Cc:To:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:From:References:In-Reply-To:Message-Id:Date :Sender:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZmTmYTSJewsjzwoAeO4OWgSrdo8UblePtMWLPSwyRjY=; b=nOYVEiXgmcYh2s9zgKE1vzH61f Ny8N7US6yKTYuq4iepphq+SWJyTm9hyf91OybxReV0PROTP5j6HZ0WgZEweA84GNje+Lso1yEPgl9 zwrQ47T1S+w89J9aDUQAvQaoOXA5AI925T0wutG2M5k3IzrptZW/o8Caoli/x1Tb61lC7QgBFqpiT 1MmyQgMxU/zVPhRPiCrt6gvVqMDqiNEkTXH07ZfXelQz+Y3/cSICprxeXZcYM2voIn0fveFLR6LFh 8r/I1TJmV/UYjhb+o0BarJg89FiFf1VC2bpP9jaF05gfC1DUkPAFk+F5nv4teyEbBjDXNFZW7ea2s TuJR4Jqg==; Received: from rere.qmqm.pl ([91.227.64.183]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLae4-00008Q-PR for linux-arm-kernel@lists.infradead.org; Sat, 10 Nov 2018 21:18:22 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42sqbV2TFgzSP; Sat, 10 Nov 2018 22:17:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541884630; bh=a2zvD6fDwiGmTs7yAJQTzM//ZEEPCAiduE0XRDrFnec=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=T4UtBfbH08BEDjXTDzGoFv3V8//CdmuMVCLvJS86z32DMNtWnKjVabjAZYKpZ/XfN e4WEG86RmCZRhqC3wOTIGD103W6aUylwUsOfcm75JDHO8uX6hnv8lg4C3szdn09XXC ITCFduwLVMKIir0NJPdXmZIaFa8XKp79CpnIMFu2Z0NSqK6jMbrknF3FFJv5z5ZZk6 klXvxGy6Mq15r8lFcrCNvEzgNj408Fql780CxstKDTkZZX/7uHFYF+8yFPetRFtWej 8WmsLCiCD+DlQ2XfybaGYQ57ERyvhCL1cXqtlXQ48hsZ7UPHxzDD4VBCJm3DR3IKFG kFA6GfdeAtXLQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Sat, 10 Nov 2018 22:18:09 +0100 Message-Id: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 2/2] ARM: tegra: avoid touching Secure registers in reset handler MIME-Version: 1.0 To: linux-tegra@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181110_161821_040539_D77C57DB X-CRM114-Status: UNSURE ( 8.53 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Osipenko , Thierry Reding , Russell King , linux-arm-kernel@lists.infradead.org, Jonathan Hunter 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 This allows secondary CPUs to boot with Trusted Foundations firmware. Signed-off-by: Michał Mirosław --- arch/arm/mach-tegra/reset-handler.S | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index fe4c568aeace..56300ec9f1a0 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -139,6 +139,13 @@ ENTRY(__tegra_cpu_reset_handler) cpsid aif, 0x13 @ SVC mode, interrupts disabled tegra_get_soc_id TEGRA_APB_MISC_BASE, r6 + +#ifdef CONFIG_TRUSTED_FOUNDATIONS + adr r3, __tegra_cpu_reset_handler_data + ldr r0, [r3, #RESET_DATA(TF_PRESENT)] + cmp r0, #0 + bne after_errata +#endif /* CONFIG_TRUSTED_FOUNDATIONS */ #ifdef CONFIG_ARCH_TEGRA_2x_SOC t20_check: cmp r6, #TEGRA20