From patchwork Wed Feb 15 18:15:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 6799 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1FF6523F8D for ; Wed, 15 Feb 2012 18:17:07 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0D300A18A28 for ; Wed, 15 Feb 2012 18:16:31 +0000 (UTC) Received: by mail-gx0-f180.google.com with SMTP id r1so1029994ggn.11 for ; Wed, 15 Feb 2012 10:16:31 -0800 (PST) Received: by 10.50.188.234 with SMTP id gd10mr13290553igc.29.1329329791693; Wed, 15 Feb 2012 10:16:31 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.80.19 with SMTP id r19cs2664ibk; Wed, 15 Feb 2012 10:16:31 -0800 (PST) Received: by 10.216.133.18 with SMTP id p18mr6851645wei.1.1329329790103; Wed, 15 Feb 2012 10:16:30 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id t7si22561552wit.3.2012.02.15.10.16.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:30 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-we0-f178.google.com with SMTP id b12so1115693wer.37 for ; Wed, 15 Feb 2012 10:16:29 -0800 (PST) MIME-Version: 1.0 Received: by 10.180.90.225 with SMTP id bz1mr10117890wib.5.1329329789179; Wed, 15 Feb 2012 10:16:29 -0800 (PST) Received: from localhost.localdomain ([213.123.120.124]) by mx.google.com with ESMTPS id dw7sm35106696wib.4.2012.02.15.10.16.26 (version=SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:16:28 -0800 (PST) From: Dave Martin To: Nicolas Pitre , Christoffer Dall , Marc Zyngier , Will Deacon Cc: patches@linaro.org, Dave Martin Subject: [PATCH 05/10] fixup! ARM: virt: Initial Virtualization Extensions support Date: Wed, 15 Feb 2012 18:15:58 +0000 Message-Id: <1329329763-31508-6-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1329329763-31508-1-git-send-email-dave.martin@linaro.org> References: <1329329763-31508-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQlk01ojm9qlMTteRFDSM3daGohJQk8ZmpBSH5ihtOoFrIXkuJ48K38Fvvxw6jBOZZBvscMA Instead of counting how many CPUs the hypervisor stub was installed on, we simply record what mode the primary CPU was booted and set a flag if an inconsistency is detected. REALLY, this time Signed-off-by: Dave Martin --- arch/arm/kernel/hyp-stub.S | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 5c5f49f..15d556d 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -87,9 +87,7 @@ ENTRY(__hyp_stub_install_secondary) adr r4, 1f ldr r5, .L__boot_cpu_mode_offset -1: ldr r7, [r4, r5] - add r7, r7, #1 - str r7, [r4, r5] @ increment __hyp_stub_install_count +1: str r6, [r4, r5] @ Store the boot mode bic lr, lr, #1 @ clear thumb bit @ (SPSR.T used instead)