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

Commit 5f07aa75 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'paulus-perf/master' into next

parents e467e104 d09ec738

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config PPC 
	select GENERIC_ATOMIC64 if PPC32

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64



config EARLY_PRINTK

	bool

arch/powerpc/include/asm/asm-compat.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define PPC_STLCX	stringify_in_c(stdcx.)

#define PPC_CNTLZL	stringify_in_c(cntlzd)

#define PPC_LR_STKOFF	16

#define PPC_MIN_STKFRM	112



/* Move to CR, single-entry optimized version. Only available

 * on POWER4 and later.
@@ -55,6 +56,7 @@ 
#define PPC_CNTLZL	stringify_in_c(cntlzw)

#define PPC_MTOCRF	stringify_in_c(mtcrf)

#define PPC_LR_STKOFF	4

#define PPC_MIN_STKFRM	16



#endif

arch/powerpc/include/asm/cputable.h

+4 −0
Original line number Diff line number Diff line
@@ -517,6 +517,10 @@ static inline int cpu_has_feature(unsigned long feature) 
		& feature);

}



#ifdef CONFIG_HAVE_HW_BREAKPOINT

#define HBP_NUM 1

#endif /* CONFIG_HAVE_HW_BREAKPOINT */



#endif /* !__ASSEMBLY__ */



#endif /* __KERNEL__ */

arch/powerpc/include/asm/hw_breakpoint.h

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

 * PowerPC BookIII S hardware breakpoint definitions

 *

 * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 *

 * Copyright 2010, IBM Corporation.

 * Author: K.Prasad <prasad@linux.vnet.ibm.com>

 *

 */



#ifndef _PPC_BOOK3S_64_HW_BREAKPOINT_H

#define _PPC_BOOK3S_64_HW_BREAKPOINT_H



#ifdef	__KERNEL__

#ifdef CONFIG_HAVE_HW_BREAKPOINT



struct arch_hw_breakpoint {

	bool		extraneous_interrupt;

	u8		len; /* length of the target data symbol */

	int		type;

	unsigned long	address;

};



#include <linux/kdebug.h>

#include <asm/reg.h>

#include <asm/system.h>



struct perf_event;

struct pmu;

struct perf_sample_data;



#define HW_BREAKPOINT_ALIGN 0x7

/* Maximum permissible length of any HW Breakpoint */

#define HW_BREAKPOINT_LEN 0x8



extern int hw_breakpoint_slots(int type);

extern int arch_bp_generic_fields(int type, int *gen_bp_type);

extern int arch_check_bp_in_kernelspace(struct perf_event *bp);

extern int arch_validate_hwbkpt_settings(struct perf_event *bp);

extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused,

						unsigned long val, void *data);

int arch_install_hw_breakpoint(struct perf_event *bp);

void arch_uninstall_hw_breakpoint(struct perf_event *bp);

void hw_breakpoint_pmu_read(struct perf_event *bp);

extern void flush_ptrace_hw_breakpoint(struct task_struct *tsk);



extern struct pmu perf_ops_bp;

extern void ptrace_triggered(struct perf_event *bp, int nmi,

			struct perf_sample_data *data, struct pt_regs *regs);

static inline void hw_breakpoint_disable(void)

{

	set_dabr(0);

}

extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);



#else	/* CONFIG_HAVE_HW_BREAKPOINT */

static inline void hw_breakpoint_disable(void) { }

static inline void thread_change_pc(struct task_struct *tsk,

					struct pt_regs *regs) { }

#endif	/* CONFIG_HAVE_HW_BREAKPOINT */

#endif	/* __KERNEL__ */

#endif	/* _PPC_BOOK3S_64_HW_BREAKPOINT_H */

arch/powerpc/include/asm/ppc-opcode.h

+7 −0
Original line number Diff line number Diff line
@@ -52,13 +52,17 @@ 
#define PPC_INST_WAIT			0x7c00007c

#define PPC_INST_TLBIVAX		0x7c000624

#define PPC_INST_TLBSRX_DOT		0x7c0006a5

#define PPC_INST_XXLOR			0xf0000510



/* macros to insert fields into opcodes */

#define __PPC_RA(a)	(((a) & 0x1f) << 16)

#define __PPC_RB(b)	(((b) & 0x1f) << 11)

#define __PPC_RS(s)	(((s) & 0x1f) << 21)

#define __PPC_RT(s)	__PPC_RS(s)

#define __PPC_XA(a)	((((a) & 0x1f) << 16) | (((a) & 0x20) >> 3))

#define __PPC_XB(b)	((((b) & 0x1f) << 11) | (((b) & 0x20) >> 4))

#define __PPC_XS(s)	((((s) & 0x1f) << 21) | (((s) & 0x20) >> 5))

#define __PPC_XT(s)	__PPC_XS(s)

#define __PPC_T_TLB(t)	(((t) & 0x3) << 21)

#define __PPC_WC(w)	(((w) & 0x3) << 21)

/*
@@ -106,9 +110,12 @@ 
 * the 128 bit load store instructions based on that.

 */

#define VSX_XX1(s, a, b)	(__PPC_XS(s) | __PPC_RA(a) | __PPC_RB(b))

#define VSX_XX3(t, a, b)	(__PPC_XT(t) | __PPC_XA(a) | __PPC_XB(b))

#define STXVD2X(s, a, b)	stringify_in_c(.long PPC_INST_STXVD2X | \

					       VSX_XX1((s), (a), (b)))

#define LXVD2X(s, a, b)		stringify_in_c(.long PPC_INST_LXVD2X | \

					       VSX_XX1((s), (a), (b)))

#define XXLOR(t, a, b)		stringify_in_c(.long PPC_INST_XXLOR | \

					       VSX_XX3((t), (a), (b)))



#endif /* _ASM_POWERPC_PPC_OPCODE_H */