openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnx2x: [Debug] change verbosity of some prints 

There are some debug prints (mostly iov/statistics related) which clobber
system logs whenever their verbosity level is set for an interface.
This patch puts harsher verbosity requirements for such debug prints to be
printed.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yuval Mintz 2014-02-12 18:19:49 +02:00 committed by David S. Miller
parent 8bed1285b9
commit 76ca70fabb
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
View File

@ -75,13 +75,22 @@ enum bnx2x_int_mode {
#define BNX2X_MSG_DCB 0x8000000 #define BNX2X_MSG_DCB 0x8000000
/* regular debug print */ /* regular debug print */
#define DP_INNER(fmt, ...) \
pr_notice("[%s:%d(%s)]" fmt, \
__func__, __LINE__, \
bp->dev ? (bp->dev->name) : "?", \
##__VA_ARGS__);
#define DP(__mask, fmt, ...) \ #define DP(__mask, fmt, ...) \
do { \ do { \
if (unlikely(bp->msg_enable & (__mask))) \ if (unlikely(bp->msg_enable & (__mask))) \
pr_notice("[%s:%d(%s)]" fmt, \ DP_INNER(fmt, ##__VA_ARGS__); \
__func__, __LINE__, \ } while (0)
bp->dev ? (bp->dev->name) : "?", \
##__VA_ARGS__); \ #define DP_AND(__mask, fmt, ...) \
do { \
if (unlikely((bp->msg_enable & (__mask)) == __mask)) \
DP_INNER(fmt, ##__VA_ARGS__); \
} while (0) } while (0)
#define DP_CONT(__mask, fmt, ...) \ #define DP_CONT(__mask, fmt, ...) \

6
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -5221,9 +5221,9 @@ static void bnx2x_eq_int(struct bnx2x *bp)
continue; continue;
case EVENT_RING_OPCODE_STAT_QUERY: case EVENT_RING_OPCODE_STAT_QUERY:
DP(BNX2X_MSG_SP | BNX2X_MSG_STATS, DP_AND((BNX2X_MSG_SP | BNX2X_MSG_STATS),
"got statistics comp event %d\n", "got statistics comp event %d\n",
bp->stats_comp++); bp->stats_comp++);
/* nothing to do with stats comp */ /* nothing to do with stats comp */
goto next_spqe; goto next_spqe;

17
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View File

@ -2527,10 +2527,10 @@ void bnx2x_iov_adjust_stats_req(struct bnx2x *bp)
first_queue_query_index = BNX2X_FIRST_QUEUE_QUERY_IDX - first_queue_query_index = BNX2X_FIRST_QUEUE_QUERY_IDX -
(is_fcoe ? 0 : 1); (is_fcoe ? 0 : 1);
DP(BNX2X_MSG_IOV, DP_AND((BNX2X_MSG_IOV | BNX2X_MSG_STATS),
"BNX2X_NUM_ETH_QUEUES %d, is_fcoe %d, first_queue_query_index %d => determined the last non virtual statistics query index is %d. Will add queries on top of that\n", "BNX2X_NUM_ETH_QUEUES %d, is_fcoe %d, first_queue_query_index %d => determined the last non virtual statistics query index is %d. Will add queries on top of that\n",
BNX2X_NUM_ETH_QUEUES(bp), is_fcoe, first_queue_query_index, BNX2X_NUM_ETH_QUEUES(bp), is_fcoe, first_queue_query_index,
first_queue_query_index + num_queues_req); first_queue_query_index + num_queues_req);
cur_data_offset = bp->fw_stats_data_mapping + cur_data_offset = bp->fw_stats_data_mapping +
offsetof(struct bnx2x_fw_stats_data, queue_stats) + offsetof(struct bnx2x_fw_stats_data, queue_stats) +
@ -2544,9 +2544,9 @@ void bnx2x_iov_adjust_stats_req(struct bnx2x *bp)
struct bnx2x_virtf *vf = BP_VF(bp, i); struct bnx2x_virtf *vf = BP_VF(bp, i);
if (vf->state != VF_ENABLED) { if (vf->state != VF_ENABLED) {
DP(BNX2X_MSG_IOV, DP_AND((BNX2X_MSG_IOV | BNX2X_MSG_STATS),
"vf %d not enabled so no stats for it\n", "vf %d not enabled so no stats for it\n",
vf->abs_vfid); vf->abs_vfid);
continue; continue;
} }
@ -2597,7 +2597,8 @@ void bnx2x_iov_sp_task(struct bnx2x *bp)
/* Iterate over all VFs and invoke state transition for VFs with /* Iterate over all VFs and invoke state transition for VFs with
* 'in-progress' slow-path operations * 'in-progress' slow-path operations
*/ */
DP(BNX2X_MSG_IOV, "searching for pending vf operations\n"); DP_AND((BNX2X_MSG_IOV | BNX2X_MSG_SP),
"searching for pending vf operations\n");
for_each_vf(bp, i) { for_each_vf(bp, i) {
struct bnx2x_virtf *vf = BP_VF(bp, i); struct bnx2x_virtf *vf = BP_VF(bp, i);