From f0fe5b6d19db78ac6cacb1343f74c861c40119b6 Mon Sep 17 00:00:00 2001
From: Aastha Mehta <aasthakm@mpi-sws.org>
Date: Fri, 8 Sep 2017 21:42:17 +0200
Subject: [PATCH] add some debug prints; cleanup
---
.../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 50 +++++++++++++++----
1 file changed, 40 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 34af24d5f..ad9ffcdee 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -991,20 +991,39 @@ static int __bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
if (!CQE_TYPE_FAST(cqe_fp_type)) {
struct bnx2x_agg_info *tpa_info;
u16 frag_size, pages;
-#ifdef BNX2X_STOP_ON_ERROR
+//#ifdef BNX2X_STOP_ON_ERROR
/* sanity check */
if (fp->mode == TPA_MODE_DISABLED &&
(CQE_TYPE_START(cqe_fp_type) ||
CQE_TYPE_STOP(cqe_fp_type)))
BNX2X_ERR("START/STOP packet while TPA disabled, type %x\n",
CQE_TYPE(cqe_fp_type));
-#endif
+//#endif
if (CQE_TYPE_START(cqe_fp_type)) {
u16 queue = cqe_fp->queue_index;
+#ifdef CONFIG_XEN_SME
+ DP(NETIF_MSG_RX_ERR, "tpa_start fpsb [%u %u %u] mode %d queue %d hc idx %d"
+ " cqe flags %x [%d %d %d %d]\n"
+ "bd_prod %u (%u) %u (%u) %u bd_cons %u (%u) %u (%u) %u"
+ " comp_prod %u (%u) %u (%u) %u comp_cons %u (%u) %u (%u) %u"
+ , fp->index, fp->fw_sb_id, fp->igu_sb_id, fp->mode, queue, fp->fp_hc_idx
+ , cqe_fp_flags
+ , (int) (CQE_TYPE_SLOW(cqe_fp_type)), (int) (CQE_TYPE_FAST(cqe_fp_type))
+ , (int) (CQE_TYPE_START(cqe_fp_type)), (int) (CQE_TYPE_STOP(cqe_fp_type))
+ , fp->hwi_bd_prod, (int) RX_BD(fp->hwi_bd_prod)
+ , fp->swi_bd_prod, (int) RX_BD(fp->swi_bd_prod), fp->rx_bd_prod
+ , fp->hwi_bd_cons, (int) RX_BD(fp->hwi_bd_cons)
+ , fp->swi_bd_cons, (int) RX_BD(fp->swi_bd_cons), fp->rx_bd_cons
+ , fp->hwi_comp_prod, (int) RCQ_BD(fp->hwi_comp_prod)
+ , fp->swi_comp_prod, (int) RCQ_BD(fp->swi_comp_prod), fp->rx_comp_prod
+ , fp->hwi_comp_cons, (int) RCQ_BD(fp->hwi_comp_cons)
+ , fp->swi_comp_cons, (int) RCQ_BD(fp->swi_comp_cons), fp->rx_comp_cons);
+#else
DP(NETIF_MSG_RX_STATUS,
"calling tpa_start on queue %d\n",
queue);
+#endif
bnx2x_tpa_start(fp, queue,
bd_cons, bd_prod,
@@ -1014,9 +1033,28 @@ static int __bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
}
queue = cqe->end_agg_cqe.queue_index;
tpa_info = &fp->tpa_info[queue];
+#ifdef CONFIG_XEN_SME
+ DP(NETIF_MSG_RX_ERR, "tpa_stop fpsb [%u %u %u] mode %d queue %d hc idx %d"
+ " cqe flags %x [%d %d %d %d]\n"
+ "bd_prod %u (%u) %u (%u) %u bd_cons %u (%u) %u (%u) %u"
+ " comp_prod %u (%u) %u (%u) %u comp_cons %u (%u) %u (%u) %u"
+ , fp->index, fp->fw_sb_id, fp->igu_sb_id, fp->mode, queue, fp->fp_hc_idx
+ , cqe_fp_flags
+ , (int) (CQE_TYPE_SLOW(cqe_fp_type)), (int) (CQE_TYPE_FAST(cqe_fp_type))
+ , (int) (CQE_TYPE_START(cqe_fp_type)), (int) (CQE_TYPE_STOP(cqe_fp_type))
+ , fp->hwi_bd_prod, (int) RX_BD(fp->hwi_bd_prod)
+ , fp->swi_bd_prod, (int) RX_BD(fp->swi_bd_prod), fp->rx_bd_prod
+ , fp->hwi_bd_cons, (int) RX_BD(fp->hwi_bd_cons)
+ , fp->swi_bd_cons, (int) RX_BD(fp->swi_bd_cons), fp->rx_bd_cons
+ , fp->hwi_comp_prod, (int) RCQ_BD(fp->hwi_comp_prod)
+ , fp->swi_comp_prod, (int) RCQ_BD(fp->swi_comp_prod), fp->rx_comp_prod
+ , fp->hwi_comp_cons, (int) RCQ_BD(fp->hwi_comp_cons)
+ , fp->swi_comp_cons, (int) RCQ_BD(fp->swi_comp_cons), fp->rx_comp_cons);
+#else
DP(NETIF_MSG_RX_STATUS,
"calling tpa_stop on queue %d\n",
queue);
+#endif
frag_size = le16_to_cpu(cqe->end_agg_cqe.pkt_len) -
tpa_info->len_on_bd;
@@ -1205,10 +1243,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
#ifdef CONFIG_XEN_SME
if (lnk_intercept_rx_path) {
- //tmp_swi_bd_prod = NEXT_RX_IDX(fp->swi_bd_prod);
- //tmp_swi_bd_cons = NEXT_RX_IDX(fp->swi_bd_cons);
- //tmp_swi_comp_prod = NEXT_RCQ_IDX(fp->swi_comp_prod);
- //tmp_swi_comp_cons = NEXT_RCQ_IDX(fp->swi_comp_cons);
tmp_swi_bd_prod = fp->swi_bd_prod;
tmp_swi_bd_cons = fp->swi_bd_cons;
tmp_swi_comp_prod = fp->swi_comp_prod;
@@ -1240,10 +1274,6 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
if (rx_pkt == budget)
break;
- //tmp_swi_bd_prod = NEXT_RX_IDX(fp->swi_bd_prod);
- //tmp_swi_bd_cons = NEXT_RX_IDX(fp->swi_bd_cons);
- //tmp_swi_comp_prod = NEXT_RCQ_IDX(fp->swi_comp_prod);
- //tmp_swi_comp_cons = NEXT_RCQ_IDX(fp->swi_comp_cons);
tmp_swi_bd_prod = fp->swi_bd_prod;
tmp_swi_bd_cons = fp->swi_bd_cons;
tmp_swi_comp_prod = fp->swi_comp_prod;
--
GitLab