staging: brcm80211: softmac: added event tracing (8be00d98) · Commits · 戴 / test

drivers/staging/brcm80211/brcmsmac/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,8 @@ BRCMSMAC_OFILES := \
		otp.o \
		srom.o \
		dma.o \
		nicpci.o
		nicpci.o \
		brcms_trace_events.o

		MODULEPFX := brcmsmac

drivers/staging/brcm80211/brcmsmac/brcms_trace_events.c

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011 Broadcom Corporation
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
		* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
		* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
		* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#include <linux/module.h> /* bug in tracepoint.h, it should include this */

		#ifndef __CHECKER__
		#include "mac80211_if.h"
		#define CREATE_TRACE_POINTS
		#include "brcms_trace_events.h"
		#endif

drivers/staging/brcm80211/brcmsmac/brcms_trace_events.h

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011 Broadcom Corporation
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
		* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
		* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
		* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#undef TRACE_SYSTEM
		#define TRACE_SYSTEM brcmsmac

		#if !defined(__TRACE_BRCMSMAC_H) \|\| defined(TRACE_HEADER_MULTI_READ)

		#define __TRACE_BRCMSMAC_H

		#include <linux/tracepoint.h>
		#include "mac80211_if.h"

		#ifndef CONFIG_BRCMDBG
		#undef TRACE_EVENT
		#define TRACE_EVENT(name, proto, ...) \
		static inline void trace_ ## name(proto) {}
		#endif

		/*
		* We define a tracepoint, its arguments, its printk format and its
		* 'fast binary record' layout.
		*/
		TRACE_EVENT(brcms_timer,
		/* TPPROTO is the prototype of the function called by this tracepoint */
		TP_PROTO(struct brcms_timer *t),
		/*
		* TPARGS(firstarg, p) are the parameters names, same as found in the
		* prototype.
		*/
		TP_ARGS(t),
		/*
		* Fast binary tracing: define the trace record via TP_STRUCT__entry().
		* You can think about it like a regular C structure local variable
		* definition.
		*/
		TP_STRUCT__entry(
		__field(uint, ms)
		__field(uint, set)
		__field(uint, periodic)
		),
		TP_fast_assign(
		__entry->ms = t->ms;
		__entry->set = t->set;
		__entry->periodic = t->periodic;
		),
		TP_printk(
		"ms=%u set=%u periodic=%u",
		__entry->ms, __entry->set, __entry->periodic
		)
		);

		TRACE_EVENT(brcms_dpc,
		TP_PROTO(unsigned long data),
		TP_ARGS(data),
		TP_STRUCT__entry(
		__field(unsigned long, data)
		),
		TP_fast_assign(
		__entry->data = data;
		),
		TP_printk(
		"data=%p",
		(void *)__entry->data
		)
		);

		#endif /* __TRACE_BRCMSMAC_H */

		#ifdef CONFIG_BRCMDBG

		#undef TRACE_INCLUDE_PATH
		#define TRACE_INCLUDE_PATH .
		#undef TRACE_INCLUDE_FILE
		#define TRACE_INCLUDE_FILE brcms_trace_events

		#include <trace/define_trace.h>

		#endif /* CONFIG_BRCMDBG */

drivers/staging/brcm80211/brcmsmac/mac80211_if.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -750,7 +750,7 @@ static int brcms_set_hint(struct brcms_info wl, char abbrev)
		return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);
		}

		static void brcms_dpc(unsigned long data)
		void brcms_dpc(unsigned long data)
		{
		struct brcms_info *wl;

		@@ -1430,7 +1430,7 @@ void brcms_down(struct brcms_info *wl)
		/*
		* precondition: perimeter lock is not acquired
		*/
		static void _brcms_timer(struct brcms_timer *t)
		void brcms_timer(struct brcms_timer *t)
		{
		LOCK(t->wl);

		@@ -1454,9 +1454,9 @@ static void _brcms_timer(struct brcms_timer *t)
		/*
		* is called by the kernel from software irq context
		*/
		static void brcms_timer(unsigned long data)
		static void _brcms_timer(unsigned long data)
		{
		_brcms_timer((struct brcms_timer *) data);
		brcms_timer((struct brcms_timer *) data);
		}

		/*
		@@ -1477,7 +1477,7 @@ struct brcms_timer brcms_init_timer(struct brcms_info wl,

		init_timer(&t->timer);
		t->timer.data = (unsigned long) t;
		t->timer.function = brcms_timer;
		t->timer.function = _brcms_timer;
		t->wl = wl;
		t->fn = fn;
		t->arg = arg;

drivers/staging/brcm80211/brcmsmac/mac80211_if.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -101,5 +101,7 @@ extern void brcms_add_timer(struct brcms_info wl, struct brcms_timer timer,
		uint ms, int periodic);
		extern bool brcms_del_timer(struct brcms_info wl, struct brcms_timer timer);
		extern void brcms_msleep(struct brcms_info *wl, uint ms);
		extern void brcms_dpc(unsigned long data);
		extern void brcms_timer(struct brcms_timer *t);

		#endif /* _BRCM_MAC80211_IF_H_ */

Admin message