From patchwork Wed Mar 27 20:58:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1067424 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="pLWizDUv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44V0lN4pNbz9sQt for ; Thu, 28 Mar 2019 08:00:48 +1100 (AEDT) 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-Language: en-US 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); From patchwork Wed Mar 27 20:59: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: 1067425 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="dW9XrtSu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44V0lQ4MJpz9sQt for ; Thu, 28 Mar 2019 08:00:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728016AbfC0VAt (ORCPT ); Wed, 27 Mar 2019 17:00:49 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35266 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726136AbfC0VAr (ORCPT ); Wed, 27 Mar 2019 17:00:47 -0400 Received: by mail-wr1-f66.google.com with SMTP id w1so20287090wrp.2 for ; Wed, 27 Mar 2019 14:00:46 -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=8+UVOABIYKYtsDA8UnDzDZebIJDvDt5IX5Vmlfa+3HI=; b=dW9XrtSuIEss4tO1/lMJW2Iz8UEeB+qnkmoR+aVgYVLbUnUv0zr4jDIi5W5L2yT1/C NkIq3INprE47cc4jx7tFyTxe/PNgajERAUnr5Q1hTtoj9Z/cABe6ZMRcauvn5jzstPJo 4P8ob5Spj4ToRfaR8+UFOJ0BjS70UXBR9y6KXq7vHeMOhbPhOfdrZzCLPdmW71Rgp9AK GxA1aIPdfT5a5UqTmdQA4dbmwcTwyHWG+BlTVtju3grFiwS6gi0c2pp8tD0OkLST3+vP t3L67wXY2lO2C5kJjmwr7VcFdbC7id/DT8Ipcnhy0/5sQ8IgT1DyWXqhXAnjvb/XZZ9S ShoQ== 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=8+UVOABIYKYtsDA8UnDzDZebIJDvDt5IX5Vmlfa+3HI=; b=VFfwKxhXbRdiuK40BmlGlrccptH1HqJ+SLWmX8XXq9FqC3Bue0eAhAqnd0L1XztJvV FmdH7D5/2X74+SqszrWZmFnB4r0yE10R3z4uFq/GCxR5hq4/86OB/bbn4WPpO6SyCpsL DG5ZA+aG6bV9NmlDFD/kOEgPeyeMZ5Ul7ej3XdmLTN7pCpUUSdopJCZr1wFq5cLzFbFL sRrNdRdBYz05q80oEbg/43t3ievU+iu7kc4AmWa3/ntRAoJ+Mj9ge5U5C3XG1pSXX/yQ p8vo0inJrqszaOBuXB9sgu+xBH0OclJeu+1X2SGO0MlxvtDUH/Qj7M/21xhaigvdUCQH 4+JA== X-Gm-Message-State: APjAAAUHPdoqW8YWSTfJhmwFvjcLClfTTnuGDAEHcTVvEzuLMxd1GPHc 2eul5jOGIcqPIqnp8xLjQibNb/X2 X-Google-Smtp-Source: APXvYqxLjOIFuGxNn+N0LOQ3vUrgQpyNo0K4GFXZpW9gbtw/Hgj35Y/UmAu3XmBzLnDGvE6VSVaDjg== X-Received: by 2002:adf:ea0b:: with SMTP id q11mr1539078wrm.233.1553720446053; Wed, 27 Mar 2019 14:00:46 -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 w11sm15255251wre.15.2019.03.27.14.00.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:00:45 -0700 (PDT) Subject: [PATCH net-next 2/3] net: phy: use genphy_read_abilities in genphy driver 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: <6706384d-babf-1f97-a0dd-240e4cd20203@gmail.com> Date: Wed, 27 Mar 2019 21:59:33 +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-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently the genphy driver populates phydev->supported like this: First all possible feature bits are set, then genphy_config_init() reads the available features from the chip and remove all unsupported features from phydev->supported. This can be simplified by using genphy_read_abilities(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 0107366bb..0c4cc9b54 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2291,8 +2291,7 @@ static struct phy_driver genphy_driver = { .phy_id_mask = 0xffffffff, .name = "Generic PHY", .soft_reset = genphy_no_soft_reset, - .config_init = genphy_config_init, - .features = PHY_GBIT_ALL_PORTS_FEATURES, + .get_features = genphy_read_abilities, .aneg_done = genphy_aneg_done, .suspend = genphy_suspend, .resume = genphy_resume, From patchwork Wed Mar 27 21:00:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1067426 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="YGAbaVyg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44V0lS58PXz9sQt for ; Thu, 28 Mar 2019 08:00:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728197AbfC0VAv (ORCPT ); Wed, 27 Mar 2019 17:00:51 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39918 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727617AbfC0VAu (ORCPT ); Wed, 27 Mar 2019 17:00:50 -0400 Received: by mail-wm1-f67.google.com with SMTP id t124so1559525wma.4 for ; Wed, 27 Mar 2019 14:00:48 -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=V1I9sYzKdc5q++h6TYctvtellKTP4qhxK9dTznhdWWw=; b=YGAbaVyghjb54TlyDWTRJkuorD17kxef+GicHs9lM49Hc5m8nIGcoyyqGgkNDNViJ3 tNa/VeNlLmS6uRrY6M6IRYOcyznnBUTMSfCP7gSJAzvoCULNyBBPyT7/KSrnOHtMJ6Q8 YHPxGj8cIcoqNGhlyCFGQmcYdVn0DbfLPuqRNjQJkzGdY8y1ro8L8PmxtTIuwieAiEY/ WqTDSfiSw47BJBGDzWzwm18Gv20vgslrd6+sxeMd/5NOoVVQ8tlyCVylqwNcae+Lw49v O3qCIQRml6Q268Ws9DgqNQYA1A7yJOEKRow6PTuGbgRjPcVSz9inDuLGjMV7uLmXBlJZ cQKA== 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=V1I9sYzKdc5q++h6TYctvtellKTP4qhxK9dTznhdWWw=; b=bA7N2zG0ZSevHfm9uYds74hiaHk3GLtk8jk/r5ipvBpKQSQWzDj78va97sY1ezGWHe tcU2UcA5dCWAb6TMzJxBQ9/bpWJ0ALuesSDp/QxjceIYYwyKxg1ssOgltqqxdX3hScW6 Khcs3j0UP+jeQzYAJ998Fmdds+dEqaZr5Z98dy/Xu4Mel7z3VCUC1bOBB9VSfpesPzYE U+7z2o7xBfKi2G2iyVBBJ4whFMfcsYIMymxpuppFpXSt5sEsxFk77L3RBR+yp6r0/2+8 i2wJpfPhBC37PUQKD8eYnXM4vwbn81xkv1m9xICUJ34yC/hnc6jQ3yfe57vmOepHSYkI J86w== X-Gm-Message-State: APjAAAUwMN1R5ANZIOzt41y5Ejtx+3A22lm2uCZaeafp7CkzXx0wW68I uaAqicyIwugFXrWX6OH+qNonCeJX X-Google-Smtp-Source: APXvYqyXHv2ohvL7nwoYdpPwloGuYP+L7W4905yOcuJaJVtqbuV6oLqNv9CtGQ7ISUpE2GQoRCRtEA== X-Received: by 2002:a1c:7d42:: with SMTP id y63mr3821046wmc.113.1553720447581; Wed, 27 Mar 2019 14:00:47 -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 f15sm17347752wru.21.2019.03.27.14.00.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 14:00:47 -0700 (PDT) Subject: [PATCH net-next 3/3] net: phy: realtek: use 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: <6f6b620c-f109-43b9-f39a-6c4970386da9@gmail.com> Date: Wed, 27 Mar 2019 22:00:32 +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-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new function genphy_read_abilities(). This allows to remove all calls to genphy_config_init(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/realtek.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 10df52ccd..5ecbd41ed 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -151,21 +151,14 @@ static int rtl8211_config_aneg(struct phy_device *phydev) static int rtl8211c_config_init(struct phy_device *phydev) { /* RTL8211C has an issue when operating in Gigabit slave mode */ - phy_set_bits(phydev, MII_CTRL1000, - CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER); - - return genphy_config_init(phydev); + return phy_set_bits(phydev, MII_CTRL1000, + CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER); } static int rtl8211f_config_init(struct phy_device *phydev) { - int ret; u16 val = 0; - ret = genphy_config_init(phydev); - if (ret < 0) - return ret; - /* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) @@ -192,10 +185,6 @@ static int rtl8366rb_config_init(struct phy_device *phydev) { int ret; - ret = genphy_config_init(phydev); - if (ret < 0) - return ret; - ret = phy_set_bits(phydev, RTL8366RB_POWER_SAVE, RTL8366RB_POWER_SAVE_ON); if (ret) { @@ -210,11 +199,11 @@ static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), .name = "RTL8201CP Ethernet", - .features = PHY_BASIC_FEATURES, + .get_features = genphy_read_abilities, }, { PHY_ID_MATCH_EXACT(0x001cc816), .name = "RTL8201F Fast Ethernet", - .features = PHY_BASIC_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl8201_ack_interrupt, .config_intr = &rtl8201_config_intr, .suspend = genphy_suspend, @@ -224,14 +213,14 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc910), .name = "RTL8211 Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_aneg = rtl8211_config_aneg, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc912), .name = "RTL8211B Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211b_config_intr, .read_mmd = &genphy_read_mmd_unsupported, @@ -241,14 +230,14 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc913), .name = "RTL8211C Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = rtl8211c_config_init, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc914), .name = "RTL8211DN Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = rtl821x_ack_interrupt, .config_intr = rtl8211e_config_intr, .suspend = genphy_suspend, @@ -256,7 +245,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc915), .name = "RTL8211E Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211e_config_intr, .suspend = genphy_suspend, @@ -264,7 +253,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc916), .name = "RTL8211F Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = &rtl8211f_config_init, .ack_interrupt = &rtl8211f_ack_interrupt, .config_intr = &rtl8211f_config_intr, @@ -275,8 +264,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc800), .name = "Generic Realtek PHY", - .features = PHY_GBIT_FEATURES, - .config_init = genphy_config_init, + .get_features = genphy_read_abilities, .suspend = genphy_suspend, .resume = genphy_resume, .read_page = rtl821x_read_page, @@ -284,7 +272,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc961), .name = "RTL8366RB Gigabit Ethernet", - .features = PHY_GBIT_FEATURES, + .get_features = genphy_read_abilities, .config_init = &rtl8366rb_config_init, /* These interrupts are handled by the irq controller * embedded inside the RTL8366RB, they get unmasked when the