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

Commit f1deab50 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

bnx2x: Use pr_fmt and message logging cleanups 



Add pr_fmt(fmt) KBUILD_MODNAME ": " to prefix messages with "bnx2x: ".
Remove #define DP_LEVEL and use pr_notice.
Repeating KERN_<LEVEL> isn't necessary in multi-line printks.
printk macro neatening, use fmt and ##__VA_ARGS__.
Coalesce long formats.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94f05b0f

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+31 −32
Original line number Diff line number Diff line
@@ -66,65 +66,64 @@ 
#define BNX2X_MSG_SP			0x100000 /* was: NETIF_MSG_INTR */

#define BNX2X_MSG_FP			0x200000 /* was: NETIF_MSG_INTR */



#define DP_LEVEL			KERN_NOTICE	/* was: KERN_DEBUG */



/* regular debug print */

#define DP(__mask, __fmt, __args...)				\

#define DP(__mask, fmt, ...)					\

do {								\

	if (bp->msg_enable & (__mask))				\

		printk(DP_LEVEL "[%s:%d(%s)]" __fmt,		\

		pr_notice("[%s:%d(%s)]" fmt,			\

			  __func__, __LINE__,			\

			  bp->dev ? (bp->dev->name) : "?",	\

		       ##__args);				\

			  ##__VA_ARGS__);			\

} while (0)



#define DP_CONT(__mask, __fmt, __args...)			\

#define DP_CONT(__mask, fmt, ...)				\

do {								\

	if (bp->msg_enable & (__mask))				\

		pr_cont(__fmt, ##__args);			\

		pr_cont(fmt, ##__VA_ARGS__);			\

} while (0)



/* errors debug print */

#define BNX2X_DBG_ERR(__fmt, __args...)				\

#define BNX2X_DBG_ERR(fmt, ...)					\

do {								\

	if (netif_msg_probe(bp))				\

		pr_err("[%s:%d(%s)]" __fmt,			\

		pr_err("[%s:%d(%s)]" fmt,			\

		       __func__, __LINE__,			\

		       bp->dev ? (bp->dev->name) : "?",		\

		       ##__args);				\

		       ##__VA_ARGS__);				\

} while (0)



/* for errors (never masked) */

#define BNX2X_ERR(__fmt, __args...)				\

#define BNX2X_ERR(fmt, ...)					\

do {								\

	pr_err("[%s:%d(%s)]" __fmt,				\

	pr_err("[%s:%d(%s)]" fmt,				\

	       __func__, __LINE__,				\

	       bp->dev ? (bp->dev->name) : "?",			\

	       ##__args);					\

	       ##__VA_ARGS__);					\

} while (0)



#define BNX2X_ERROR(__fmt, __args...) do { \

	pr_err("[%s:%d]" __fmt, __func__, __LINE__, ##__args); \

	} while (0)

#define BNX2X_ERROR(fmt, ...)					\

	pr_err("[%s:%d]" fmt, __func__, __LINE__, ##__VA_ARGS__)





/* before we have a dev->name use dev_info() */

#define BNX2X_DEV_INFO(__fmt, __args...)			 \

#define BNX2X_DEV_INFO(fmt, ...)				 \

do {								 \

	if (netif_msg_probe(bp))				 \

		dev_info(&bp->pdev->dev, __fmt, ##__args);	 \

		dev_info(&bp->pdev->dev, fmt, ##__VA_ARGS__);	 \

} while (0)



#ifdef BNX2X_STOP_ON_ERROR

void bnx2x_int_disable(struct bnx2x *bp);

#define bnx2x_panic() do { \

#define bnx2x_panic()				\

do {						\

	bp->panic = 1;				\

	BNX2X_ERR("driver assert\n");		\

	bnx2x_int_disable(bp);			\

	bnx2x_panic_dump(bp);			\

} while (0)

#else

#define bnx2x_panic() do { \

#define bnx2x_panic()				\

do {						\

	bp->panic = 1;				\

	BNX2X_ERR("driver assert\n");		\

	bnx2x_panic_dump(bp);			\

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/etherdevice.h>

#include <linux/if_vlan.h>

#include <linux/interrupt.h>
@@ -3369,7 +3371,7 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu) 
	struct bnx2x *bp = netdev_priv(dev);



	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		printk(KERN_ERR "Handling parity error recovery. Try again later\n");

		pr_err("Handling parity error recovery. Try again later\n");

		return -EAGAIN;

	}
@@ -3495,7 +3497,7 @@ int bnx2x_resume(struct pci_dev *pdev) 
	bp = netdev_priv(dev);



	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		printk(KERN_ERR "Handling parity error recovery. Try again later\n");

		pr_err("Handling parity error recovery. Try again later\n");

		return -EAGAIN;

	}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
 * Written by: Dmitry Kravkov

 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/netdevice.h>

#include <linux/types.h>

#include <linux/errno.h>

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+13 −10
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
 * Statistics and Link management by Yitchak Gertner

 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/ethtool.h>

#include <linux/netdevice.h>

#include <linux/types.h>
@@ -239,9 +242,9 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	cmd->maxrxpkt = 0;



	DP(NETIF_MSG_LINK, "ethtool_cmd: cmd %d\n"

	   DP_LEVEL "  supported 0x%x  advertising 0x%x  speed %u\n"

	   DP_LEVEL "  duplex %d  port %d  phy_address %d  transceiver %d\n"

	   DP_LEVEL "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",

	   "  supported 0x%x  advertising 0x%x  speed %u\n"

	   "  duplex %d  port %d  phy_address %d  transceiver %d\n"

	   "  autoneg %d  maxtxpkt %d  maxrxpkt %d\n",

	   cmd->cmd, cmd->supported, cmd->advertising,

	   ethtool_cmd_speed(cmd),

	   cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
@@ -482,7 +485,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	}



	DP(NETIF_MSG_LINK, "req_line_speed %d\n"

	   DP_LEVEL "  req_duplex %d  advertising 0x%x\n",

	   "  req_duplex %d  advertising 0x%x\n",

	   bp->link_params.req_line_speed[cfg_idx],

	   bp->link_params.req_duplex[cfg_idx],

	   bp->port.advertising[cfg_idx]);
@@ -1028,7 +1031,7 @@ static int bnx2x_get_eeprom(struct net_device *dev, 
		return -EAGAIN;



	DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"

	   DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",

	   "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",

	   eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,

	   eeprom->len, eeprom->len);
@@ -1199,7 +1202,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, 
		return -EAGAIN;



	DP(BNX2X_MSG_NVM, "ethtool_eeprom: cmd %d\n"

	   DP_LEVEL "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",

	   "  magic 0x%x  offset 0x%x (%d)  len 0x%x (%d)\n",

	   eeprom->cmd, eeprom->magic, eeprom->offset, eeprom->offset,

	   eeprom->len, eeprom->len);
@@ -1328,7 +1331,7 @@ static int bnx2x_set_ringparam(struct net_device *dev, 
	struct bnx2x *bp = netdev_priv(dev);



	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		printk(KERN_ERR "Handling parity error recovery. Try again later\n");

		pr_err("Handling parity error recovery. Try again later\n");

		return -EAGAIN;

	}
@@ -1359,7 +1362,7 @@ static void bnx2x_get_pauseparam(struct net_device *dev, 
			    BNX2X_FLOW_CTRL_TX);



	DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"

	   DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",

	   "  autoneg %d  rx_pause %d  tx_pause %d\n",

	   epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);

}
@@ -1372,7 +1375,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev, 
		return 0;



	DP(NETIF_MSG_LINK, "ethtool_pauseparam: cmd %d\n"

	   DP_LEVEL "  autoneg %d  rx_pause %d  tx_pause %d\n",

	   "  autoneg %d  rx_pause %d  tx_pause %d\n",

	   epause->cmd, epause->autoneg, epause->rx_pause, epause->tx_pause);



	bp->link_params.req_flow_ctrl[cfg_idx] = BNX2X_FLOW_CTRL_AUTO;
@@ -1970,7 +1973,7 @@ static void bnx2x_self_test(struct net_device *dev, 
	struct bnx2x *bp = netdev_priv(dev);

	u8 is_serdes;

	if (bp->recovery_state != BNX2X_RECOVERY_DONE) {

		printk(KERN_ERR "Handling parity error recovery. Try again later\n");

		pr_err("Handling parity error recovery. Try again later\n");

		etest->flags |= ETH_TEST_FL_FAILED;

		return;

	}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+10 −15
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/kernel.h>
@@ -350,17 +352,15 @@ static void bnx2x_dp_dmae(struct bnx2x *bp, struct dmae_command *dmae, 
	default:

		if (src_type == DMAE_CMD_SRC_PCI)

			DP(msglvl, "DMAE: opcode 0x%08x\n"

			   DP_LEVEL "src_addr [%x:%08x]  len [%d * 4]  "

				    "dst_addr [none]\n"

			   DP_LEVEL "comp_addr [%x:%08x]  comp_val 0x%08x\n",

			   "src_addr [%x:%08x]  len [%d * 4]  dst_addr [none]\n"

			   "comp_addr [%x:%08x]  comp_val 0x%08x\n",

			   dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,

			   dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,

			   dmae->comp_val);

		else

			DP(msglvl, "DMAE: opcode 0x%08x\n"

			   DP_LEVEL "src_addr [%08x]  len [%d * 4]  "

				    "dst_addr [none]\n"

			   DP_LEVEL "comp_addr [%x:%08x]  comp_val 0x%08x\n",

			   "src_addr [%08x]  len [%d * 4]  dst_addr [none]\n"

			   "comp_addr [%x:%08x]  comp_val 0x%08x\n",

			   dmae->opcode, dmae->src_addr_lo >> 2,

			   dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,

			   dmae->comp_val);
@@ -797,10 +797,7 @@ void bnx2x_panic_dump(struct bnx2x *bp) 
			CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(func) +

			i*sizeof(u32));



	pr_cont("igu_sb_id(0x%x)  igu_seg_id(0x%x) "

			 "pf_id(0x%x)  vnic_id(0x%x)  "

			 "vf_id(0x%x)  vf_valid (0x%x) "

			 "state(0x%x)\n",

	pr_cont("igu_sb_id(0x%x)  igu_seg_id(0x%x) pf_id(0x%x)  vnic_id(0x%x)  vf_id(0x%x)  vf_valid (0x%x) state(0x%x)\n",

	       sp_sb_data.igu_sb_id,

	       sp_sb_data.igu_seg_id,

	       sp_sb_data.p_func.pf_id,
@@ -3721,9 +3718,7 @@ static inline void bnx2x_clear_load_cnt(struct bnx2x *bp) 


static inline void _print_next_block(int idx, const char *blk)

{

	if (idx)

		pr_cont(", ");

	pr_cont("%s", blk);

	pr_cont("%s%s", idx ? ", " : "", blk);

}



static inline int bnx2x_check_blocks_with_parity0(u32 sig, int par_num,