bnx2x: Logging message cleanups
Subsystems (2)
cover bnx2x: Logging message cleanups
Joe Perches (2):
bnx2x: Remove local defines for %pM and mac address
bnx2x: Coalesce pr_cont uses and fix DP typos
drivers/net/bnx2x/bnx2x.h | 4 - drivers/net/bnx2x/bnx2x_cmn.c | 42 ++++++----- drivers/net/bnx2x/bnx2x_cmn.h | 4 +- drivers/net/bnx2x/bnx2x_dcb.c | 2 +- drivers/net/bnx2x/bnx2x_link.c | 155 +++++++++++++++++++++------------------- drivers/net/bnx2x/bnx2x_main.c | 47 ++++++------- drivers/net/bnx2x/bnx2x_sp.c | 64 ++++++++--------- 7 files changed, 158 insertions(+), 160 deletions(-)
Signature · 1 line
1.7.6.405.gc1be0
PATCH 1/2 bnx2x: Remove local defines for %pM and mac address
Use %pM and mac address directly instead.
--- drivers/net/bnx2x/bnx2x.h | 4 --- drivers/net/bnx2x/bnx2x_main.c | 14 +++++------- drivers/net/bnx2x/bnx2x_sp.c | 41 ++++++++++++++++----------------------- 3 files changed, 23 insertions(+), 36 deletions(-)
drivers/net/bnx2x/bnx2x.h +0 -4
@@ -115,10 +115,6 @@ do { \ dev_info(&bp->pdev->dev, __fmt, ##__args); \ } while (0) -#define BNX2X_MAC_FMT "%pM" -#define BNX2X_MAC_PRN_LIST (mac) (mac) - -#ifdef BNX2X_STOP_ON_ERROR void bnx2x_int_disable (struct bnx2x *bp);#define bnx2x_panic () do { \
drivers/net/bnx2x/bnx2x_main.c +6 -8
@@ -9315,9 +9315,8 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp) val =MF_CFG_RD (bp, func_ext_config[func]. iscsi_mac_addr_lower);bnx2x_set_mac_buf (iscsi_mac, val, val2); -BNX2X_DEV_INFO ("Read iSCSI MAC: " -BNX2X_MAC_FMT "\n" , -BNX2X_MAC_PRN_LIST (iscsi_mac)); +BNX2X_DEV_INFO ("Read iSCSI MAC: %pM\n" , + iscsi_mac); }else bp->flags |=NO_ISCSI_OOO_FLAG |NO_ISCSI_FLAG ;
@@ -9327,9 +9326,8 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp) val =MF_CFG_RD (bp, func_ext_config[func]. fcoe_mac_addr_lower);bnx2x_set_mac_buf (fip_mac, val, val2); -BNX2X_DEV_INFO ("Read FCoE L2 MAC to " -BNX2X_MAC_FMT "\n" , -BNX2X_MAC_PRN_LIST (fip_mac)); +BNX2X_DEV_INFO ("Read FCoE L2 MAC to %pM\n" , + fip_mac); }else bp->flags |=NO_FCOE_FLAG ;
@@ -9384,9 +9382,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)if (!is_valid_ether_addr (bp->dev->dev_addr))dev_err (&bp->pdev->dev,"bad Ethernet MAC address configuration: " -BNX2X_MAC_FMT ", change it manually before bringing up " +"%pM, change it manually before bringing up " "the appropriate network interface\n" , -BNX2X_MAC_PRN_LIST (bp->dev->dev_addr)); + bp->dev->dev_addr); }static int __devinit bnx2x_get_hwinfo (struct bnx2x *bp)
drivers/net/bnx2x/bnx2x_sp.c +17 -24
89 lines not on this page · raw message
Signature · 1 line
1.7.6.405.gc1be0
PATCH 2/2 bnx2x: Coalesce pr_cont uses and fix DP typos
In reply to Joe PerchesUses of pr_cont should be avoided where reasonably possible because they can be interleaved by other threads and processes.
Coalesce pr_cont uses.
Fix typos, duplicated words and spacing in DP uses caused by split multi-line formats. Coalesce some of these split formats. Add missing terminating newlines to DP uses.
--- drivers/net/bnx2x/bnx2x_cmn.c | 42 ++++++----- drivers/net/bnx2x/bnx2x_cmn.h | 4 +- drivers/net/bnx2x/bnx2x_dcb.c | 2 +- drivers/net/bnx2x/bnx2x_link.c | 155 +++++++++++++++++++++------------------- drivers/net/bnx2x/bnx2x_main.c | 33 ++++----- drivers/net/bnx2x/bnx2x_sp.c | 23 +++--- 6 files changed, 135 insertions(+), 124 deletions(-)
drivers/net/bnx2x/bnx2x_cmn.c +23 -19
@@ -953,15 +953,16 @@ void __bnx2x_link_report(struct bnx2x *bp)netdev_err (bp->dev,"NIC Link is Down\n" );return ; }else { +const char *duplex; +const char *flow; +netif_carrier_on (bp->dev); -netdev_info (bp->dev,"NIC Link is Up, " ); -pr_cont ("%d Mbps " , cur_data.line_speed);if (test_and_clear_bit (BNX2X_LINK_REPORT_FD , &cur_data.link_report_flags)) -pr_cont ("full duplex" ); + duplex ="full" ;else -pr_cont ("half duplex" ); + duplex ="half" ;/* Handle the FC at the end so that only these flags would be * possibly set. This way we may easily check if there is no FC
@@ -970,16 +971,19 @@ void __bnx2x_link_report(struct bnx2x *bp)if (cur_data.link_report_flags) {if (test_bit (BNX2X_LINK_REPORT_RX_FC_ON , &cur_data.link_report_flags)) { -pr_cont (", receive " );if (test_bit (BNX2X_LINK_REPORT_TX_FC_ON , &cur_data.link_report_flags)) -pr_cont ("& transmit " ); + flow ="ON - receive & transmit" ; +else + flow ="ON - receive" ; }else { -pr_cont (", transmit " ); + flow ="ON - transmit" ; } -pr_cont ("flow control ON" ); + }else { + flow ="none" ; } -pr_cont ("\n" ); +netdev_info (bp->dev,"NIC Link is Up, %d Mbps %s duplex, Flow control: %s\n" , + cur_data.line_speed, duplex, flow); } }
@@ -2578,7 +2582,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)#endif /* enable this debug print to view the transmission queue being used -DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d", +DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d\n", txq_index, fp_index, txdata_index); */ /* locate the fastpath and the txdata */
@@ -2587,7 +2591,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)/* enable this debug print to view the tranmission details DP(BNX2X_MSG_FP,"transmitting packet cid %d fp index %d txdata_index %d" -" tx_data ptr %p fp pointer %p", +" tx_data ptr %p fp pointer %p\n", txdata->cid, fp_index, txdata_index, txdata, fp); */ if (unlikely(bnx2x_tx_avail(bp, txdata) <
@@ -2904,14 +2908,14 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)/* requested to support too many traffic classes */ if (num_tc > bp->max_cos) {DP (NETIF_MSG_TX_ERR ,"support for too many traffic classes" -" requested: %d. max supported is %d" , +" requested: %d. max supported is %d\n" , num_tc, bp->max_cos);return -EINVAL ; }/* declare amount of supported traffic classes */ if (netdev_set_num_tc (dev, num_tc)) { -DP (NETIF_MSG_TX_ERR ,"failed to declare %d traffic classes" , +DP (NETIF_MSG_TX_ERR ,"failed to declare %d traffic classes\n" , num_tc);return -EINVAL ; }
@@ -2919,7 +2923,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)/* configure priority to traffic class mapping */ for (prio =0 ; prio <BNX2X_MAX_PRIORITY ; prio++) {netdev_set_prio_tc_map (dev, prio, bp->prio_to_cos[prio]); -DP (BNX2X_MSG_SP ,"mapping priority %d to tc %d" , +DP (BNX2X_MSG_SP ,"mapping priority %d to tc %d\n" , prio, bp->prio_to_cos[prio]); }
@@ -2928,10 +2932,10 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)This can be used for ets or pfc, and save the effort of setting up a multio class queue disc or negotiating DCBX with a switch netdev_set_prio_tc_map(dev, 0, 0); -DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", 0, 0); +DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", 0, 0); for (prio = 1; prio < 16; prio++) { netdev_set_prio_tc_map(dev, prio, 1); -DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", prio, 1); +DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", prio, 1); } */ /* configure traffic class to transmission queue mapping */
@@ -2939,7 +2943,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc) count =BNX2X_NUM_ETH_QUEUES (bp); offset = cos *MAX_TXQS_PER_COS ;netdev_set_tc_queue (dev, cos, count, offset); -DP (BNX2X_MSG_SP ,"mapping tc %d to offset %d count %d" , +DP (BNX2X_MSG_SP ,"mapping tc %d to offset %d count %d\n" , cos, offset, count); }
@@ -3027,7 +3031,7 @@ static void bnx2x_free_fp_mem_at(struct bnx2x *bp, int fp_index)struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];DP (BNX2X_MSG_SP , -"freeing tx memory of fp %d cos %d cid %d" , +"freeing tx memory of fp %d cos %d cid %d\n" , fp_index, cos, txdata->cid);BNX2X_FREE (txdata->tx_buf_ring);
@@ -3109,7 +3113,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];DP (BNX2X_MSG_SP ,"allocating tx memory of " -"fp %d cos %d" , +"fp %d cos %d\n" , index, cos); BNX2X_ALLOC(txdata->tx_buf_ring,
drivers/net/bnx2x/bnx2x_cmn.h +2 -2
@@ -1289,7 +1289,7 @@ static inline void bnx2x_init_txdata(struct bnx2x *bp, txdata->txq_index = txq_index; txdata->tx_cons_sb = tx_cons_sb; -DP (BNX2X_MSG_SP ,"created tx data cid %d, txq %d" , +DP (BNX2X_MSG_SP ,"created tx data cid %d, txq %d\n" , txdata->cid, txdata->txq_index); }
@@ -1333,7 +1333,7 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)bnx2x_init_txdata (bp, &bnx2x_fcoe (bp, txdata[0 ]), fp->cid,FCOE_TXQ_IDX (bp),BNX2X_FCOE_L2_TX_INDEX ); -DP (BNX2X_MSG_SP ,"created fcoe tx data (fp index %d)" , fp->index); +DP (BNX2X_MSG_SP ,"created fcoe tx data (fp index %d)\n" , fp->index);/* qZone id equals to FW (per path) client id */ bnx2x_fcoe (bp, cl_qzone_id) =bnx2x_fp_qzone_id (fp);
drivers/net/bnx2x/bnx2x_dcb.c +1 -1
@@ -350,7 +350,7 @@ static void bnx2x_dcbx_map_nw(struct bnx2x *bp)if (cos_params[i].pri_bitmask & nw_prio) {/* extend the bitmask with unmapped */ DP (NETIF_MSG_LINK , -"cos %d extended with 0x%08x" , i, unmapped); +"cos %d extended with 0x%08x\n" , i, unmapped); cos_params[i].pri_bitmask |= unmapped;break ; }
drivers/net/bnx2x/bnx2x_link.c +81 -74
362 lines not on this page · raw message
drivers/net/bnx2x/bnx2x_main.c +16 -17
@@ -4388,7 +4388,7 @@ static inline void bnx2x_handle_rx_mode_eqe(struct bnx2x *bp)static inline struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj (struct bnx2x *bp,u32 cid) { -DP (BNX2X_MSG_SP ,"retrieving fp from cid %d" , cid); +DP (BNX2X_MSG_SP ,"retrieving fp from cid %d\n" , cid);#ifdef BCM_CNIC if (cid ==BNX2X_FCOE_ETH_CID )return &bnx2x_fcoe (bp, q_obj);
@@ -7176,7 +7176,7 @@ static inline void bnx2x_pf_q_prep_init(struct bnx2x *bp,/* set maximum number of COSs supported by this queue */ init_params->max_cos = fp->max_cos; -DP (BNX2X_MSG_SP ,"fp: %d setting queue params max cos to: %d" , +DP (BNX2X_MSG_SP ,"fp: %d setting queue params max cos to: %d\n" , fp->index, init_params->max_cos);/* set the context pointers queue object */
@@ -7209,7 +7209,7 @@ int bnx2x_setup_tx_only(struct bnx2x *bp, struct bnx2x_fastpath *fp,DP (BNX2X_MSG_SP ,"preparing to send tx-only ramrod for connection:" "cos %d, primary cid %d, cid %d, " -"client id %d, sp-client id %d, flags %lx" , +"client id %d, sp-client id %d, flags %lx\n" , tx_index, q_params->q_obj->cids[FIRST_TX_COS_INDEX ], q_params->q_obj->cids[tx_index], q_params->q_obj->cl_id, tx_only_params->gen_params.spcl_id, tx_only_params->flags);
@@ -7241,7 +7241,7 @@ int bnx2x_setup_queue(struct bnx2x *bp, struct bnx2x_fastpath *fp,int rc;u8 tx_index; -DP (BNX2X_MSG_SP ,"setting up queue %d" , fp->index); +DP (BNX2X_MSG_SP ,"setting up queue %d\n" , fp->index);/* reset IGU state skip FCoE L2 queue */ if (!IS_FCOE_FP (fp))
@@ -7265,7 +7265,7 @@ int bnx2x_setup_queue(struct bnx2x *bp, struct bnx2x_fastpath *fp,return rc; } -DP (BNX2X_MSG_SP ,"init complete" ); +DP (BNX2X_MSG_SP ,"init complete\n" );/* Now move the Queue to the SETUP state... */
@@ -7319,7 +7319,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)struct bnx2x_queue_state_params q_params = {0 };int rc, tx_index; -DP (BNX2X_MSG_SP ,"stopping queue %d cid %d" , index, fp->cid); +DP (BNX2X_MSG_SP ,"stopping queue %d cid %d\n" , index, fp->cid); q_params.q_obj = &fp->q_obj;/* We want to wait for completion in this context */
@@ -7334,7 +7334,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)/* ascertain this is a normal queue*/ txdata = &fp->txdata[tx_index]; -DP (BNX2X_MSG_SP ,"stopping tx-only queue %d" , +DP (BNX2X_MSG_SP ,"stopping tx-only queue %d\n" , txdata->txq_index);/* send halt terminate on tx-only connection */
@@ -10704,7 +10704,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,return rc; } -DP (NETIF_MSG_DRV ,"max_non_def_sbs %d" , max_non_def_sbs); +DP (NETIF_MSG_DRV ,"max_non_def_sbs %d\n" , max_non_def_sbs); rc =bnx2x_init_bp (bp);if (rc)
@@ -10759,15 +10759,14 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,bnx2x_get_pcie_width_speed (bp, &pcie_width, &pcie_speed); -netdev_info (dev,"%s (%c%d) PCI-E x%d %s found at mem %lx," -" IRQ %d, " , board_info[ent->driver_data].name, - (CHIP_REV (bp) >>12 ) +'A' , (CHIP_METAL (bp) >>4 ), - pcie_width, - ((!CHIP_IS_E2 (bp) && pcie_speed ==2 ) || - (CHIP_IS_E2 (bp) && pcie_speed ==1 )) ? -"5GHz (Gen2)" :"2.5GHz" , - dev->base_addr, bp->pdev->irq); -pr_cont ("node addr %pM\n" , dev->dev_addr); +netdev_info (dev,"%s (%c%d) PCI-E x%d %s found at mem %lx, IRQ %d, node addr %pM\n" , + board_info[ent->driver_data].name, + (CHIP_REV (bp) >>12 ) +'A' , (CHIP_METAL (bp) >>4 ), + pcie_width, + ((!CHIP_IS_E2 (bp) && pcie_speed ==2 ) || + (CHIP_IS_E2 (bp) && pcie_speed ==1 )) ? +"5GHz (Gen2)" :"2.5GHz" , + dev->base_addr, bp->pdev->irq, dev->dev_addr);return 0 ;
drivers/net/bnx2x/bnx2x_sp.c +12 -11
@@ -3045,8 +3045,8 @@ static int bnx2x_mcast_setup_e1h(struct bnx2x *bp,break ;case BNX2X_MCAST_CMD_DEL : -DP (BNX2X_MSG_SP ,"Invalidating multicast " -"MACs configuration\n" ); +DP (BNX2X_MSG_SP , +"Invalidating multicast MACs configuration\n" );/* clear the registry */ memset(o->registry.aprox_match.vec, 0,
@@ -4239,7 +4239,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp, o->cids[BNX2X_PRIMARY_CID_INDEX], o->next_state);if (o->next_tx_only)/* print num tx-only if any exist */ -DP (BNX2X_MSG_SP ,"primary cid %d: num tx-only cons %d" , +DP (BNX2X_MSG_SP ,"primary cid %d: num tx-only cons %d\n" , o->cids[BNX2X_PRIMARY_CID_INDEX ], o->next_tx_only); o->state = o->next_state;
@@ -4301,7 +4301,7 @@ static void bnx2x_q_fill_init_general_data(struct bnx2x *bp,test_bit (BNX2X_Q_FLG_FCOE , flags) ?LLFC_TRAFFIC_TYPE_FCOE :LLFC_TRAFFIC_TYPE_NW ; -DP (BNX2X_MSG_SP ,"flags: active %d, cos %d, stats en %d" , +DP (BNX2X_MSG_SP ,"flags: active %d, cos %d, stats en %d\n" , gen_data->activate_flg, gen_data->cos, gen_data->statistics_en_flg); }
@@ -4454,7 +4454,7 @@ static void bnx2x_q_fill_setup_tx_only(struct bnx2x *bp, &data->tx, &cmd_params->params.tx_only.flags); -DP (BNX2X_MSG_SP ,"cid %d, tx bd page lo %x hi %x" ,cmd_params->q_obj->cids[0 ], +DP (BNX2X_MSG_SP ,"cid %d, tx bd page lo %x hi %x\n" ,cmd_params->q_obj->cids[0 ], data->tx.tx_bd_page_base.lo, data->tx.tx_bd_page_base.hi); }
@@ -4501,9 +4501,9 @@ static inline int bnx2x_q_init(struct bnx2x *bp,/* Set CDU context validation values */ for (cos =0 ; cos < o->max_cos; cos++) { -DP (BNX2X_MSG_SP ,"setting context validation. cid %d, cos %d" , +DP (BNX2X_MSG_SP ,"setting context validation. cid %d, cos %d\n" , o->cids[cos], cos); -DP (BNX2X_MSG_SP ,"context pointer %p" , init->cxts[cos]); +DP (BNX2X_MSG_SP ,"context pointer %p\n" , init->cxts[cos]);bnx2x_set_ctx_validation (bp, init->cxts[cos], o->cids[cos]); }
@@ -4592,7 +4592,7 @@ static inline int bnx2x_q_send_setup_tx_only(struct bnx2x *bp,return -EINVAL ; } -DP (BNX2X_MSG_SP ,"parameters received: cos: %d sp-id: %d" , +DP (BNX2X_MSG_SP ,"parameters received: cos: %d sp-id: %d\n" , tx_only_params->gen_params.cos, tx_only_params->gen_params.spcl_id);
@@ -4603,7 +4603,7 @@ static inline int bnx2x_q_send_setup_tx_only(struct bnx2x *bp,bnx2x_q_fill_setup_tx_only (bp, params, rdata);DP (BNX2X_MSG_SP ,"sending tx-only ramrod: cid %d, client-id %d," -"sp-client id %d, cos %d" , +"sp-client id %d, cos %d\n" , o->cids[cid_index], rdata->general.client_id, rdata->general.sp_client_id, rdata->general.cos);
@@ -5160,8 +5160,9 @@ static inline int bnx2x_func_state_change_comp(struct bnx2x *bp,return -EINVAL ; } -DP (BNX2X_MSG_SP ,"Completing command %d for func %d, setting state to " -"%d\n" , cmd,BP_FUNC (bp), o->next_state); +DP (BNX2X_MSG_SP , +"Completing command %d for func %d, setting state to %d\n" , + cmd,BP_FUNC (bp), o->next_state); o->state = o->next_state; o->next_state =BNX2X_F_STATE_MAX ;
Signature · 1 line
1.7.6.405.gc1be0
Re: [PATCH net-next 2/2] bnx2x: Coalesce pr_cont uses and fix DP typos
Quoted 11 lines · Joe Perches
Uses of
pr_contshould be avoided where reasonably possible because they can be interleaved by other threads and processes.Coalesce
pr_contuses.Fix typos, duplicated words and spacing in DP uses caused by split multi-line formats. Coalesce some of these split formats. Add missing terminating newlines to DP uses.
Signed-off-by Joe Perches <[email protected]>---
....
drivers/net/bnx2x/bnx2x_link.c void bnx2x_period_func(struct link_params *params, struct link_vars *vars) · line 12267
Quoted 9 lines
drivers/net/bnx2x/bnx2x_link.c +1
-1@@ -12254,7 +12261,7 @@ void bnx2x_period_func(struct link_params *params, struct link_vars *vars) {struct bnx2x *bp = params->bp;if (!params) { -DP (NETIF_MSG_LINK ,"Ininitliazed params !\n" ); +DP (NETIF_MSG_LINK ,"Uninitialized params !\n" );return ; }/* DP(NETIF_MSG_LINK, "Periodic called vars->phy_flags 0x%x speed 0x%x
This does not apply on the current net-next. Other than that - it looks good.
Please re-submit this patch series once net-next is opened for driver changes (see: http://marc.info/?l=linux-netdev&m=131278578427946&w=2 ) and I will ACK it.
Thanks,
Eilon