[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1372432075-11629-1-git-send-email-jim_baxter@mentor.com>
Date: Fri, 28 Jun 2013 16:07:55 +0100
From: Jim Baxter <jim_baxter@...tor.com>
To: "David S. Miller" <davem@...emloft.net>
Cc: Fabio Estevam <fabio.estevam@...escale.com>,
Frank Li <Frank.Li@...escale.com>,
Fugang Duan <B38611@...escale.com>,
Joe Perches <joe@...ches.com>, Chris Healy <cphealy@...il.com>,
netdev@...r.kernel.org
Subject: [PATCH RFC net-next v1 1/1] net: fec: Fix RMON registers on imx6
commit 38ae92d "fec: Add support for reading
RMON registers" causes the imx6Q to crash.
This fixes it and clears it using the MIB Control
Register's MIB_CLEAR bit.
Signed-off-by: Jim Baxter <jim_baxter@...tor.com>
---
drivers/net/ethernet/freescale/fec_main.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index ed6180e..a1f0413 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -607,8 +607,12 @@ fec_restart(struct net_device *ndev, int duplex)
#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);
+ if (strcmp(id_entry->name, "imx6q-fec") == 0) {
+ writel(1 << 29, fep->hwp + FEC_MIB_CTRLSTAT);
+ } else {
+ for (i = RMON_T_DROP; i < IEEE_R_OCTETS_OK; i++)
+ writel(0, fep->hwp + i);
+ }
writel(0, fep->hwp + FEC_MIB_CTRLSTAT);
#endif
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists