From patchwork Wed Aug 8 12:23:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 10579 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 BC0B323EB4 for ; Wed, 8 Aug 2012 12:24:08 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8BDA5A1859F for ; Wed, 8 Aug 2012 12:24:08 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so667450yhp.11 for ; Wed, 08 Aug 2012 05:24:08 -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=gJHIgt3TKrGwSM1ZXqO4UP84NST9Sk6ZGuC35iqmbVvHPfOhlsafj4BH2G42s2/qQn xOjctHQEdPTlinBewTuJ/NngBBMSHEX9htZ6f5pqkXnFHNaVpp2lOSIPYWyKWnwX1P0m MORjZsTTU7XWzbd0xvrH0FSfCYBe6l5GvydjQqqtXTxnshBaPiD6BUmVI7n0C1mgGTlC jpTjQtPW3hntW+q0rM4y0AaxLujv/rO1t9azKB6Z2RGLYEoLaUQS7fAcxCJAaksh6XxY BOO7vh/+WmNoAlkuEqZ6HOEyb70H8WelioV+UmYWO5L/Kq0Vy6DAr80i+m18Km/k9zN8 MEew== Received: by 10.50.186.131 with SMTP id fk3mr726149igc.31.1344428648054; Wed, 08 Aug 2012 05:24:08 -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.50.184.200 with SMTP id ew8csp604419igc; Wed, 8 Aug 2012 05:24:07 -0700 (PDT) Received: by 10.14.178.67 with SMTP id e43mr22014784eem.44.1344428646530; Wed, 08 Aug 2012 05:24:06 -0700 (PDT) Received: from mail-ee0-f50.google.com (mail-ee0-f50.google.com [74.125.83.50]) by mx.google.com with ESMTPS id e9si13693512eep.94.2012.08.08.05.24.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Aug 2012 05:24:06 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.83.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.83.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-ee0-f50.google.com with SMTP id c50so218290eek.37 for ; Wed, 08 Aug 2012 05:24:06 -0700 (PDT) Received: by 10.14.181.137 with SMTP id l9mr21948192eem.28.1344428646027; Wed, 08 Aug 2012 05:24:06 -0700 (PDT) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id e7sm28153355eep.2.2012.08.08.05.24.03 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 05:24:04 -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 , Nicolas Pitre Subject: [PATCH v2 REPOST 4/4] ARM: opcodes: Opcode definitions for the Virtualization Extensions Date: Wed, 8 Aug 2012 13:23:49 +0100 Message-Id: <1344428629-12787-5-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1344428629-12787-1-git-send-email-dave.martin@linaro.org> References: <1344428629-12787-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQkh0MIm3gqq3qbgOVhHkGsX3PA4/duj1QRgZtxwbsDLIK+N6x9vCftqLlsa9dwcJ3ghp+od 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