From patchwork Tue Mar 27 13:54:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 7486 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 4521223E13 for ; Tue, 27 Mar 2012 13:54:28 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0B41BA18326 for ; Tue, 27 Mar 2012 13:54:27 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12988784iag.11 for ; Tue, 27 Mar 2012 06:54:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=o/eJ1v2/8t6f3zrED1ExHAy/R6U2N8HLTAIn9BRni/A=; b=Ltbsj/frGasdJ3Ecb1l85UyxjNBIO6Gf3EXk4vrflZlND+DdMm6fUEcIFZ2UDjp8mr vjZmbkVUxdKJwxyRimnt2Czz/TrMF5o3dDzVo1zm7FjwBuhjlSGkN0g+Tf3YSJPm2Rnh TwTewoEpXPUy0b+qBTlMGsQRrPfK5gKdyukEOafh2wPJ5RSJ8OxyTCHcJv/GSFtcvD9x qxYM228XO3fG5d3PImkAztoYj6mIXuCFxb2HSiRdQGZ1l+BtkpeH+lNq6PsQyMxKxEfh cHBX5aO/zAzdtw1VJQaYQ5Wl9p3GMQNe0o7YPOWsbFSsP8MxaRhYayw8MkOBGpGYxNb2 lDog== Received: by 10.50.45.234 with SMTP id q10mr8783821igm.54.1332856467798; Tue, 27 Mar 2012 06:54:27 -0700 (PDT) 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.5.205 with SMTP id 13csp18208ibw; Tue, 27 Mar 2012 06:54:26 -0700 (PDT) Received: by 10.204.136.220 with SMTP id s28mr10477805bkt.94.1332856465230; Tue, 27 Mar 2012 06:54:25 -0700 (PDT) Received: from mail-bk0-f50.google.com (mail-bk0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id il2si9097360bkc.144.2012.03.27.06.54.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Mar 2012 06:54:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.50 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-bk0-f50.google.com with SMTP id w11so7894172bku.37 for ; Tue, 27 Mar 2012 06:54:24 -0700 (PDT) Received: by 10.205.124.20 with SMTP id gm20mr10360769bkc.111.1332856464524; Tue, 27 Mar 2012 06:54:24 -0700 (PDT) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id jr13sm39341831bkb.14.2012.03.27.06.54.22 (version=SSLv3 cipher=OTHER); Tue, 27 Mar 2012 06:54:23 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Stefano Stabellini , Ian Campbell , Rusty Russell , Christoffer Dall , Will Deacon , Marc Zyngier , Rabin Vincent , Jon Medhurst Subject: [PATCH v2 4/4] ARM: opcodes: Opcode definitions for the Virtualization Extensions Date: Tue, 27 Mar 2012 14:54:05 +0100 Message-Id: <1332856445-7007-5-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1332856445-7007-1-git-send-email-dave.martin@linaro.org> References: <1332856445-7007-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQnHF5zrdMMs9Fh10tn3GT8hJpRupmUWGKu9aavpbl+DPaxyrmLLNffH0pBiBMVJN3MRqvnr For now, this patch just adds a definition for the HVC instruction. More can be added here later, as needed. Now that we have a real example of how to use the opcode injection macros properly, this patch also adds a cross-reference from the explanation in opcodes.h (since without an example, figuring out how to use the macros is not that easy). Signed-off-by: Dave Martin Acked-by: Nicolas Pitre --- arch/arm/include/asm/opcodes-virt.h | 29 +++++++++++++++++++++++++++++ arch/arm/include/asm/opcodes.h | 2 ++ 2 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/opcodes-virt.h diff --git a/arch/arm/include/asm/opcodes-virt.h b/arch/arm/include/asm/opcodes-virt.h new file mode 100644 index 0000000..b85665a --- /dev/null +++ b/arch/arm/include/asm/opcodes-virt.h @@ -0,0 +1,29 @@ +/* + * opcodes-virt.h: Opcode definitions for the ARM virtualization extensions + * Copyright (C) 2012 Linaro Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef __ASM_ARM_OPCODES_VIRT_H +#define __ASM_ARM_OPCODES_VIRT_H + +#include + +#define __HVC(imm16) __inst_arm_thumb32( \ + 0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F), \ + 0xF7E08000 | (((imm16) & 0xF000) << 4) | ((imm16) & 0x0FFF) \ +) + +#endif /* ! __ASM_ARM_OPCODES_VIRT_H */ diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h index f7937e1..74e211a 100644 --- a/arch/arm/include/asm/opcodes.h +++ b/arch/arm/include/asm/opcodes.h @@ -193,6 +193,8 @@ extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr); * specify the ARM and Thumb alternatives at the same time. This ensures * that the correct opcode gets emitted depending on the instruction set * used for the kernel build. + * + * Look at opcodes-virt.h for an example of how to use these macros. */ #include