Revert "ramips: improve NAPI polling to increase GRO batch size" (fixes FS#1333)

This reverts commit 968b8616127a52fe5baff20a1f29ff49ade26bc2.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

1 files changed, 16 insertions, 13 deletions

diff --git a/target/linux/ramips/files-4.9/drivers/net/ethernet/mtk/mtk_eth_soc.c b/target/linux/ramips/files-4.9/drivers/net/ethernet/mtk/mtk_eth_soc.c
index 79ec17e3ff..d53f6c024e 100644
--- a/target/linux/ramips/files-4.9/drivers/net/ethernet/mtk/mtk_eth_soc.c
+++ b/target/linux/ramips/files-4.9/drivers/net/ethernet/mtk/mtk_eth_soc.c
@@ -882,17 +882,17 @@ release_desc:
 			rxd->rxd2 = RX_DMA_LSO;
 
 		ring->rx_calc_idx = idx;
-		done++;
-	}
-
-	if (done) {
 		/* make sure that all changes to the dma ring are flushed before
 		 * we continue
 		 */
 		wmb();
 		fe_reg_w32(ring->rx_calc_idx, FE_REG_RX_CALC_IDX0);
+		done++;
 	}
 
+	if (done < budget)
+		fe_reg_w32(rx_intr, FE_REG_FE_INT_STATUS);
+
 	return done;
 }
 
@@ -928,12 +928,16 @@ static int fe_poll_tx(struct fe_priv *priv, int budget, u32 tx_intr,
 	}
 	ring->tx_free_idx = idx;
 
-	if (idx == hwidx)
+	if (idx == hwidx) {
 		/* read hw index again make sure no new tx packet */
 		hwidx = fe_reg_r32(FE_REG_TX_DTX_IDX0);
-
-	if (idx != hwidx)
+		if (idx == hwidx)
+			fe_reg_w32(tx_intr, FE_REG_FE_INT_STATUS);
+		else
+			*tx_again = 1;
+	} else {
 		*tx_again = 1;
+	}
 
 	if (done) {
 		netdev_completed_queue(netdev, done, bytes_compl);
@@ -954,6 +958,8 @@ static int fe_poll(struct napi_struct *napi, int budget)
 	u32 status, fe_status, status_reg, mask;
 	u32 tx_intr, rx_intr, status_intr;
 
+	status = fe_reg_r32(FE_REG_FE_INT_STATUS);
+	fe_status = status;
 	tx_intr = priv->soc->tx_int;
 	rx_intr = priv->soc->rx_int;
 	status_intr = priv->soc->status_int;
@@ -961,7 +967,6 @@ static int fe_poll(struct napi_struct *napi, int budget)
 	rx_done = 0;
 	tx_again = 0;
 
-	fe_status = status = fe_reg_r32(FE_REG_FE_INT_STATUS);
 	if (fe_reg_table[FE_REG_FE_INT_STATUS2]) {
 		fe_status = fe_reg_r32(FE_REG_FE_INT_STATUS2);
 		status_reg = FE_REG_FE_INT_STATUS2;
@@ -969,14 +974,11 @@ static int fe_poll(struct napi_struct *napi, int budget)
 		status_reg = FE_REG_FE_INT_STATUS;
 	}
 
-poll_again:
-	fe_reg_w32(status & (rx_intr | tx_intr), FE_REG_FE_INT_STATUS);
-
 	if (status & tx_intr)
-		tx_done += fe_poll_tx(priv, budget, tx_intr, &tx_again);
+		tx_done = fe_poll_tx(priv, budget, tx_intr, &tx_again);
 
 	if (status & rx_intr)
-		rx_done += fe_poll_rx(napi, budget - rx_done, priv, rx_intr);
+		rx_done = fe_poll_rx(napi, budget, priv, rx_intr);
 
 	if (unlikely(fe_status & status_intr)) {
 		if (hwstat && spin_trylock(&hwstat->stats_lock)) {
@@ -1007,6 +1009,7 @@ poll_again:
 		rx_done = budget;
 	}
 
+poll_again:
 	return rx_done;
 }