From patchwork Wed Mar 21 12:08:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 147970 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 07D9BB6EF1 for ; Wed, 21 Mar 2012 23:08:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754679Ab2CUMIh (ORCPT ); Wed, 21 Mar 2012 08:08:37 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:51313 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752835Ab2CUMIf (ORCPT ); Wed, 21 Mar 2012 08:08:35 -0400 Received: from katana.hi.pengutronix.de ([2001:6f8:1178:2:221:70ff:fe71:1890] helo=pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SAKLC-0007qd-Mu; Wed, 21 Mar 2012 13:08:34 +0100 From: Wolfram Sang To: netdev@vger.kernel.org Cc: David Miller , Wolfram Sang , Giuseppe Cavallaro Subject: [PATCH] net: phy: smsc: energy saving does not work without interrupts Date: Wed, 21 Mar 2012 13:08:27 +0100 Message-Id: <1332331707-2350-1-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.7.9.1 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:221:70ff:fe71:1890 X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We discovered link detection failures using this PHY with the Freescale FEC which does not have interrupt support yet. Disabling the energy saving mode makes all go well. It should be possible to make this mode work without interrupts by adding some code dealing with the ENERGYON flag. Since adding interrupt support to the FEC driver seems to be the better solution for us, I want to at least make sure the PHY works reliably always. So, disable energy saving if there is no interrupt support. Signed-off-by: Wolfram Sang Cc: Giuseppe Cavallaro --- Giuseppe: Did you test with interrupts? Do you agree? If Giuseppe is fine with the patch, this should probably be tagged for stable. drivers/net/phy/smsc.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index fc3e7e9..6dcf57a 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -43,16 +43,18 @@ static int smsc_phy_ack_interrupt(struct phy_device *phydev) static int smsc_phy_config_init(struct phy_device *phydev) { - int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); - if (rc < 0) - return rc; - - /* Enable energy detect mode for this SMSC Transceivers */ - rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS, - rc | MII_LAN83C185_EDPWRDOWN); - if (rc < 0) - return rc; - + /* TODO: add code to make EDPWRDOWN work without interrupts */ + if (PHY_INTERRUPT_ENABLED == phydev->interrupts) { + int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); + if (rc < 0) + return rc; + + /* Enable energy detect mode for this SMSC Transceivers */ + rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS, + rc | MII_LAN83C185_EDPWRDOWN); + if (rc < 0) + return rc; + } return smsc_phy_ack_interrupt (phydev); }