From patchwork Sat Feb 15 13:36:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 24670 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 442BB20967 for ; Sat, 15 Feb 2014 14:11:55 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf14757161iec.0 for ; Sat, 15 Feb 2014 06:11:54 -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:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=gYL8JjhMPAodfLBd71gKPCrwMrQuUznc3G5fSuJCKKw=; b=O9/fk8+5HxFoj+KxRq1JwdPUfKqTazO+6Elq3pnJbSuKYSt+wY6FXWYxHXS6dXky4x U/ROzKd7jO6vhJMtXTxllR95waUVkVZtgMfPHoCMfcwvQZ6qWuuL4f/3sA+NSrJMLINW KnATBC2lpQGurLp5gqdt7ni3D+z4dc9fb/6mAqhSjCMdb/P6fwK7o5ILSPJHqlQrCZIq 5kWmXxQCzormMjQgDGJGNhcS4JDLZW5taY6wVGKb8ym5U67zPtJ3PGuHhOmypQxI0IS6 QujS3lauasD6QkbLt2poDqsC9Gkg9zNq/kVDVuTDfx/Ch/aZopt5zx/taU7eJmUlK2Ej 2q0Q== X-Gm-Message-State: ALoCoQkySAsG0pHALjZbHMNI4Y5usZDMYYKpAhiYPxaOp83g6+BYUhNw+GoTJw+xQFB5eAzqAqU0 X-Received: by 10.50.124.33 with SMTP id mf1mr4183780igb.6.1392473514507; Sat, 15 Feb 2014 06:11:54 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.103 with SMTP id g94ls363392qgd.82.gmail; Sat, 15 Feb 2014 06:11:54 -0800 (PST) X-Received: by 10.52.190.1 with SMTP id gm1mr2378990vdc.21.1392473514399; Sat, 15 Feb 2014 06:11:54 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id a2si2926473vea.105.2014.02.15.06.11.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 15 Feb 2014 06:11:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id pa12so10690231veb.33 for ; Sat, 15 Feb 2014 06:11:54 -0800 (PST) X-Received: by 10.52.68.106 with SMTP id v10mr34438vdt.59.1392473514212; Sat, 15 Feb 2014 06:11:54 -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 u4csp19893vcz; Sat, 15 Feb 2014 06:11:50 -0800 (PST) X-Received: by 10.15.35.194 with SMTP id g42mr665545eev.105.1392473510140; Sat, 15 Feb 2014 06:11:50 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id w2si18567507eeg.196.2014.02.15.06.11.49 for ; Sat, 15 Feb 2014 06:11:50 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 672E94B70B; Sat, 15 Feb 2014 15:11:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vZJXp5onsxXr; Sat, 15 Feb 2014 15:11:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76A354B712; Sat, 15 Feb 2014 15:11:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2BB564B6FC for ; Sat, 15 Feb 2014 15:11:19 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YYumezc+A4qx for ; Sat, 15 Feb 2014 15:11:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from inca-roads.misterjones.org (inca-roads.misterjones.org [213.251.177.50]) by theia.denx.de (Postfix) with ESMTPS id 3C17F4B6F3 for ; Sat, 15 Feb 2014 15:11:13 +0100 (CET) Received: from [176.250.132.24] (helo=why.wild-wind.fr.eu.org) by cheepnis.misterjones.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1WEfQH-00038M-J7; Sat, 15 Feb 2014 14:36:49 +0100 From: Marc Zyngier To: u-boot@lists.denx.de, linux-sunxi@googlegroups.com Date: Sat, 15 Feb 2014 13:36:25 +0000 Message-Id: <1392471397-2158-2-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1392471397-2158-1-git-send-email-marc.zyngier@arm.com> References: <1392471397-2158-1-git-send-email-marc.zyngier@arm.com> X-SA-Exim-Connect-IP: 176.250.132.24 X-SA-Exim-Rcpt-To: u-boot@lists.denx.de, linux-sunxi@googlegroups.com, maxime.ripard@free-electrons.com, ijc@hellion.org.uk, andre@andrep.de, henrik@henriknordstrom.net, maz@misterjones.org X-SA-Exim-Mail-From: marc.zyngier@arm.com X-SA-Exim-Scanned: No (on cheepnis.misterjones.org); SAEximRunCond expanded to false Cc: Andre Przywara , maz@misterjones.org, Ian Campbell Subject: [U-Boot] [PATCH v3 01/13] ARM: HYP/non-sec: move switch to non-sec to the last boot phase X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: marc.zyngier@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 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 Having the switch to non-secure in the "prep" phase is causing all kind of troubles, as that stage can be called multiple times. Instead, move the switch to non-secure to the last possible phase, when there is no turning back anymore. Signed-off-by: Marc Zyngier --- arch/arm/lib/bootm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a8295bf..68554c8 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -242,7 +242,6 @@ static void boot_prep_linux(bootm_headers_t *images) printf("FDT and ATAGS support not compiled in - hanging\n"); hang(); } - do_nonsec_virt_switch(); } /* Subcommand: GO */ @@ -287,8 +286,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) else r2 = gd->bd->bi_boot_params; - if (!fake) + if (!fake) { + do_nonsec_virt_switch(); kernel_entry(0, machid, r2); + } #endif }