From patchwork Mon Sep 3 12:49:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 11153 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 0BD1823F22 for ; Mon, 3 Sep 2012 12:51:33 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 86294A1801F for ; Mon, 3 Sep 2012 12:50:45 +0000 (UTC) Received: by ieak11 with SMTP id k11so3355714iea.11 for ; Mon, 03 Sep 2012 05:51:32 -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=NBNB4VF/jmD+3NEBv8PpPievGlQ0foproLIhQA7v4wk=; b=HwFX6WW0fk2eVwoxm6sgaSw/FAG7hjEwGyEvvAbb4qyryVU+wBNOzifvB4eJi2cLe/ fE78iVd/JYugN2tGzzVcoCsyuvjVCaP9O9vY9eqm5oVwQqrUfYTbWpm+5QjYUMEYtFzX N6UhQDuVFETNMVpokt464XP9bgnCwQzkikn7UJPY7E0Rob3EBcAkVlPzoSeyR7WCrKFa aWZQTyKbSI9468Fv0/iZ2cJwesmeu0qQiAaO3fPlnjjsVtjbZS70I8IXA3wA1T+0CPUW PIOExmn0eyuFd4E4zW6zm3/+2m98yfOCeMnbjl3CA6sKa5hlDW4domzxNq2hTXo6E5Ha NXEg== Received: by 10.50.191.227 with SMTP id hb3mr691867igc.43.1346676692172; Mon, 03 Sep 2012 05:51:32 -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.232 with SMTP id ex8csp135051igc; Mon, 3 Sep 2012 05:51:31 -0700 (PDT) Received: by 10.14.224.4 with SMTP id w4mr21537947eep.21.1346676690638; Mon, 03 Sep 2012 05:51:30 -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 c41si7720563eem.50.2012.09.03.05.51.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 05:51:30 -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 c50so1972354eek.37 for ; Mon, 03 Sep 2012 05:51:30 -0700 (PDT) Received: by 10.14.213.137 with SMTP id a9mr21285844eep.38.1346676690106; Mon, 03 Sep 2012 05:51:30 -0700 (PDT) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id y1sm36310671eel.0.2012.09.03.05.51.28 (version=SSLv3 cipher=OTHER); Mon, 03 Sep 2012 05:51:29 -0700 (PDT) From: Dave Martin To: patches@arm.linux.org.uk Cc: patches@linaro.org, Dave Martin , Stefano Stabellini , Marc Zyngier Subject: ARM: opcodes: Opcode definitions for the Virtualization Extensions Date: Mon, 3 Sep 2012 13:49:25 +0100 Message-Id: <1346676569-4085-4-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1346676569-4085-1-git-send-email-dave.martin@linaro.org> References: <1346676569-4085-1-git-send-email-dave.martin@linaro.org> X-Gm-Message-State: ALoCoQk0tp2N0mSULNe5Fz38czAb/DAs8PAR3XRLBYnUZDTuyIdoo3Y0s9YNKtKCYFsvb0GP6IS5 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 --- KernelVersion: 3.6-rc4 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