Skip to content

Commit

Permalink
net: fec: Fix RMON registers on imx6
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jim Baxter authored and davem330 committed Jul 2, 2013
1 parent 7cc47d1 commit b9eef55
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/ethernet/freescale/fec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,11 +606,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 */
Expand Down

0 comments on commit b9eef55

Please sign in to comment.