From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A590C43381 for ; Sun, 24 Feb 2019 20:56:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 279C92084D for ; Sun, 24 Feb 2019 20:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728134AbfBXU4u convert rfc822-to-8bit (ORCPT ); Sun, 24 Feb 2019 15:56:50 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:56173 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726458AbfBXU4u (ORCPT ); Sun, 24 Feb 2019 15:56:50 -0500 X-Originating-IP: 86.201.231.99 Received: from bootlin.com (lfbn-tou-1-149-99.w86-201.abo.wanadoo.fr [86.201.231.99]) (Authenticated sender: maxime.chevallier@bootlin.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id B06D460008; Sun, 24 Feb 2019 20:56:47 +0000 (UTC) Date: Sun, 24 Feb 2019 21:56:46 +0100 From: Maxime Chevallier To: Heiner Kallweit Cc: David Miller , netdev@vger.kernel.org Subject: Re: marvell10g.c merge into net-next Message-ID: <20190224215646.1f90d37e@bootlin.com> In-Reply-To: References: <20190224.121517.833334110230552517.davem@davemloft.net> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello Dave, Heiner, On Sun, 24 Feb 2019 21:35:11 +0100 Heiner Kallweit wrote: >On 24.02.2019 21:15, David Miller wrote: >> >> Heiner, please look at net-next which I just merged net into. >> >> Net had a bug fix wherein the MDIO_AN_10GBT_CTRL_ADV_NBT_MASK >> bits are cleared in the 10gbt control register to work around >> a problem with some marvell10g phy chips. >> >> In the merge I preserved your usage of the generic c45 helpers >> in this area, but I suspect part of that will have to be undone >> in order to accomodate the above fix. >> >Thanks for the info. Let me add Maxime as author of the fix. >I think we talk about his one "net: phy: marvell10g: >Fix Multi-G advertisement to only advertise 10G" and we talk >about net-next. > >IMO the proper way to fix this is removing the unsupported >modes from phydev->advertising in config_init. >Then mv3310_config_aneg doesn't have to be touched. > >A similar exercise I did here: >0974f1f03b07 ("net: phy: aquantia: remove false 5G and 10G speed ability for AQCS109") >From what I've seen and tested, the issue itself doesn't appear in net-next, since mv3310_config_aneg calls the newly introduced genphy_c45_an_config_aneg() which clears the 2.5G/5G advertising bits. So the use of the generic C45 helpers should be enough to prevent the issue from happening. The only difference really is that the -net patch also masks the 2.5/5G Fast Retrain abilities, but this should make no difference given that 2.5/5G are masked-out in both cases. I'm sorry for the confusion, I wasn't sure how to deal with such a scenario. Thanks, Maxime -- Maxime Chevallier, Bootlin Embedded Linux and kernel engineering https://bootlin.com