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

Commit 17c1755c authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: allow runtime changing of debug_level 



Currently, the debug level is set in compilation time (by the DEBUG_LEVEL
const). This method has the advantage of compiling only the relevant
messages, while optimizing out the unused ones.

In order to allow runtime control over the debug_level, while optimizing
out messages when debug messages are not needed, we combine some methods:
1. use dynamic_debug (pr_debug) rather then printk.
2. add debug_level module param in order to set debug level during insmod.
3. add debug_level sysfs file in order to allow dynamic control over the
   debug level.

Since patches for pr_debug_hex_dump() implementation haven't been applied yet,
we are still temporarly using print_hex_dump().

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent ea559b46

drivers/net/wireless/wl12xx/debugfs.c

+5 −0
Original line number Diff line number Diff line
@@ -401,6 +401,11 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl) 


	DEBUGFS_ADD(gpio_power, wl->rootdir);



	entry = debugfs_create_x32("debug_level", 0600, wl->rootdir,

				   &wl12xx_debug_level);

	if (!entry || IS_ERR(entry))

		goto err;



	return 0;



err:

drivers/net/wireless/wl12xx/main.c

+5 −0
Original line number Diff line number Diff line
@@ -2833,6 +2833,11 @@ int wl1271_free_hw(struct wl1271 *wl) 
}

EXPORT_SYMBOL_GPL(wl1271_free_hw);



u32 wl12xx_debug_level;

EXPORT_SYMBOL_GPL(wl12xx_debug_level);

module_param_named(debug_level, wl12xx_debug_level, uint, DEBUG_NONE);

MODULE_PARM_DESC(debug_level, "wl12xx debugging level");



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Luciano Coelho <luciano.coelho@nokia.com>");

MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");

drivers/net/wireless/wl12xx/wl12xx.h

+10 −9
Original line number Diff line number Diff line
@@ -60,31 +60,32 @@ enum { 
	DEBUG_ALL	= ~0,

};



#define DEBUG_LEVEL (DEBUG_NONE)

extern u32 wl12xx_debug_level;



#define DEBUG_DUMP_LIMIT 1024



#define wl1271_error(fmt, arg...) \

	printk(KERN_ERR DRIVER_PREFIX "ERROR " fmt "\n", ##arg)

	pr_err(DRIVER_PREFIX "ERROR " fmt "\n", ##arg)



#define wl1271_warning(fmt, arg...) \

	printk(KERN_WARNING DRIVER_PREFIX "WARNING " fmt "\n", ##arg)

	pr_warning(DRIVER_PREFIX "WARNING " fmt "\n", ##arg)



#define wl1271_notice(fmt, arg...) \

	printk(KERN_INFO DRIVER_PREFIX fmt "\n", ##arg)

	pr_info(DRIVER_PREFIX fmt "\n", ##arg)



#define wl1271_info(fmt, arg...) \

	printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg)

	pr_info(DRIVER_PREFIX fmt "\n", ##arg)



#define wl1271_debug(level, fmt, arg...) \

	do { \

		if (level & DEBUG_LEVEL) \

			printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg); \

		if (level & wl12xx_debug_level) \

			pr_debug(DRIVER_PREFIX fmt "\n", ##arg); \

	} while (0)



/* TODO: use pr_debug_hex_dump when it will be available */

#define wl1271_dump(level, prefix, buf, len)	\

	do { \

		if (level & DEBUG_LEVEL) \

		if (level & wl12xx_debug_level) \

			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \

				       DUMP_PREFIX_OFFSET, 16, 1,	\

				       buf,				\
@@ -94,7 +95,7 @@ enum { 


#define wl1271_dump_ascii(level, prefix, buf, len)	\

	do { \

		if (level & DEBUG_LEVEL) \

		if (level & wl12xx_debug_level) \

			print_hex_dump(KERN_DEBUG, DRIVER_PREFIX prefix, \

				       DUMP_PREFIX_OFFSET, 16, 1,	\

				       buf,				\