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

Commit e5483576 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: introduce tracepoints for message logging 



Inspired by tracing functionality added by Seth Forshee in the
brcmsmac driver, this patch adds similar functionality to brcmfmac.

Reviewed-by: default avatarPiotr Haber <phaber@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd864522

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -39,3 +39,5 @@ brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ 
		usb.o

brcmfmac-$(CONFIG_BRCMDBG) += \

		dhd_dbg.o

brcmfmac-$(CONFIG_BRCM_TRACING) += \

		tracepoint.o

drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

+33 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "dhd_proto.h"

#include "dhd_dbg.h"

#include "fwil.h"

#include "tracepoint.h"



#define PKTFILTER_BUF_SIZE		128

#define BRCMF_ARPOL_MODE		0xb	/* agent|snoop|peer_autoreply */
@@ -373,3 +374,35 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
done:

	return err;

}



#ifdef CONFIG_BRCM_TRACING

void __brcmf_err(const char *func, const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;



	va_start(args, fmt);

	vaf.va = &args;

	pr_err("%s: %pV", func, &vaf);

	trace_brcmf_err(func, &vaf);

	va_end(args);

}

#endif

#if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)

void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)

{

	struct va_format vaf = {

		.fmt = fmt,

	};

	va_list args;



	va_start(args, fmt);

	vaf.va = &args;

	if (brcmf_msg_level & level)

		pr_debug("%s %pV", func, &vaf);

	trace_brcmf_dbg(level, func, &vaf);

	va_end(args);

}

#endif

drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "dhd.h"

#include "dhd_bus.h"

#include "dhd_dbg.h"

#include "tracepoint.h"



static struct dentry *root_folder;

drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h

+14 −7
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
 * debugging is not selected. When debugging the driver error

 * messages are as important as other tracing or even more so.

 */

#ifndef CONFIG_BRCM_TRACING

#ifdef CONFIG_BRCMDBG

#define brcmf_err(fmt, ...)	pr_err("%s: " fmt, __func__, ##__VA_ARGS__)

#else
@@ -52,15 +53,21 @@ 
			pr_err("%s: " fmt, __func__, ##__VA_ARGS__);	\

	} while (0)

#endif

#else

__printf(2, 3)

void __brcmf_err(const char *func, const char *fmt, ...);

#define brcmf_err(fmt, ...) \

	__brcmf_err(__func__, fmt, ##__VA_ARGS__)

#endif



#if defined(DEBUG)



#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)

__printf(3, 4)

void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...);

#define brcmf_dbg(level, fmt, ...)				\

do {								\

	if (brcmf_msg_level & BRCMF_##level##_VAL)		\

		pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);	\

	__brcmf_dbg(BRCMF_##level##_VAL, __func__,		\

		    fmt, ##__VA_ARGS__);			\

} while (0)



#define BRCMF_DATA_ON()		(brcmf_msg_level & BRCMF_DATA_VAL)

#define BRCMF_CTL_ON()		(brcmf_msg_level & BRCMF_CTL_VAL)

#define BRCMF_HDRS_ON()		(brcmf_msg_level & BRCMF_HDRS_VAL)
@@ -69,7 +76,7 @@ do { \ 
#define BRCMF_EVENT_ON()	(brcmf_msg_level & BRCMF_EVENT_VAL)

#define BRCMF_FIL_ON()		(brcmf_msg_level & BRCMF_FIL_VAL)



#else	/* (defined DEBUG) || (defined DEBUG) */

#else /* defined(DEBUG) || defined(CONFIG_BRCM_TRACING) */



#define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
@@ -81,7 +88,7 @@ do { \ 
#define BRCMF_EVENT_ON()	0

#define BRCMF_FIL_ON()		0



#endif				/* defined(DEBUG) */

#endif /* defined(DEBUG) || defined(CONFIG_BRCM_TRACING) */



#define brcmf_dbg_hex_dump(test, data, len, fmt, ...)			\

do {									\

drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c

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

 * Copyright (c) 2012 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__

#define CREATE_TRACE_POINTS

#include "tracepoint.h"

#endif