From bc123587aab31201fee090653b9e30237f62a86f Mon Sep 17 00:00:00 2001 From: Fugang Duan Date: Wed, 9 Jul 2014 17:03:35 +0800 Subject: ENGR00322050 net: fec: remove the nonstandard performance optimaztion The previous patch is to increase imx6sx enet performance, and then replace wmb() with dmb(), whitch can get more 80Mbps improvement, and don't find any impact. Now enet support TSO feature, remove the nonstandard performance optimaztion. Signed-off-by: Fugang Duan --- drivers/net/ethernet/freescale/fec_main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index d26d8ae98148..7b9542846e36 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -564,10 +564,8 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || - !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) { - dmb(); - __raw_writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue)); - } + !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) + writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue)); return 0; } @@ -763,16 +761,13 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq, skb_tx_timestamp(skb); txq->cur_tx = bdp; - /* Trigger transmission start */ /* Trigger transmission start */ if (!(id_entry->driver_data & FEC_QUIRK_TKT210582) || !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue)) || - !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) { - dmb(); - __raw_writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue)); - } + !__raw_readl(fep->hwp + FEC_X_DES_ACTIVE(queue))) + writel(0, fep->hwp + FEC_X_DES_ACTIVE(queue)); return 0; -- cgit v1.2.3