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 E43F4C43381 for ; Sun, 17 Feb 2019 08:41:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABC18218FF for ; Sun, 17 Feb 2019 08:41:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QLXYbQ9C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726667AbfBQIlr (ORCPT ); Sun, 17 Feb 2019 03:41:47 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45107 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725768AbfBQIlr (ORCPT ); Sun, 17 Feb 2019 03:41:47 -0500 Received: by mail-wr1-f68.google.com with SMTP id w17so14841598wrn.12 for ; Sun, 17 Feb 2019 00:41:45 -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=b8YMPJVwvniifgSrSgoAmBO7PLGeNgb8ceE/YpCcqz0=; b=QLXYbQ9Ce+PnAK0dBLSMjgGsLSW8EUToHv1ihBqAVVpVwPnhyWiT9EQIIEB7Y4wB9u wJ6iL1RvLd61os/00ZtpN0/nE5XeWXT08/wLFiz3XizZHAms9jyI0HFAheMpdFhkgSpR XR46vQGwjRvjWVYkFAPjhHZvTvBC4D7H/wa4MROzKhL8CE5RXAeHoYCDFKrjD3X8QwPE DNosYI6Pq9dWi4iwVOGXOhYXh2ysXyssTFxlCHoCEDnKu4X8IPkLwmWp2VRWhNRJgyqk K5oiUdgwBJx3iBcjC56WkeYMEuuc33wALvxm1U5PdFMW1bQUbF3CaddtCpUx2sljcOJQ Q3QA== 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=b8YMPJVwvniifgSrSgoAmBO7PLGeNgb8ceE/YpCcqz0=; b=PkM0S+xV1fwzwBq+7nuR+ibFUt7/e67ZklrYfbreJMGsiFVWFZFRyMakI6U8knfGBc TLaPfFAKeHaR21IK139bWa5058OtMIsFfRzcPhWzuydScYRsK18c0Yc4LLjlGu7q4Yls PIbBHTHyjZp7EOckcj7G2Ud4sTsdQfqUKYZCpkyeYAUxjH3V9PKjgT0e3itUYJJ5xRl2 Hzbf2Q+894mn266c7XdXIbnCnva8FnWlPYwSdn8dON/Ax9ti5LZJ1Dqe8n03SI4n64F8 sMLXKfbtqrd9mjjVEcU8pdUqFQ4dBO+Rnpfj2R7XnKD1voasTM1/OLN2yNp7ZR/CeIFp n6Rg== X-Gm-Message-State: AHQUAuZIlHkzh5w2WoT8x3ZmE9csu/EWMSXoBRwUSSWm6ak7OrqhJSaI FXTQt56k2iPYlVrp8n12K/YimBLs X-Google-Smtp-Source: AHgI3Ia/epMq8603BirnIvpZTsmnhq+nrpz5i3RMhpG/Ck2EfsJKv+razhK9yPArmEEkFe0jx2Mnhg== X-Received: by 2002:adf:c54d:: with SMTP id s13mr12091444wrf.169.1550392904976; Sun, 17 Feb 2019 00:41:44 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:4c36:c930:69b6:c10f? (p200300EA8BF1E2004C36C93069B6C10F.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:4c36:c930:69b6:c10f]) by smtp.googlemail.com with ESMTPSA id c2sm5093856wrt.93.2019.02.17.00.41.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 00:41:44 -0800 (PST) Subject: [PATCH net-next v2 2/4] net: phy: add genphy_c45_an_config_aneg From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller , Russell King - ARM Linux Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 17 Feb 2019 09:37:48 +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: 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. v2: - change function name to genphy_c45_an_config_aneg 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 Reviewed-by: Florian Fainelli --- 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 98a04d4cd..16636d49b 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_aneg - 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_aneg(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_aneg); + /** * 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..3db507e68 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_aneg(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