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.8 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 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 5FF06C43381 for ; Wed, 27 Mar 2019 21:00:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 222862075E for ; Wed, 27 Mar 2019 21:00:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pLWizDUv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727564AbfC0VAq (ORCPT ); Wed, 27 Mar 2019 17:00:46 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41348 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726136AbfC0VAq (ORCPT ); Wed, 27 Mar 2019 17:00:46 -0400 Received: by mail-wr1-f65.google.com with SMTP id r4so12557880wrq.8 for ; Wed, 27 Mar 2019 14:00:45 -0700 (PDT) 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=ED/nQvpULLyMy5bpNRX2iiRMJjzLsPQ/Us1Kf3pmNis=; b=pLWizDUvrV/PUR0WO0AEOEA7isvrD4ctsfwGw9RgQH+aXNX2zL4M1ivkI1WHugAWVy WiIp3Z6a39UcYdFou42b9KvTM14wk81CZWignlkq8xjDFQa5gxLjgTMRMzLiH/20G+C8 5G8h0YVTs9RN9S6WBlmDMGO0X3AV06jNiXq83qF7lsdkBRaD2VflI2ERLji/IddPvYem +9Zrq36WZUPsrYR7od6PHaH5LlmrFXA7qSLZopogjl+gv2zXx/cyk3ZdcpoZpKK95KJc 7bHoLnD/sGbJ1utJvmyVhKMsTTT+JRtJQJBVKLhAW7Iq8cQYuPqKIzV2Rcu+7rB+XNAE Y8xA== 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=ED/nQvpULLyMy5bpNRX2iiRMJjzLsPQ/Us1Kf3pmNis=; b=Gp7M2vtwDDF7tzRSktC6b7gXz+YN2QTGq01gn5ZXcDhYDi5JjupR/nDeKASXYapsLg uE3gp4rGOVSQxu6fgMhxu2JEZqU5oZN71+zL4/13SOraAfWemyq9dozQYHKnppFoEdOQ sV3m8T5lZVUnbfu0P4GR8PN6q7NYhyPghuBRQFC8TPGQdhu0odTTaGpjPtjBSvAHDX4y uj8b0j8lrWxJsML463KBWr7Of4Y9kddM+3dqPAL6gX3y9gclglfo43sb1AL7DVyjI2it 0M+5CAKLSWdccTzRGLyu032hBGkf29AxPVrE7YkIDbPKrlnK0kx0Hlelc9B3jlaTk5z5 mojw== X-Gm-Message-State: APjAAAViOZ+Uq+T/EcNnHJp/5al0faXL0yNCeEO7HIiy0i4t8gZlCukP hHaQjlQaqI9QR9HH2eWx8+u+bLNx X-Google-Smtp-Source: APXvYqxs2/7L25hAMH7M7rDxaycSzK8S+fDcBgwdvcfguh09a5BTfafLefHnbW97wOvyVN/9hgTFMQ== X-Received: by 2002:adf:ce8c:: with SMTP id r12mr4214488wrn.60.1553720444500; Wed, 27 Mar 2019 14:00:44 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:ccf1:55bc:aa83:b190? (p200300EA8BC4DC00CCF155BCAA83B190.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:ccf1:55bc:aa83:b190]) by smtp.googlemail.com with ESMTPSA id t2sm48170809wra.9.2019.03.27.14.00.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:00:43 -0700 (PDT) Subject: [PATCH net-next 1/3] net: phy: add genphy_read_abilities From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <3d087449-a68f-8233-e97f-29038f8de29a@gmail.com> Message-ID: Date: Wed, 27 Mar 2019 21:58:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <3d087449-a68f-8233-e97f-29038f8de29a@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 Similar to genphy_c45_pma_read_abilities() add a function to dynamically detect the abilities of a Clause 22 PHY. This is mainly copied from genphy_config_init(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 48 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 1 + 2 files changed, 49 insertions(+) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 77068c545..0107366bb 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1887,6 +1887,54 @@ int genphy_config_init(struct phy_device *phydev) } EXPORT_SYMBOL(genphy_config_init); +/** + * genphy_read_abilities - read PHY abilities from Clause 22 registers + * @phydev: target phy_device struct + * + * Description: Reads the PHY's abilities and populates + * phydev->supported accordingly. + * + * Returns: 0 on success, < 0 on failure + */ +int genphy_read_abilities(struct phy_device *phydev) +{ + int val; + + linkmode_set_bit_array(phy_basic_ports_array, + ARRAY_SIZE(phy_basic_ports_array), + phydev->supported); + + val = phy_read(phydev, MII_BMSR); + if (val < 0) + return val; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported, + val & BMSR_ANEGCAPABLE); + + linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, phydev->supported, + val & BMSR_100FULL); + linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, phydev->supported, + val & BMSR_100HALF); + linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, phydev->supported, + val & BMSR_10FULL); + linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, phydev->supported, + val & BMSR_10HALF); + + if (val & BMSR_ESTATEN) { + val = phy_read(phydev, MII_ESTATUS); + if (val < 0) + return val; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + phydev->supported, val & ESTATUS_1000_TFULL); + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + phydev->supported, val & ESTATUS_1000_THALF); + } + + return 0; +} +EXPORT_SYMBOL(genphy_read_abilities); + /* This is used for the phy device which doesn't support the MMD extended * register access, but it does have side effect when we are trying to access * the MMD register via indirect method. diff --git a/include/linux/phy.h b/include/linux/phy.h index 34084892a..ad88f063e 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1075,6 +1075,7 @@ void phy_attached_info(struct phy_device *phydev); /* Clause 22 PHY */ int genphy_config_init(struct phy_device *phydev); +int genphy_read_abilities(struct phy_device *phydev); int genphy_setup_forced(struct phy_device *phydev); int genphy_restart_aneg(struct phy_device *phydev); int genphy_config_eee_advert(struct phy_device *phydev); -- 2.21.0