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

Commit 8eba1842 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86/UV: Add uvtrace support 



This patch adds support for the uvtrace module by providing a
skeleton call to the registered trace function.  It also
provides another separate 'NMI' tracer that is triggered by the
system wide 'power nmi' command.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Reviewed-by: default avatarHedi Berriche <hedi@sgi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Jason Wessel <jason.wessel@windriver.com>
Link: http://lkml.kernel.org/r/20130923212501.185052551@asylum.americas.sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 12ba6c99

arch/x86/include/asm/uv/uv.h

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ extern void uv_cpu_init(void); 
extern void uv_nmi_init(void);

extern void uv_register_nmi_notifier(void);

extern void uv_system_init(void);

extern void (*uv_trace_nmi_func)(unsigned int reason, struct pt_regs *regs);

extern void (*uv_trace_func)(const char *f, const int l, const char *fmt, ...);

#define uv_trace(fmt, ...)						\

do {									\

	if (unlikely(uv_trace_func))					\

		(uv_trace_func)(__func__, __LINE__, fmt, ##__VA_ARGS__);\

} while (0)

extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,

						 struct mm_struct *mm,

						 unsigned long start,
@@ -26,6 +33,7 @@ static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; } 
static inline int is_uv_system(void)	{ return 0; }

static inline void uv_cpu_init(void)	{ }

static inline void uv_system_init(void)	{ }

static inline void uv_trace(void *fmt, ...)	{ }

static inline void uv_register_nmi_notifier(void) { }

static inline const struct cpumask *

uv_flush_tlb_others(const struct cpumask *cpumask, struct mm_struct *mm,

arch/x86/platform/uv/uv_nmi.c

+12 −1
Original line number Diff line number Diff line 
/*

 * SGI NMI support routines

 * SGI NMI/TRACE support routines

 *

 *  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
@@ -36,6 +36,13 @@ 
#include <asm/uv/uv_hub.h>

#include <asm/uv/uv_mmrs.h>



void (*uv_trace_func)(const char *f, const int l, const char *fmt, ...);

EXPORT_SYMBOL(uv_trace_func);



void (*uv_trace_nmi_func)(unsigned int reason, struct pt_regs *regs);

EXPORT_SYMBOL(uv_trace_nmi_func);





/*

 * UV handler for NMI

 *
@@ -551,6 +558,10 @@ int uv_handle_nmi(unsigned int reason, struct pt_regs *regs) 
		return NMI_DONE;

	}



	/* Call possible NMI trace function */

	if (unlikely(uv_trace_nmi_func))

		(uv_trace_nmi_func)(reason, regs);



	/* Indicate we are the first CPU into the NMI handler */

	master = (atomic_read(&uv_nmi_cpu) == cpu);