Commit a7c3ddf2 authored by Coiby Xu's avatar Coiby Xu Committed by Greg Kroah-Hartman
Browse files

staging: qlge: clean up debugging code in the QL_ALL_DUMP ifdef land 

The debugging code in the following ifdef land
 - QL_ALL_DUMP
 - QL_REG_DUMP
 - QL_DEV_DUMP
 - QL_CB_DUMP
 - QL_IB_DUMP
 - QL_OB_DUMP

becomes unnecessary because,
 - Device status and general registers can be obtained by ethtool.
 - Coredump can be done via devlink health reporter.
 - Structure related to the hardware (struct ql_adapter) can be obtained
   by crash or drgn.

Link: https://lkml.org/lkml/2020/6/30/19


Suggested-by: default avatarBenjamin Poirier <benjamin.poirier@gmail.com>
Signed-off-by: default avatarCoiby Xu <coiby.xu@gmail.com>
Link: https://lore.kernel.org/r/20210123104613.38359-8-coiby.xu@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 02988c36

drivers/staging/qlge/TODO

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
  queues" is confusing.

* struct rx_ring is used for rx and tx completions, with some members relevant

  to one case only

* there is an inordinate amount of disparate debugging code, most of which is

  of questionable value. In particular, qlge_dbg.c has hundreds of lines of

  code bitrotting away in ifdef land (doesn't compile since commit

  18c49b91777c ("qlge: do vlan cleanup", v3.1-rc1), 8 years ago).

* the flow control implementation in firmware is buggy (sends a flood of pause

  frames, resets the link, device and driver buffer queues become

  desynchronized), disable it by default

drivers/staging/qlge/qlge.h

+0 −82
Original line number Diff line number Diff line
@@ -2289,86 +2289,4 @@ void qlge_check_lb_frame(struct qlge_adapter *qdev, struct sk_buff *skb); 
int qlge_own_firmware(struct qlge_adapter *qdev);

int qlge_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);



/* #define QL_ALL_DUMP */

/* #define QL_REG_DUMP */

/* #define QL_DEV_DUMP */

/* #define QL_CB_DUMP */

/* #define QL_IB_DUMP */

/* #define QL_OB_DUMP */



#ifdef QL_REG_DUMP

void qlge_dump_xgmac_control_regs(struct qlge_adapter *qdev);

void qlge_dump_routing_entries(struct qlge_adapter *qdev);

void qlge_dump_regs(struct qlge_adapter *qdev);

#define QL_DUMP_REGS(qdev) qlge_dump_regs(qdev)

#define QL_DUMP_ROUTE(qdev) qlge_dump_routing_entries(qdev)

#define QL_DUMP_XGMAC_CONTROL_REGS(qdev) qlge_dump_xgmac_control_regs(qdev)

#else

#define QL_DUMP_REGS(qdev)

#define QL_DUMP_ROUTE(qdev)

#define QL_DUMP_XGMAC_CONTROL_REGS(qdev)

#endif



#ifdef QL_STAT_DUMP

void qlge_dump_stat(struct qlge_adapter *qdev);

#define QL_DUMP_STAT(qdev) qlge_dump_stat(qdev)

#else

#define QL_DUMP_STAT(qdev)

#endif



#ifdef QL_DEV_DUMP

void qlge_dump_qdev(struct qlge_adapter *qdev);

#define QL_DUMP_QDEV(qdev) qlge_dump_qdev(qdev)

#else

#define QL_DUMP_QDEV(qdev)

#endif



#ifdef QL_CB_DUMP

void qlge_dump_wqicb(struct wqicb *wqicb);

void qlge_dump_tx_ring(struct tx_ring *tx_ring);

void qlge_dump_ricb(struct ricb *ricb);

void qlge_dump_cqicb(struct cqicb *cqicb);

void qlge_dump_rx_ring(struct rx_ring *rx_ring);

void qlge_dump_hw_cb(struct qlge_adapter *qdev, int size, u32 bit, u16 q_id);

#define QL_DUMP_RICB(ricb) qlge_dump_ricb(ricb)

#define QL_DUMP_WQICB(wqicb) qlge_dump_wqicb(wqicb)

#define QL_DUMP_TX_RING(tx_ring) qlge_dump_tx_ring(tx_ring)

#define QL_DUMP_CQICB(cqicb) qlge_dump_cqicb(cqicb)

