]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: fec: Fix RMON registers on imx6
authorJim Baxter <jim_baxter@mentor.com>
Mon, 1 Jul 2013 13:57:54 +0000 (14:57 +0100)
committerJason Liu <r64343@freescale.com>
Wed, 30 Oct 2013 01:54:21 +0000 (09:54 +0800)
commit 38ae92d "fec: Add support for reading
RMON registers" causes the imx6Q to crash.

This fixes it by only enabling the RMON registers, the
registers are already cleared by the MAC being reset.

Signed-off-by: Jim Baxter <jim_baxter@mentor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec_main.c

index 46f5364774e822c27e9fb438af1dbe72227ed9b8..58e9089d86757d593e3041ebf93646708a06f6bf 100644 (file)
@@ -610,11 +610,8 @@ fec_restart(struct net_device *ndev, int duplex)
                ecntl |= (1 << 4);
 
 #ifndef CONFIG_M5272
-       /* Disable, clear, and enable the MIB */
-       writel(1 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
-       for (i = RMON_T_DROP; i < IEEE_R_OCTETS_OK; i++)
-               writel(0, fep->hwp + i);
-       writel(0, fep->hwp + FEC_MIB_CTRLSTAT);
+       /* Enable the MIB statistic event counters */
+       writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
 #endif
 
        /* And last, enable the transmit and receive processing */