Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759280AbbGHRg7 (ORCPT ); Wed, 8 Jul 2015 13:36:59 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34511 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758344AbbGHRg4 (ORCPT ); Wed, 8 Jul 2015 13:36:56 -0400 Date: Wed, 8 Jul 2015 10:36:55 -0700 From: Greg Kroah-Hartman To: Stas Sergeev Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Arnaud Ebalard , Thomas Petazzoni , Florian Fainelli , netdev@vger.kernel.org, Stas Sergeev , "David S. Miller" , Sebastien Rannou Subject: Re: [PATCH 4.1 11/56] mvneta: add forgotten initialization of autonegotiation bits Message-ID: <20150708173655.GA16101@kroah.com> References: <20150708073237.780280770@linuxfoundation.org> <20150708073238.389781888@linuxfoundation.org> <559D5996.5080506@list.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <559D5996.5080506@list.ru> User-Agent: Mutt/1.5.23+89 (0255b37be491) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3060 Lines: 81 On Wed, Jul 08, 2015 at 08:10:46PM +0300, Stas Sergeev wrote: > 08.07.2015 10:35, Greg Kroah-Hartman пишет: > >4.1-stable review patch. If anyone has any objections, please let me know. > > > >------------------ > > > >From: Stas Sergeev > > > >[ Upstream commit 538761b794c1542f1c6e31eadd9d7aae118889f7 ] > > > >The commit 898b2970e2c9 ("mvneta: implement SGMII-based in-band link state > >signaling") > >changed mvneta_adjust_link() so that it does not clear the auto-negotiation > >bits in MVNETA_GMAC_AUTONEG_CONFIG register. This was necessary for > >auto-negotiation mode to work. > >Unfortunately I haven't checked if these bits are ever initialized. > >It appears they are not. > >This patch adds the missing initialization of the auto-negotiation bits > >in the MVNETA_GMAC_AUTONEG_CONFIG register. > >It fixes the following regression: > >https://www.mail-archive.com/netdev@vger.kernel.org/msg67928.html > > > >Since the patch was tested to fix a regression, it should be applied to > >stable tree. > > > >Tested-by: Arnaud Ebalard > > > >CC: Thomas Petazzoni > >CC: Florian Fainelli > >CC: netdev@vger.kernel.org > >CC: linux-kernel@vger.kernel.org > >CC: stable@vger.kernel.org > > > >Signed-off-by: Stas Sergeev > >Signed-off-by: David S. Miller > >Signed-off-by: Greg Kroah-Hartman > >--- > > drivers/net/ethernet/marvell/mvneta.c | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > >--- a/drivers/net/ethernet/marvell/mvneta.c > >+++ b/drivers/net/ethernet/marvell/mvneta.c > >@@ -1013,6 +1013,12 @@ static void mvneta_defaults_set(struct m > > val = mvreg_read(pp, MVNETA_GMAC_CLOCK_DIVIDER); > > val |= MVNETA_GMAC_1MS_CLOCK_ENABLE; > > mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER, val); > >+ } else { > >+ val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG); > >+ val &= ~(MVNETA_GMAC_INBAND_AN_ENABLE | > >+ MVNETA_GMAC_AN_SPEED_EN | > >+ MVNETA_GMAC_AN_DUPLEX_EN); > >+ mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val); > > } > > mvneta_set_ucast_table(pp, -1); > Hi Greg. > > Another problem was reported: > https://lkml.org/lkml/2015/7/8/865 > > So, while the above patch is correct and fixes what > it should, the original patch has more problems to deal > with. Maybe for stable it would be better to just revert > the whole thing? No, you will have to fix this in Linus's tree, right? So I'll take the patch that you get into there when that happens, I don't want to diverge from what is in that tree. > I guess for stable I'll be posting the reverts instead of > the above fix. If you are reverting patches in Linus's tree, I'll take that as well. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/