From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Nieder Subject: Re: [PATCH 3.3.0] phy:icplus:fix Auto Power Saving in ip101a_config_init. Date: Wed, 9 May 2012 02:25:37 -0500 Message-ID: <20120509072537.GA437@burratino> References: <1333360929-31506-1-git-send-email-srinivas.kandagatla@st.com> <20120403.184937.744089580257691570.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: srinivas.kandagatla@st.com, netdev@vger.kernel.org, peppe.cavallaro@st.com To: David Miller Return-path: Received: from mail-yx0-f174.google.com ([209.85.213.174]:64267 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757184Ab2EIHZv (ORCPT ); Wed, 9 May 2012 03:25:51 -0400 Received: by yenm10 with SMTP id m10so5726821yen.19 for ; Wed, 09 May 2012 00:25:51 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20120403.184937.744089580257691570.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: Hi Dave, David Miller wrote: > From: Srinivas KANDAGATLA >> This patch fixes Auto Power Saving configuration in ip101a_config_init >> which was broken as there is no phy register write followed after >> setting IP101A_APS_ON flag. >> >> This patch also fixes the return value of ip101a_config_init. >> >> Without this patch ip101a_config_init returns 2 which is not an error >> accroding to IS_ERR and the mac driver will continue accessing 2 as >> valid pointer to phy_dev resulting in memory fault. >> >> Signed-off-by: Srinivas Kandagatla > > Applied and queued up for -stable, thanks. I'm guessing 3.2.y needs this, too, since it also includes v3.2-rc1~129^2~247 ("net/phy: add IC+ IP101A and support APS"). Here's a quick backport made by adjusting the context line to use IP101A_APS_ON instead of IP101A_G_APS_ON. Please include it in some later stable update if appropriate. Thanks, Jonathan -- >8 -- From: Srinivas Kandagatla Date: Mon, 2 Apr 2012 00:02:09 +0000 [ Upstream commit b3300146aa8efc5d3937fd33f3cfdc580a3843bc ] This patch fixes Auto Power Saving configuration in ip101a_config_init which was broken as there is no phy register write followed after setting IP101A_APS_ON flag. This patch also fixes the return value of ip101a_config_init. Without this patch ip101a_config_init returns 2 which is not an error accroding to IS_ERR and the mac driver will continue accessing 2 as valid pointer to phy_dev resulting in memory fault. Signed-off-by: Srinivas Kandagatla Signed-off-by: David S. Miller Signed-off-by: Jonathan Nieder --- drivers/net/phy/icplus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index c81f136ae670..b14230016d9b 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -150,7 +150,8 @@ static int ip101a_config_init(struct phy_device *phydev) /* Enable Auto Power Saving mode */ c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); c |= IP101A_APS_ON; - return c; + + return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); } static int ip175c_read_status(struct phy_device *phydev) -- 1.7.10.1