diff options
| author | Fugang Duan <b38611@freescale.com> | 2014-07-09 17:03:35 +0800 |
|---|---|---|
| committer | Fugang Duan <b38611@freescale.com> | 2014-07-10 15:45:42 +0800 |
| commit | bc123587aab31201fee090653b9e30237f62a86f (patch) | |
| tree | f8931a812a0cc16928df8d6e109edeb4e7070290 | |
| parent | a00ea708bece559aec4daaba721597366f1b9efd (diff) | |
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 <B38611@freescale.com>
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 13 |
1 files 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; } @@ -764,15 +762,12 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq, 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; |