hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfp: update nfp_X logging definitions

Browse Source 
Previously it was not possible to determine which code path was responsible
for generating a certain message after a call to the nfp_X messaging
definitions for cases of duplicate strings. We therefore modify nfp_err,
nfp_warn, nfp_info, nfp_dbg and nfp_printk to print the corresponding file
and line number where the nfp_X definition is used.

Signed-off-by: Dylan Muller <dylan.muller@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dylan Muller 2022-04-12 17:26:00 +02:00 committed by David S. Miller
parent 735cb16bfe
commit 9386ebccfc
1 changed files with 20 additions and 6 deletions

24
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h

@ -13,23 +13,37 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/stringify.h>
#ifndef NFP_SUBSYS #ifndef NFP_SUBSYS
#define NFP_SUBSYS "nfp" #define NFP_SUBSYS "nfp"
#endif #endif
#define nfp_err(cpp, fmt, args...) \ #define string_format(x) __FILE__ ":" __stringify(__LINE__) ": " x
#define __nfp_err(cpp, fmt, args...) \
dev_err(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args) dev_err(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args)
#define nfp_warn(cpp, fmt, args...) \ #define __nfp_warn(cpp, fmt, args...) \
dev_warn(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args) dev_warn(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args)
#define nfp_info(cpp, fmt, args...) \ #define __nfp_info(cpp, fmt, args...) \
dev_info(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args) dev_info(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args)
#define nfp_dbg(cpp, fmt, args...) \ #define __nfp_dbg(cpp, fmt, args...) \
dev_dbg(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args) dev_dbg(nfp_cpp_device(cpp)->parent, NFP_SUBSYS ": " fmt, ## args)
#define nfp_printk(level, cpp, fmt, args...) \ #define __nfp_printk(level, cpp, fmt, args...) \
dev_printk(level, nfp_cpp_device(cpp)->parent, \ dev_printk(level, nfp_cpp_device(cpp)->parent, \
NFP_SUBSYS ": " fmt, ## args) NFP_SUBSYS ": " fmt, ## args)
#define nfp_err(cpp, fmt, args...) \
__nfp_err(cpp, string_format(fmt), ## args)
#define nfp_warn(cpp, fmt, args...) \
__nfp_warn(cpp, string_format(fmt), ## args)
#define nfp_info(cpp, fmt, args...) \
__nfp_info(cpp, string_format(fmt), ## args)
#define nfp_dbg(cpp, fmt, args...) \
__nfp_dbg(cpp, string_format(fmt), ## args)
#define nfp_printk(level, cpp, fmt, args...) \
__nfp_printk(level, cpp, string_format(fmt), ## args)
#define PCI_64BIT_BAR_COUNT 3 #define PCI_64BIT_BAR_COUNT 3
#define NFP_CPP_NUM_TARGETS 16 #define NFP_CPP_NUM_TARGETS 16