From patchwork Tue Jan 6 20:52:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 16852 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.176.167]) by ozlabs.org (Postfix) with ESMTP id BA12D4750D for ; Wed, 7 Jan 2009 07:55:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752002AbZAFUzI (ORCPT ); Tue, 6 Jan 2009 15:55:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751403AbZAFUzH (ORCPT ); Tue, 6 Jan 2009 15:55:07 -0500 Received: from gate.crashing.org ([63.228.1.57]:46067 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751390AbZAFUzG (ORCPT ); Tue, 6 Jan 2009 15:55:06 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id n06KqpGs011155; Tue, 6 Jan 2009 14:52:52 -0600 From: Kumar Gala To: netdev@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, afleming@freescale.com, davem@davemloft.net, Leo Li Subject: [PATCH] gianfar: ensure ECNTRL[R100] is cleared on link state change Date: Tue, 6 Jan 2009 14:52:51 -0600 Message-Id: <1231275171-21388-1-git-send-email-galak@kernel.crashing.org> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leo Li When changing the link between 100Mbps and 1Gbps in SGMII mode it was found out that the link would stop working. The issue is that ECNTRL[R100] needs to be cleared when in 1Gbps mode. Older reference manuals didn't require the explicitly clearing but has since been found it that it is needed. Signed-off-by: Li Yang Signed-off-by: Kumar Gala Acked-by: Andy Fleming --- Dave, Please apply for 2.6.29 as it addresses a "HW" bug in real systems. thanks - k drivers/net/gianfar.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index c672ecf..7fcc3af 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1973,6 +1973,8 @@ static void adjust_link(struct net_device *dev) case 1000: tempval = ((tempval & ~(MACCFG2_IF)) | MACCFG2_GMII); + + ecntrl &= ~(ECNTRL_R100); break; case 100: case 10: