From patchwork Wed Jun 24 17:45:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 29139 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id EF347B70AA for ; Thu, 25 Jun 2009 03:47:25 +1000 (EST) Received: by ozlabs.org (Postfix) id DA18ADDD1B; Thu, 25 Jun 2009 03:47:25 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6535FDDD0B for ; Thu, 25 Jun 2009 03:47:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761162AbZFXRrQ (ORCPT ); Wed, 24 Jun 2009 13:47:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760860AbZFXRrE (ORCPT ); Wed, 24 Jun 2009 13:47:04 -0400 Received: from ru.mvista.com ([213.79.90.228]:5833 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1761219AbZFXRrA (ORCPT ); Wed, 24 Jun 2009 13:47:00 -0400 Received: from localhost (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id 79B228815; Wed, 24 Jun 2009 22:47:02 +0500 (SAMST) Date: Wed, 24 Jun 2009 21:45:57 +0400 From: Anton Vorontsov To: David Miller Cc: Kumar Gala , Li Yang , linuxppc-dev@ozlabs.org, netdev@vger.kernel.org Subject: [PATCH] ucc_geth: Fix half-duplex operation for non-MII/RMII interfaces Message-ID: <20090624174557.GA31479@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently the half-duplex operation seems to not work reliably for RGMII/GMII PHY interfaces. It takes about 10 minutes to boot NFS rootfs using 10/half link, following symptoms were observed: ucc_geth: QE UCC Gigabit Ethernet Controller ucc_geth: UCC1 at 0xe0082000 (irq = 32) [...] Sending DHCP and RARP requests . PHY: mdio@e0082120:07 - Link is Up - 10/Half ., OK [...] Looking up port of RPC 100003/2 on 10.0.0.2 Looking up port of RPC 100005/1 on 10.0.0.2 VFS: Mounted root (nfs filesystem) readonly on device 0:13. Freeing unused kernel memory: 204k init eth0: no IPv6 routers present nfs: server 10.0.0.2 not responding, still trying nfs: server 10.0.0.2 not responding, still trying nfs: server 10.0.0.2 not responding, still trying nfs: server 10.0.0.2 OK nfs: server 10.0.0.2 OK nfs: server 10.0.0.2 not responding, still trying [... few minutes of OK/not responding flood ...] The statistic shows that there are indeed some errors: # ethtool -S eth0 | grep -v ": 0" NIC statistics: tx-64-frames: 42 tx-65-127-frames: 9 tx-128-255-frames: 4768 rx-64-frames: 41 rx-65-127-frames: 260 rx-128-255-frames: 2679 tx-bytes-ok: 859634 tx-multicast-frames: 5 tx-broadcast-frames: 7 rx-frames: 8333 rx-bytes-ok: 8039364 rx-bytes-all: 8039364 stats-counter-mask: 4294901760 tx-single-collision: 324 tx-multiple-collision: 47 tx-late-collsion: 604 tx-aborted-frames: 604 tx-frames-ok: 4967 tx-256-511-frames: 3 tx-512-1023-frames: 79 tx-1024-1518-frames: 71 rx-256-511-frames: 37 rx-512-1023-frames: 73 rx-1024-1518-frames: 5243 According to current QEIWRM (Rev. 2 5/2009), FDX bit can be 0 for RGMII(10/100) modes, while MPC8568ERM (Rev. C 02/2007) spec says that cleared FDX bit is permitted for MII/RMII modes only. The symptoms above were seen on MPC8569E-MDS boards, so QEIWRM is clearly wrong, and this patch completely cures the problems above. Signed-off-by: Anton Vorontsov --- drivers/net/ucc_geth.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 464df03..e618cf2 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c @@ -1469,12 +1469,16 @@ static void adjust_link(struct net_device *dev) if (phydev->link) { u32 tempval = in_be32(&ug_regs->maccfg2); u32 upsmr = in_be32(&uf_regs->upsmr); + phy_interface_t phyi = ugeth->phy_interface; + /* Now we make sure that we can be in full duplex mode. * If not, we operate in half-duplex mode. */ if (phydev->duplex != ugeth->oldduplex) { new_state = 1; - if (!(phydev->duplex)) - tempval &= ~(MACCFG2_FDX); + if (!phydev->duplex && + (phyi == PHY_INTERFACE_MODE_MII || + phyi == PHY_INTERFACE_MODE_RMII)) + tempval &= ~MACCFG2_FDX; else tempval |= MACCFG2_FDX; ugeth->oldduplex = phydev->duplex;