From patchwork Sat Feb 16 19:52:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1043490 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VwPelI5R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4421651MXdz9s7h for ; Sun, 17 Feb 2019 06:53:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733009AbfBPTxs (ORCPT ); Sat, 16 Feb 2019 14:53:48 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52216 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729041AbfBPTxp (ORCPT ); Sat, 16 Feb 2019 14:53:45 -0500 Received: by mail-wm1-f68.google.com with SMTP id n19so1190813wmi.1 for ; Sat, 16 Feb 2019 11:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=gVSgbsBicWIO5r67MFUVOJK7vzwl/3vxTIEX/vb1R40=; b=VwPelI5RF7pZ7yrz1wv0O7txGhhnkRW0pO3jbnZasXwW8EU9gyVelZsk6wKYeOiuwc TraGRUNqiYRuqOU+EI2D/uoI3fTv/PoVK23MlAB1TjEGZ7Uc4+LrkM8ebJcjhGXDZKwC /DGIt5j300gidGKxSlII18/mLJQgkZglqs8E5CEIVM1lUAqCc0fFrCXwUH4hId1A48mg SvRpRtOtWJzyH/rBl4n0kLpsEJORxdt7BQXIRoyMrcDz/a+SRTR3pfZON2LwFfBwH4Se SmP5N97eZzkyivhXI8is0VV7E4rw2yQjulMuBtKSDvVde3FZPcSIKmPXqRZGxleOtWOn OCcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=gVSgbsBicWIO5r67MFUVOJK7vzwl/3vxTIEX/vb1R40=; b=TXWM0iQz/NHlA0PKdOXPNco3ihxAiTOzdHJc8DJmVF5C+JapGxEj44qLNKikFfU+D0 +Qcezl3T2+JFILUI4eTTgNXRwMIiXOR9zT/F3yBXuSdAdvNUSfQyCtVIH1K6oDUcIQPS +xWndQFutyPgxpXazr33kL9rAFUQM9OCmUbBAe7afd366XJUOxIgCr5HhuROXYotQ9FU xwZzFCcaUqGxSapDYn3tGVkWVdjcexO7UBFnbpNheZ0vDARUyl7F8i84mEmB0LaF9web Jlo77cuEnWX21KZ8XljqC3PuaeU8B6nm13VLTIguxyUPl5KyK7Sm6bU6h6J/DYwWS66v ULOw== X-Gm-Message-State: AHQUAub5l2YYVOXFHi3l0/aoHptoa+mUsumwjdRiT92Oa3AgEa4+Iq2I I8IGqYTO39pjwSDZeunnp/XRarG4 X-Google-Smtp-Source: AHgI3IYjW2YUMIrO9kiTT7ZwnAZV8jhop4yCb3H8/3ggh5dQrjxRVZdJ8gDJlZBPeJtvK3DpkBnxMw== X-Received: by 2002:a1c:3d84:: with SMTP id k126mr8905438wma.60.1550346823622; Sat, 16 Feb 2019 11:53:43 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:fc50:d076:bfa9:dffa? (p200300EA8BF1E200FC50D076BFA9DFFA.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:fc50:d076:bfa9:dffa]) by smtp.googlemail.com with ESMTPSA id b4sm843419wmj.3.2019.02.16.11.53.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 11:53:43 -0800 (PST) Subject: [PATCH net-next 3/4] net: phy: marvell10g: use genphy_c45_an_config_an From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com> Message-ID: <2ad2dd35-45f5-9720-d2ae-0ee104a7d782@gmail.com> Date: Sat, 16 Feb 2019 20:52:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrew Lunn Use new function genphy_c45_config_aneg() in mv3310_config_aneg(). Signed-off-by: Andrew Lunn [hkallweit1@gmail.com: patch splitted] Signed-off-by: Heiner Kallweit --- drivers/net/phy/marvell10g.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 4a6ae63ab..03fa50087 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -274,13 +274,7 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (phydev->autoneg == AUTONEG_DISABLE) return genphy_c45_pma_setup_forced(phydev); - linkmode_and(phydev->advertising, phydev->advertising, - phydev->supported); - - ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, - ADVERTISE_ALL | ADVERTISE_100BASE4 | - ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, - linkmode_adv_to_mii_adv_t(phydev->advertising)); + ret = genphy_c45_an_config_an(phydev); if (ret < 0) return ret; if (ret > 0) @@ -294,20 +288,6 @@ static int mv3310_config_aneg(struct phy_device *phydev) if (ret > 0) changed = true; - /* 10G control register */ - if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, - phydev->advertising)) - reg = MDIO_AN_10GBT_CTRL_ADV10G; - else - reg = 0; - - ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, - MDIO_AN_10GBT_CTRL_ADV10G, reg); - if (ret < 0) - return ret; - if (ret > 0) - changed = true; - if (changed) ret = genphy_c45_restart_aneg(phydev);