From patchwork Fri Nov 2 17:09:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitalii Demianets X-Patchwork-Id: 196682 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 598132C00C8 for ; Sat, 3 Nov 2012 04:40:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763234Ab2KBRkb (ORCPT ); Fri, 2 Nov 2012 13:40:31 -0400 Received: from mx3.cyfra.ua ([62.80.160.182]:48675 "EHLO mx3.cyfra.ua" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759255Ab2KBRk3 (ORCPT ); Fri, 2 Nov 2012 13:40:29 -0400 X-Greylist: delayed 1736 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Nov 2012 13:40:29 EDT Received: from c.11.173.a246.dynamic.cyfra.net ([62.80.173.11] helo=nppfactor.kiev.ua) by mx3.cyfra.ua with esmtp (Exim 4.63) (envelope-from ) id 1TUKnO-0001uC-Nt; Fri, 02 Nov 2012 19:12:38 +0200 Received: from [192.168.0.20] (LUX [192.168.0.20]) by nppfactor.kiev.ua (Postfix) with ESMTP id C27F847CA83; Fri, 2 Nov 2012 19:09:25 +0200 (EET) From: Vitalii Demianets Organization: Factor-SPE To: netdev@vger.kernel.org Subject: [PATCH net-next] macb: Keep driver's speed/duplex in sync with actual NCFGR Date: Fri, 2 Nov 2012 19:09:24 +0200 User-Agent: KMail/1.9.10 Cc: Nicolas Ferre , "Jean-Christophe PLAGNIOL-VILLARD" , Havard Skinnemoen , Jamie Iles , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211021909.25473.vitas@nppfactor.kiev.ua> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When underlying phy driver restores its state very fast after being brought down and up so that macb driver function macb_handle_link_change() was never called with link state "down", driver's internal representation of phy speed and duplex (bp->speed and bp->duplex) didn't change. So, macb driver sees no reason to perform actual write to the NCFGR register, although the speed and duplex settings in that register were reset when interface was brought down and up. In that case actual phy speed and duplex differ from NCFGR settings. The patch fixes that by keeping internal driver representation of speed and duplex in sync with actual content of NCFGR. Signed-off-by: Vitalii Demianets --- drivers/net/ethernet/cadence/macb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index c374875..13c3c33 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1031,6 +1031,8 @@ static void macb_init_hw(struct macb *bp) config |= MACB_BIT(NBC); /* No BroadCast */ config |= macb_dbw(bp); macb_writel(bp, NCFGR, config); + bp->speed = SPEED_10; + bp->duplex = DUPLEX_HALF; macb_configure_dma(bp);