From patchwork Sat Jul 12 13:23:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33524 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C258E20672 for ; Sat, 12 Jul 2014 13:24:23 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id 29sf2117374yhl.10 for ; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) 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=SnKdyUKbHuays/PGKQ6kVJAo+WSgNJk/HJ01ZrL/5YM=; b=CUFQqoyCsfJAT9WM5MInD2vYJp66MPs9sJgz3od/iOVMGiuPosXNSktaS4bRg/yi7D QX4uH4fDGRjnUJ/27/KeR6oYFaIb3iAVvK0owJ0FE2RrDbUTMhBz7lqPVUpOiGX2goAa 0I0o6Q48qff9J9f9yduiwCfzIKKBHC/1QEuEfr/CEHEbyMOblG3c7gMpFsVdeolMUuKY 1+cLFDwiFhoBj9gObBOHXadt148fr4rjWCADB17fw2A2d1KV+jirPXqdMUMKMN/cYjoH 5co7rPbI9Op1KAo6CMHlSpOZ9ljK+XSFL352q0kXKiebHQEqPsZorBaRXtgCMp3+eF/d M5FA== X-Gm-Message-State: ALoCoQnSBinuEyMhphe2eUJ4if285ESQX/BEoVVvj+HT1+oB9Ral2nliDaq/FesEL5wLPu7JXqpm X-Received: by 10.236.24.196 with SMTP id x44mr2116882yhx.15.1405171463543; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.112 with SMTP id o103ls680990qgd.30.gmail; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) X-Received: by 10.221.9.72 with SMTP id ov8mr38836vcb.27.1405171463456; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id v15si3586819vcj.8.2014.07.12.06.24.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 12 Jul 2014 06:24:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hq11so3139127vcb.3 for ; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) X-Received: by 10.58.152.234 with SMTP id vb10mr5351695veb.21.1405171463246; Sat, 12 Jul 2014 06:24:23 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp4971vcb; Sat, 12 Jul 2014 06:24:22 -0700 (PDT) X-Received: by 10.180.37.230 with SMTP id b6mr12704151wik.47.1405171462062; Sat, 12 Jul 2014 06:24:22 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id cx3si2851611wib.33.2014.07.12.06.24.21 for ; Sat, 12 Jul 2014 06:24:22 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3979DAB632; Sat, 12 Jul 2014 15:24:21 +0200 (CEST) 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 8y3bqJvCyJgS; Sat, 12 Jul 2014 15:24:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7D00DAB635; Sat, 12 Jul 2014 15:24:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E1D1EA7C94 for ; Sat, 12 Jul 2014 15:24:15 +0200 (CEST) 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 gEXbUclsM1y4 for ; Sat, 12 Jul 2014 15:24:13 +0200 (CEST) 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 benson.vm.bytemark.co.uk (benson.vm.bytemark.co.uk [212.110.190.137]) by theia.denx.de (Postfix) with ESMTPS id 05E1BA78FB for ; Sat, 12 Jul 2014 15:24:12 +0200 (CEST) Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginm.net ([86.6.25.227] helo=celaeno.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1X5xHg-0005bW-Fx; Sat, 12 Jul 2014 14:24:12 +0100 Received: from dagon.hellion.org.uk ([192.168.1.7]) by celaeno.hellion.org.uk with smtp (Exim 4.80) (envelope-from ) id 1X5xHe-0000LG-1D; Sat, 12 Jul 2014 14:24:11 +0100 Received: by dagon.hellion.org.uk (sSMTP sendmail emulation); Sat, 12 Jul 2014 14:24:10 +0100 From: Ian Campbell To: u-boot@lists.denx.de, Albert Aribaud Date: Sat, 12 Jul 2014 14:23:59 +0100 Message-Id: <1405171448-27310-2-git-send-email-ijc@hellion.org.uk> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1405171421.11981.51.camel@dagon.hellion.org.uk> References: <1405171421.11981.51.camel@dagon.hellion.org.uk> Cc: Tom Rini , Marc Zyngier Subject: [U-Boot] [PATCH v5 02/11] ARM: HYP/non-sec: add a barrier after setting SCR.NS==1 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: ijc@hellion.org.uk X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) 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 From: Marc Zyngier A CP15 instruction execution can be reordered, requiring an isb to be sure it is executed in program order. Signed-off-by: Marc Zyngier Acked-by: Ian Campbell --- arch/arm/cpu/armv7/nonsec_virt.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 6367e09..12de5c2 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -46,6 +46,7 @@ _secure_monitor: #endif mcr p15, 0, r1, c1, c1, 0 @ write SCR (with NS bit set) + isb #ifdef CONFIG_ARMV7_VIRT mrceq p15, 0, r0, c12, c0, 1 @ get MVBAR value