Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 508514ed authored by Dave Martin's avatar Dave Martin Committed by Russell King
Browse files

ARM: 7511/1: opcodes: Opcode definitions for the Virtualization Extensions 



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: default avatarDave Martin <dave.martin@linaro.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a61a41a0

arch/arm/include/asm/opcodes-virt.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * 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 <asm/opcodes.h>



#define __HVC(imm16) __inst_arm_thumb32(				\

	0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F),	\

	0xF7E08000 | (((imm16) & 0xF000) << 4) | ((imm16) & 0x0FFF)	\

)



#endif /* ! __ASM_ARM_OPCODES_VIRT_H */

arch/arm/include/asm/opcodes.h

+2 −0
Original line number Diff line number Diff line
@@ -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 <linux/stringify.h>