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

Commit ff10b88b authored by Dongdong Deng's avatar Dongdong Deng Committed by Jason Wessel
Browse files

kgdb,ppc: Individual register get/set for ppc 



commit 534af108(kgdb,kdb: individual
register set and and get API) introduce dbg_get_reg/dbg_set_reg API
for individual register get and set.

This patch implement those APIs for ppc.

Signed-off-by: default avatarDongdong Deng <dongdong.deng@windriver.com>
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
parent 4dacd5c0

arch/powerpc/include/asm/kgdb.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static inline void arch_kgdb_breakpoint(void) 
	asm(".long 0x7d821008"); /* twge r2, r2 */

}

#define CACHE_FLUSH_IS_SAFE	1

#define DBG_MAX_REG_NUM     70



/* The number bytes of registers we have to save depends on a few

 * things.  For 64bit we default to not including vector registers and

arch/powerpc/kernel/kgdb.c

+125 −63
Original line number Diff line number Diff line
@@ -194,40 +194,6 @@ static int kgdb_dabr_match(struct pt_regs *regs) 
	ptr = (unsigned long *)ptr32; \

	} while (0)





void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)

{

	unsigned long *ptr = gdb_regs;

	int reg;



	memset(gdb_regs, 0, NUMREGBYTES);



	for (reg = 0; reg < 32; reg++)

		PACK64(ptr, regs->gpr[reg]);



#ifdef CONFIG_FSL_BOOKE

#ifdef CONFIG_SPE

	for (reg = 0; reg < 32; reg++)

		PACK64(ptr, current->thread.evr[reg]);

#else

	ptr += 32;

#endif

#else

	/* fp registers not used by kernel, leave zero */

	ptr += 32 * 8 / sizeof(long);

#endif



	PACK64(ptr, regs->nip);

	PACK64(ptr, regs->msr);

	PACK32(ptr, regs->ccr);

	PACK64(ptr, regs->link);

	PACK64(ptr, regs->ctr);

	PACK32(ptr, regs->xer);



	BUG_ON((unsigned long)ptr >

	       (unsigned long)(((void *)gdb_regs) + NUMREGBYTES));

}



void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)

{

	struct pt_regs *regs = (struct pt_regs *)(p->thread.ksp +
@@ -271,44 +237,140 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 
	       (unsigned long)(((void *)gdb_regs) + NUMREGBYTES));

}



#define UNPACK64(dest, ptr) do { dest = *(ptr++); } while (0)

#define GDB_SIZEOF_REG sizeof(unsigned long)

#define GDB_SIZEOF_REG_U32 sizeof(u32)



#define UNPACK32(dest, ptr) do {       \

	u32 *ptr32;                   \

	ptr32 = (u32 *)ptr;           \

	dest = *(ptr32++);            \

	ptr = (unsigned long *)ptr32; \

	} while (0)

#ifdef CONFIG_FSL_BOOKE

#define GDB_SIZEOF_FLOAT_REG sizeof(unsigned long)

#else

#define GDB_SIZEOF_FLOAT_REG sizeof(u64)

#endif



void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)

struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =

