From patchwork Fri Jun 28 15:07:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Baxter X-Patchwork-Id: 255417 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 667382C00A1 for ; Sat, 29 Jun 2013 01:08:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755186Ab3F1PIF (ORCPT ); Fri, 28 Jun 2013 11:08:05 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:39911 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751519Ab3F1PID (ORCPT ); Fri, 28 Jun 2013 11:08:03 -0400 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UsaHK-0004py-P1 from Jim_Baxter@mentor.com ; Fri, 28 Jun 2013 08:08:02 -0700 Received: from gba-jbaxter2-ub.mgc.mentorg.com ([172.30.64.229]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 28 Jun 2013 08:08:02 -0700 From: Jim Baxter To: "David S. Miller" Cc: Fabio Estevam , Frank Li , Fugang Duan , Joe Perches , Chris Healy , netdev@vger.kernel.org Subject: [PATCH RFC net-next v1 1/1] net: fec: Fix RMON registers on imx6 Date: Fri, 28 Jun 2013 16:07:55 +0100 Message-Id: <1372432075-11629-1-git-send-email-jim_baxter@mentor.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-OriginalArrivalTime: 28 Jun 2013 15:08:02.0801 (UTC) FILETIME=[48FB2E10:01CE7411] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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