From patchwork Wed Feb 15 18:16:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 6803 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 DA3E323DE1 for ; Wed, 15 Feb 2012 18:17:17 +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 AAB67A189B1 for ; Wed, 15 Feb 2012 18:17:17 +0000 (UTC) Received: by mail-gx0-f180.google.com with SMTP id r1so1029994ggn.11 for ; Wed, 15 Feb 2012 10:17:17 -0800 (PST) Received: by 10.50.85.231 with SMTP id k7mr13404476igz.25.1329329837327; Wed, 15 Feb 2012 10:17:17 -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 r19cs2682ibk; Wed, 15 Feb 2012 10:17:17 -0800 (PST) Received: by 10.180.82.227 with SMTP id l3mr37221382wiy.1.1329329836117; Wed, 15 Feb 2012 10:17:16 -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 fv3si14633430wib.45.2012.02.15.10.17.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:17:16 -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 werb12 with SMTP id b12so1116438wer.37 for ; Wed, 15 Feb 2012 10:17:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.135.66 with SMTP id t44mr9760887wei.52.1329329835263; Wed, 15 Feb 2012 10:17:15 -0800 (PST) Received: from localhost.localdomain ([213.123.120.124]) by mx.google.com with ESMTPS id dw7sm35106696wib.4.2012.02.15.10.17.06 (version=SSLv3 cipher=OTHER); Wed, 15 Feb 2012 10:17:14 -0800 (PST) From: Dave Martin To: Nicolas Pitre , Christoffer Dall , Marc Zyngier , Will Deacon Cc: patches@linaro.org, Dave Martin Subject: [PATCH 09/10] fixup! ARM: virt: Initial Virtualization Extensions support Date: Wed, 15 Feb 2012 18:16:02 +0000 Message-Id: <1329329763-31508-10-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: ALoCoQnMisdRU91QWpastFWLHsgYIVCNilDdLO12SFprZr8cAnrHVpuNs8/GUecgtJmoBA4tvw3a Use virtualisation instruction macros so that we can build the core boot-time code without requiring excessively new tools. Signed-off-by: Dave Martin --- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/hyp-stub.S | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 2a597d1..732dd44 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -32,7 +32,7 @@ CFLAGS_string.o := -Os ifeq ($(CONFIG_ARM_VIRT),y) OBJS += hyp-stub.o -AFLAGS_hyp-stub.o := -Wa,-march=armv7-a+virt +AFLAGS_hyp-stub.o := $(call cc-option,-Wa$(comma)-march=armv7-a+virt,-DAS_NEEDS_HVC) endif # diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 9f49f21..d98c4b5 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -84,6 +84,6 @@ obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_ARM_VIRT) += hyp-stub.o -AFLAGS_hyp-stub.o := -Wa,-march=armv7-a+virt +AFLAGS_hyp-stub.o := $(call cc-option,-Wa$(comma)-march=armv7-a+virt,-DAS_NEEDS_HVC) extra-y := $(head-y) init_task.o vmlinux.lds diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 83097ad..8de03fb 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -91,7 +91,7 @@ ENTRY(__hyp_stub_install_secondary) bic r7, r6, #MODE_MASK orr r7, r7, #SVC_MODE msr spsr_cxsf, r7 - msr elr_hyp, lr + msr_elr_hyp 14 @ msr elr_hyp, lr eret @ return, switching to SVC mode ENDPROC(__hyp_stub_install_secondary) @@ -123,7 +123,7 @@ ENDPROC(__hyp_stub_do_trap) * initialisation entry point. */ ENTRY(__hyp_set_vectors) - hvc #0 + hvc 0 bx lr ENDPROC(__hyp_set_vectors)