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

Commit 7acf71d1 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Fix typos in KGDB macros 



Some of the KGDB macros used for generating the BRK instructions had the
wrong spelling for DBG and KGDB abbreviations.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a9ae04c9

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

+11 −11
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
 * 0x401: for compile time BRK instruction

 */

#define FAULT_BRK_IMM			0x100

#define KGDB_DYN_DGB_BRK_IMM		0x400

#define KDBG_COMPILED_DBG_BRK_IMM	0x401

#define KGDB_DYN_DBG_BRK_IMM		0x400

#define KGDB_COMPILED_DBG_BRK_IMM	0x401



/*

 * BRK instruction encoding
@@ -71,22 +71,22 @@ 
/*

 * Extract byte from BRK instruction

 */

#define KGDB_DYN_DGB_BRK_INS_BYTE(x) \

#define KGDB_DYN_DBG_BRK_INS_BYTE(x) \

	((((AARCH64_BREAK_MON) & 0xffe0001f) >> (x * 8)) & 0xff)



/*

 * Extract byte from BRK #imm16

 */

#define KGBD_DYN_DGB_BRK_IMM_BYTE(x) \

	(((((KGDB_DYN_DGB_BRK_IMM) & 0xffff) << 5) >> (x * 8)) & 0xff)

#define KGBD_DYN_DBG_BRK_IMM_BYTE(x) \

	(((((KGDB_DYN_DBG_BRK_IMM) & 0xffff) << 5) >> (x * 8)) & 0xff)



#define KGDB_DYN_DGB_BRK_BYTE(x) \

	(KGDB_DYN_DGB_BRK_INS_BYTE(x) | KGBD_DYN_DGB_BRK_IMM_BYTE(x))

#define KGDB_DYN_DBG_BRK_BYTE(x) \

	(KGDB_DYN_DBG_BRK_INS_BYTE(x) | KGBD_DYN_DBG_BRK_IMM_BYTE(x))



#define  KGDB_DYN_BRK_INS_BYTE0  KGDB_DYN_DGB_BRK_BYTE(0)

#define  KGDB_DYN_BRK_INS_BYTE1  KGDB_DYN_DGB_BRK_BYTE(1)

#define  KGDB_DYN_BRK_INS_BYTE2  KGDB_DYN_DGB_BRK_BYTE(2)

#define  KGDB_DYN_BRK_INS_BYTE3  KGDB_DYN_DGB_BRK_BYTE(3)

#define  KGDB_DYN_BRK_INS_BYTE0  KGDB_DYN_DBG_BRK_BYTE(0)

#define  KGDB_DYN_BRK_INS_BYTE1  KGDB_DYN_DBG_BRK_BYTE(1)

#define  KGDB_DYN_BRK_INS_BYTE2  KGDB_DYN_DBG_BRK_BYTE(2)

#define  KGDB_DYN_BRK_INS_BYTE3  KGDB_DYN_DBG_BRK_BYTE(3)



#define CACHE_FLUSH_IS_SAFE		1

arch/arm64/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


static inline void arch_kgdb_breakpoint(void)

{

	asm ("brk %0" : : "I" (KDBG_COMPILED_DBG_BRK_IMM));

	asm ("brk %0" : : "I" (KGDB_COMPILED_DBG_BRK_IMM));

}



extern void kgdb_handle_bus_error(void);

arch/arm64/kernel/kgdb.c

+2 −2
Original line number Diff line number Diff line
@@ -235,13 +235,13 @@ static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr) 


static struct break_hook kgdb_brkpt_hook = {

	.esr_mask	= 0xffffffff,

	.esr_val	= DBG_ESR_VAL_BRK(KGDB_DYN_DGB_BRK_IMM),

	.esr_val	= DBG_ESR_VAL_BRK(KGDB_DYN_DBG_BRK_IMM),

	.fn		= kgdb_brk_fn

};



static struct break_hook kgdb_compiled_brkpt_hook = {

	.esr_mask	= 0xffffffff,

	.esr_val	= DBG_ESR_VAL_BRK(KDBG_COMPILED_DBG_BRK_IMM),

	.esr_val	= DBG_ESR_VAL_BRK(KGDB_COMPILED_DBG_BRK_IMM),

	.fn		= kgdb_compiled_brk_fn

};