From patchwork Tue Dec 27 09:48:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaobo Xie X-Patchwork-Id: 133308 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 091EFB7019 for ; Tue, 27 Dec 2011 21:37:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753485Ab1L0Khf (ORCPT ); Tue, 27 Dec 2011 05:37:35 -0500 Received: from tx2ehsobe002.messaging.microsoft.com ([65.55.88.12]:27688 "EHLO TX2EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753340Ab1L0Khd (ORCPT ); Tue, 27 Dec 2011 05:37:33 -0500 Received: from mail39-tx2-R.bigfish.com (10.9.14.254) by TX2EHSOBE003.bigfish.com (10.9.40.23) with Microsoft SMTP Server id 14.1.225.23; Tue, 27 Dec 2011 10:37:14 +0000 Received: from mail39-tx2 (localhost [127.0.0.1]) by mail39-tx2-R.bigfish.com (Postfix) with ESMTP id 16D2B6000B6; Tue, 27 Dec 2011 10:38:22 +0000 (UTC) X-SpamScore: 11 X-BigFish: VS11(zzzz1202hzz8275bhz2dh2a8h668h839h4a8s64h) X-Spam-TCS-SCL: 3:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail39-tx2 (localhost.localdomain [127.0.0.1]) by mail39-tx2 (MessageSwitch) id 1324982301834102_3514; Tue, 27 Dec 2011 10:38:21 +0000 (UTC) Received: from TX2EHSMHS004.bigfish.com (unknown [10.9.14.239]) by mail39-tx2.bigfish.com (Postfix) with ESMTP id C585F60046; Tue, 27 Dec 2011 10:38:21 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS004.bigfish.com (10.9.99.104) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 27 Dec 2011 10:37:13 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.355.3; Tue, 27 Dec 2011 04:37:31 -0600 Received: from rock.ap.freescale.net (rock.ap.freescale.net [10.193.20.106]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pBRAbSmt027433; Tue, 27 Dec 2011 04:37:28 -0600 (CST) From: Xie Xiaobo To: , , CC: Xie Xiaobo , Haiying Wang Subject: [PATCH] net/ucc_geth: some fix in current kernel Date: Tue, 27 Dec 2011 17:48:48 +0800 Message-ID: <1324979328-32081-1-git-send-email-X.Xie@freescale.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: References: MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org * Revert commit "ucc_geth: Fix hangs after switching from full to half duplex" This commit impacted the driver in all link state change more than duplex change. * Change some parameters. Increased the BD ring length. Signed-off-by: Haiying Wang Signed-off-by: Xie Xiaobo --- drivers/net/ethernet/freescale/ucc_geth.c | 41 ++++------------------------ drivers/net/ethernet/freescale/ucc_geth.h | 6 ++-- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c index b5dc027..3e18902 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Freescale Semicondutor, Inc. All rights reserved. + * Copyright (C) 2006-2010 Freescale Semiconductor, Inc. All rights reserved. * * Author: Shlomi Gridish * Li Yang @@ -1570,28 +1570,6 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode) return 0; } -static void ugeth_quiesce(struct ucc_geth_private *ugeth) -{ - /* Prevent any further xmits, plus detach the device. */ - netif_device_detach(ugeth->ndev); - - /* Wait for any current xmits to finish. */ - netif_tx_disable(ugeth->ndev); - - /* Disable the interrupt to avoid NAPI rescheduling. */ - disable_irq(ugeth->ug_info->uf_info.irq); - - /* Stop NAPI, and possibly wait for its completion. */ - napi_disable(&ugeth->napi); -} - -static void ugeth_activate(struct ucc_geth_private *ugeth) -{ - napi_enable(&ugeth->napi); - enable_irq(ugeth->ug_info->uf_info.irq); - netif_device_attach(ugeth->ndev); -} - /* Called every time the controller might need to be made * aware of new link state. The PHY code conveys this * information through variables in the ugeth structure, and this @@ -1605,11 +1583,14 @@ static void adjust_link(struct net_device *dev) struct ucc_geth __iomem *ug_regs; struct ucc_fast __iomem *uf_regs; struct phy_device *phydev = ugeth->phydev; + unsigned long flags; int new_state = 0; ug_regs = ugeth->ug_regs; uf_regs = ugeth->uccf->uf_regs; + spin_lock_irqsave(&ugeth->lock, flags); + if (phydev->link) { u32 tempval = in_be32(&ug_regs->maccfg2); u32 upsmr = in_be32(&uf_regs->upsmr); @@ -1666,21 +1647,9 @@ static void adjust_link(struct net_device *dev) } if (new_state) { - /* - * To change the MAC configuration we need to disable - * the controller. To do so, we have to either grab - * ugeth->lock, which is a bad idea since 'graceful - * stop' commands might take quite a while, or we can - * quiesce driver's activity. - */ - ugeth_quiesce(ugeth); - ugeth_disable(ugeth, COMM_DIR_RX_AND_TX); - out_be32(&ug_regs->maccfg2, tempval); out_be32(&uf_regs->upsmr, upsmr); - ugeth_enable(ugeth, COMM_DIR_RX_AND_TX); - ugeth_activate(ugeth); } } else if (ugeth->oldlink) { new_state = 1; @@ -1691,6 +1660,8 @@ static void adjust_link(struct net_device *dev) if (new_state && netif_msg_link(ugeth)) phy_print_status(phydev); + + spin_unlock_irqrestore(&ugeth->lock, flags); } /* Initialize TBI PHY interface for communicating with the diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h index d12fcad..b0b42b4 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.h +++ b/drivers/net/ethernet/freescale/ucc_geth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Freescale Semicondutor, Inc. 2006-2009. All rights reserved. + * Copyright (C) 2006-2010 Freescale Semiconductor, Inc. All rights reserved. * * Author: Shlomi Gridish * @@ -875,8 +875,8 @@ struct ucc_geth_hardware_statistics { #define UCC_GETH_SIZE_OF_BD QE_SIZEOF_BD /* Driver definitions */ -#define TX_BD_RING_LEN 0x10 -#define RX_BD_RING_LEN 0x10 +#define TX_BD_RING_LEN 64 +#define RX_BD_RING_LEN 64 #define TX_RING_MOD_MASK(size) (size-1) #define RX_RING_MOD_MASK(size) (size-1)