Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9eef55c authored by Jim Baxter's avatar Jim Baxter Committed by David S. Miller
Browse files

net: fec: Fix RMON registers on imx6 



commit 38ae92dc "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: default avatarJim Baxter <jim_baxter@mentor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cc47d13

drivers/net/ethernet/freescale/fec_main.c

+2 −5
Original line number Diff line number Diff line
@@ -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 */