#define QL_DUMP_RX_RING(rx_ring) qlge_dump_rx_ring(rx_ring)

#define QL_DUMP_HW_CB(qdev, size, bit, q_id) \

		qlge_dump_hw_cb(qdev, size, bit, q_id)

#else

#define QL_DUMP_RICB(ricb)

#define QL_DUMP_WQICB(wqicb)

#define QL_DUMP_TX_RING(tx_ring)

#define QL_DUMP_CQICB(cqicb)

#define QL_DUMP_RX_RING(rx_ring)

#define QL_DUMP_HW_CB(qdev, size, bit, q_id)

#endif



#ifdef QL_OB_DUMP

void qlge_dump_tx_desc(struct qlge_adapter *qdev, struct tx_buf_desc *tbd);

void qlge_dump_ob_mac_iocb(struct qlge_adapter *qdev, struct qlge_ob_mac_iocb_req *ob_mac_iocb);

void qlge_dump_ob_mac_rsp(struct qlge_adapter *qdev, struct qlge_ob_mac_iocb_rsp *ob_mac_rsp);

#define QL_DUMP_OB_MAC_IOCB(qdev, ob_mac_iocb) qlge_dump_ob_mac_iocb(qdev, ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(qdev, ob_mac_rsp) qlge_dump_ob_mac_rsp(qdev, ob_mac_rsp)

#else

#define QL_DUMP_OB_MAC_IOCB(qdev, ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(qdev, ob_mac_rsp)

#endif



#ifdef QL_IB_DUMP

void qlge_dump_ib_mac_rsp(struct qlge_adapter *qdev, struct qlge_ib_mac_iocb_rsp *ib_mac_rsp);

#define QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp) qlge_dump_ib_mac_rsp(qdev, ib_mac_rsp)

#else

#define QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp)

#endif



#ifdef	QL_ALL_DUMP

void qlge_dump_all(struct qlge_adapter *qdev);

#define QL_DUMP_ALL(qdev) qlge_dump_all(qdev)

#else

#define QL_DUMP_ALL(qdev)

#endif



#endif /* _QLGE_H_ */

drivers/staging/qlge/qlge_dbg.c

+0 −688

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/qlge/qlge_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -328,8 +328,6 @@ static void qlge_update_stats(struct qlge_adapter *qdev) 
	qlge_sem_unlock(qdev, qdev->xg_sem_mask);

quit:

	spin_unlock(&qdev->stats_lock);



	QL_DUMP_STAT(qdev);

}



static void qlge_get_strings(struct net_device *dev, u32 stringset, u8 *buf)

drivers/staging/qlge/qlge_main.c

+1 −6
Original line number Diff line number Diff line
@@ -1855,8 +1855,6 @@ static void qlge_process_mac_split_rx_intr(struct qlge_adapter *qdev, 
	struct net_device *ndev = qdev->ndev;

	struct sk_buff *skb = NULL;



	QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp);



	skb = qlge_build_rx_skb(qdev, rx_ring, ib_mac_rsp);

	if (unlikely(!skb)) {

		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
@@ -1953,8 +1951,6 @@ static unsigned long qlge_process_mac_rx_intr(struct qlge_adapter *qdev, 
		((le16_to_cpu(ib_mac_rsp->vlan_id) &

		  IB_MAC_IOCB_RSP_VLAN_MASK)) : 0xffff;



	QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp);



	if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {

		/* The data and headers are split into

		 * separate buffers.
@@ -2000,7 +1996,6 @@ static void qlge_process_mac_tx_intr(struct qlge_adapter *qdev, 
	struct tx_ring *tx_ring;

	struct tx_ring_desc *tx_ring_desc;



	QL_DUMP_OB_MAC_RSP(qdev, mac_rsp);

	tx_ring = &qdev->tx_ring[mac_rsp->txq_idx];

	tx_ring_desc = &tx_ring->q[mac_rsp->tid];

	qlge_unmap_send(qdev, tx_ring_desc, tx_ring_desc->map_cnt);
@@ -2587,7 +2582,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev) 
		tx_ring->tx_errors++;

		return NETDEV_TX_BUSY;

	}

	QL_DUMP_OB_MAC_IOCB(qdev, mac_iocb_ptr);



	tx_ring->prod_idx++;

	if (tx_ring->prod_idx == tx_ring->wq_len)

		tx_ring->prod_idx = 0;