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

Commit f98deee9 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64: move brk immediate argument definitions to separate header 



Instead of reversing the header dependency between asm/bug.h and
asm/debug-monitors.h, split off the brk instruction immediate value
defines into a new header asm/brk-imm.h, and include it from both.

This solves the circular dependency issue that prevents BUG() from
being used in some header files, and keeps the definitions together.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 8439e62a

arch/arm64/include/asm/brk-imm.h

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

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ASM_BRK_IMM_H

#define __ASM_BRK_IMM_H



/*

 * #imm16 values used for BRK instruction generation

 * Allowed values for kgdb are 0x400 - 0x7ff

 * 0x100: for triggering a fault on purpose (reserved)

 * 0x400: for dynamic BRK instruction

 * 0x401: for compile time BRK instruction

 * 0x800: kernel-mode BUG() and WARN() traps

 */

#define FAULT_BRK_IMM			0x100

#define KGDB_DYN_DBG_BRK_IMM		0x400

#define KGDB_COMPILED_DBG_BRK_IMM	0x401

#define BUG_BRK_IMM			0x800



#endif

arch/arm64/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifndef _ARCH_ARM64_ASM_BUG_H

#define _ARCH_ARM64_ASM_BUG_H



#define BUG_BRK_IMM			0x800

#include <asm/brk-imm.h>



#ifdef CONFIG_GENERIC_BUG

#define HAVE_ARCH_BUG

arch/arm64/include/asm/debug-monitors.h

+1 −13
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <linux/errno.h>

#include <linux/types.h>

#include <asm/bug.h>

#include <asm/brk-imm.h>

#include <asm/esr.h>

#include <asm/insn.h>

#include <asm/ptrace.h>
@@ -47,18 +47,6 @@ 
 */

#define BREAK_INSTR_SIZE		AARCH64_INSN_SIZE



/*

 * #imm16 values used for BRK instruction generation

 * Allowed values for kgbd are 0x400 - 0x7ff

 * 0x100: for triggering a fault on purpose (reserved)

 * 0x400: for dynamic BRK instruction

 * 0x401: for compile time BRK instruction

 * 0x800: kernel-mode BUG() and WARN() traps

 */

#define FAULT_BRK_IMM			0x100

#define KGDB_DYN_DBG_BRK_IMM		0x400

#define KGDB_COMPILED_DBG_BRK_IMM	0x401



/*

 * BRK instruction encoding

 * The #imm16 value should be placed at bits[20:5] within BRK ins