{

	unsigned long *ptr = gdb_regs;

	int reg;



	for (reg = 0; reg < 32; reg++)

		UNPACK64(regs->gpr[reg], ptr);

	{ "r0", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[0]) },

	{ "r1", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[1]) },

	{ "r2", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[2]) },

	{ "r3", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[3]) },

	{ "r4", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[4]) },

	{ "r5", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[5]) },

	{ "r6", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[6]) },

	{ "r7", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[7]) },

	{ "r8", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[8]) },

	{ "r9", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[9]) },

	{ "r10", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[10]) },

	{ "r11", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[11]) },

	{ "r12", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[12]) },

	{ "r13", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[13]) },

	{ "r14", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[14]) },

	{ "r15", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[15]) },

	{ "r16", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[16]) },

	{ "r17", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[17]) },

	{ "r18", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[18]) },

	{ "r19", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[19]) },

	{ "r20", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[20]) },

	{ "r21", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[21]) },

	{ "r22", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[22]) },

	{ "r23", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[23]) },

	{ "r24", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[24]) },

	{ "r25", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[25]) },

	{ "r26", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[26]) },

	{ "r27", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[27]) },

	{ "r28", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[28]) },

	{ "r29", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[29]) },

	{ "r30", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[30]) },

	{ "r31", GDB_SIZEOF_REG, offsetof(struct pt_regs, gpr[31]) },



	{ "f0", GDB_SIZEOF_FLOAT_REG, 0 },

	{ "f1", GDB_SIZEOF_FLOAT_REG, 1 },

	{ "f2", GDB_SIZEOF_FLOAT_REG, 2 },

	{ "f3", GDB_SIZEOF_FLOAT_REG, 3 },

	{ "f4", GDB_SIZEOF_FLOAT_REG, 4 },

	{ "f5", GDB_SIZEOF_FLOAT_REG, 5 },

	{ "f6", GDB_SIZEOF_FLOAT_REG, 6 },

	{ "f7", GDB_SIZEOF_FLOAT_REG, 7 },

	{ "f8", GDB_SIZEOF_FLOAT_REG, 8 },

	{ "f9", GDB_SIZEOF_FLOAT_REG, 9 },

	{ "f10", GDB_SIZEOF_FLOAT_REG, 10 },

	{ "f11", GDB_SIZEOF_FLOAT_REG, 11 },

	{ "f12", GDB_SIZEOF_FLOAT_REG, 12 },

	{ "f13", GDB_SIZEOF_FLOAT_REG, 13 },

	{ "f14", GDB_SIZEOF_FLOAT_REG, 14 },

	{ "f15", GDB_SIZEOF_FLOAT_REG, 15 },

	{ "f16", GDB_SIZEOF_FLOAT_REG, 16 },

	{ "f17", GDB_SIZEOF_FLOAT_REG, 17 },

	{ "f18", GDB_SIZEOF_FLOAT_REG, 18 },

	{ "f19", GDB_SIZEOF_FLOAT_REG, 19 },

	{ "f20", GDB_SIZEOF_FLOAT_REG, 20 },

	{ "f21", GDB_SIZEOF_FLOAT_REG, 21 },

	{ "f22", GDB_SIZEOF_FLOAT_REG, 22 },

	{ "f23", GDB_SIZEOF_FLOAT_REG, 23 },

	{ "f24", GDB_SIZEOF_FLOAT_REG, 24 },

	{ "f25", GDB_SIZEOF_FLOAT_REG, 25 },

	{ "f26", GDB_SIZEOF_FLOAT_REG, 26 },

	{ "f27", GDB_SIZEOF_FLOAT_REG, 27 },

	{ "f28", GDB_SIZEOF_FLOAT_REG, 28 },

	{ "f29", GDB_SIZEOF_FLOAT_REG, 29 },

	{ "f30", GDB_SIZEOF_FLOAT_REG, 30 },

	{ "f31", GDB_SIZEOF_FLOAT_REG, 31 },



	{ "pc", GDB_SIZEOF_REG, offsetof(struct pt_regs, nip) },

	{ "msr", GDB_SIZEOF_REG, offsetof(struct pt_regs, msr) },

	{ "cr", GDB_SIZEOF_REG_U32, offsetof(struct pt_regs, ccr) },

	{ "lr", GDB_SIZEOF_REG, offsetof(struct pt_regs, link) },

	{ "ctr", GDB_SIZEOF_REG_U32, offsetof(struct pt_regs, ctr) },

	{ "xer", GDB_SIZEOF_REG, offsetof(struct pt_regs, xer) },

};



#ifdef CONFIG_FSL_BOOKE

#ifdef CONFIG_SPE

	for (reg = 0; reg < 32; reg++)

		UNPACK64(current->thread.evr[reg], ptr);

char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)

{

	if (regno >= DBG_MAX_REG_NUM || regno < 0)

		return NULL;



	if (regno < 32 || regno >= 64)

		/* First 0 -> 31 gpr registers*/

		/* pc, msr, ls... registers 64 -> 69 */

		memcpy(mem, (void *)regs + dbg_reg_def[regno].offset,

				dbg_reg_def[regno].size);



	if (regno >= 32 && regno < 64) {

		/* FP registers 32 -> 63 */

#if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_SPE)

		if (current)

			memcpy(mem, current->thread.evr[regno-32],

					dbg_reg_def[regno].size);

#else

	ptr += 32;

		/* fp registers not used by kernel, leave zero */

		memset(mem, 0, dbg_reg_def[regno].size);

#endif

	}



	return dbg_reg_def[regno].name;

}



int dbg_set_reg(int regno, void *mem, struct pt_regs *regs)

{

	if (regno >= DBG_MAX_REG_NUM || regno < 0)

		return -EINVAL;



	if (regno < 32 || regno >= 64)

		/* First 0 -> 31 gpr registers*/

		/* pc, msr, ls... registers 64 -> 69 */

		memcpy((void *)regs + dbg_reg_def[regno].offset, mem,

				dbg_reg_def[regno].size);



	if (regno >= 32 && regno < 64) {

		/* FP registers 32 -> 63 */

#if defined(CONFIG_FSL_BOOKE) && defined(CONFIG_SPE)

		memcpy(current->thread.evr[regno-32], mem,

				dbg_reg_def[regno].size);

#else

		/* fp registers not used by kernel, leave zero */

	ptr += 32 * 8 / sizeof(int);

		return 0;

#endif

	}



	UNPACK64(regs->nip, ptr);

	UNPACK64(regs->msr, ptr);

	UNPACK32(regs->ccr, ptr);

	UNPACK64(regs->link, ptr);

	UNPACK64(regs->ctr, ptr);

	UNPACK32(regs->xer, ptr);



	BUG_ON((unsigned long)ptr >

	       (unsigned long)(((void *)gdb_regs) + NUMREGBYTES));

	return 0;

}



void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)