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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 64B24C43381 for ; Sat, 16 Feb 2019 19:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2996421B69 for ; Sat, 16 Feb 2019 19:53:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="srKSca3f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732983AbfBPTxp (ORCPT ); Sat, 16 Feb 2019 14:53:45 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45536 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729933AbfBPTxo (ORCPT ); Sat, 16 Feb 2019 14:53:44 -0500 Received: by mail-wr1-f65.google.com with SMTP id w17so13818810wrn.12 for ; Sat, 16 Feb 2019 11:53:43 -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=jnTpzn923sbzAEWp0/v5Fq01e82oKAnoNgw/0Uy2W2Q=; b=srKSca3fWfc7mYBOHuiazPEefdBweeGLl0SLoBkE7lqZmLyuWgxYnlRMC+DwMdAVQr r0V9/Lj5bVKiP1E9exCySvvGV6y455Ih0Eq9qKBq031njlF4q+E7gdbhOVmqn9Q8gCnW 268Ar4NJ+CH+51pDoIicSncNpPgZwfDJm+/OqqsMtEHuEURANsWIM1pHTM24+pVUZw3H O62b9ZjLuArXYp8yGZ3aEt2fxhcMD+5JN0GIcFzVczNG4W3f2DgM32V5rph6V3tz3+dv oIWrWewXxmRANqDYfbfRVdYJggBxfBVAQe0qQwMEjcNtum71gzXtkfg+kSUB4Zbv13As onSQ== 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=jnTpzn923sbzAEWp0/v5Fq01e82oKAnoNgw/0Uy2W2Q=; b=GSEm+FxicFzZqsXY5r4V6sO4zCkhNRf0HDPCd+Ssa7TdeKzZJcJCIGQjFncpKd26K/ CWnBPo0iRk74yTMji2rhx5fWhVhTDXnVKVF65MWuJhZAa1B0PES2GhOyEkCfGXzE4jsp cM0bqXT2EtFPGbdSSSDPTvLAnxNGgU00nhrwdLVmW5fFYWzSNQRqES3B/RGKQx4Tq3e1 EsrPMmOOG79YnpKqlME3gYB4oqO+1gx26VcuWpnxo0VRa6D23CsNsrdpMGAPOE8THreU L1eCKAOxu7bLU0H6wuIe7mqX2j0QP/+/alEi3agUoDhAMlPRT3gne0EenlueaLcKTapN dzSw== X-Gm-Message-State: AHQUAuaJ4aNAvxUWkfcEvBww7hED0GC9I8/xTdvtGAuSsriB4PtHCJZR 7jTrQkqeB+9cUZpR1FTZoXFNe8dL X-Google-Smtp-Source: AHgI3IYq0KBV2GwAxdRCvERM9spw0s+UubzlNmTJHFVDpIVeOLsNjaL7YCSSQ3O9kCxZk0SOmX+oaw== X-Received: by 2002:adf:b611:: with SMTP id f17mr12076585wre.140.1550346822107; Sat, 16 Feb 2019 11:53:42 -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 k20sm17819549wre.41.2019.02.16.11.53.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Feb 2019 11:53:41 -0800 (PST) Subject: [PATCH net-next 2/4] net: phy: add 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: Date: Sat, 16 Feb 2019 20:51:32 +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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrew Lunn C45 configuration of 10/100 and multi-giga bit auto negotiation advertisement is standardized. Configuration of 1000Base-T however appears to be vendor specific. Move the generic code out of the Marvell driver into the common phy-c45.c file. Signed-off-by: Andrew Lunn [hkallweit1@gmail.com: use new helper linkmode_adv_to_mii_10gbt_adv_t and split patch] Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy-c45.c | 44 +++++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 1 + 2 files changed, 45 insertions(+) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 0374c50b1..bea1b0c6e 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -78,6 +78,50 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev) } EXPORT_SYMBOL_GPL(genphy_c45_pma_setup_forced); +/** + * genphy_c45_an_config_an - configure advertisement registers + * @phydev: target phy_device struct + * + * Configure advertisement registers based on modes set in phydev->advertising + * + * Returns negative errno code on failure, 0 if advertisement didn't change, + * or 1 if advertised modes changed. + */ +int genphy_c45_an_config_an(struct phy_device *phydev) +{ + int changed = 0, ret; + u32 adv; + + linkmode_and(phydev->advertising, phydev->advertising, + phydev->supported); + + adv = linkmode_adv_to_mii_adv_t(phydev->advertising); + + ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE, + ADVERTISE_ALL | ADVERTISE_100BASE4 | + ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM, + adv); + if (ret < 0) + return ret; + if (ret > 0) + changed = 1; + + adv = linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising); + + ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL, + MDIO_AN_10GBT_CTRL_ADV10G | + MDIO_AN_10GBT_CTRL_ADV5G | + MDIO_AN_10GBT_CTRL_ADV2_5G, + adv); + if (ret < 0) + return ret; + if (ret > 0) + changed = 1; + + return changed; +} +EXPORT_SYMBOL_GPL(genphy_c45_an_config_an); + /** * genphy_c45_an_disable_aneg - disable auto-negotiation * @phydev: target phy_device struct diff --git a/include/linux/phy.h b/include/linux/phy.h index bf1070c2a..dabcef5ba 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1101,6 +1101,7 @@ int genphy_c45_read_link(struct phy_device *phydev); int genphy_c45_read_lpa(struct phy_device *phydev); int genphy_c45_read_pma(struct phy_device *phydev); int genphy_c45_pma_setup_forced(struct phy_device *phydev); +int genphy_c45_an_config_an(struct phy_device *phydev); int genphy_c45_an_disable_aneg(struct phy_device *phydev); int genphy_c45_read_mdix(struct phy_device *phydev); int genphy_c45_pma_read_abilities(struct phy_device *phydev); -- 2.20.1