From patchwork Fri Aug 16 19:56:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1148451 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="c/veGNmE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469Dd76p16z9sNf for ; Sat, 17 Aug 2019 05:57:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727586AbfHPT5q (ORCPT ); Fri, 16 Aug 2019 15:57:46 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41941 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727548AbfHPT5q (ORCPT ); Fri, 16 Aug 2019 15:57:46 -0400 Received: by mail-wr1-f65.google.com with SMTP id j16so2606884wrr.8 for ; Fri, 16 Aug 2019 12:57: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=AEb2g9RDPllvEovcK65M0ILnvPGzBPuSPDAE1ig18ZQ=; b=c/veGNmEyerCTpA8k7bDJm+TJ1xgiT+8D2/J0HK8bgCzWZyg0EiGKVMWknBWlYShRv FJiv1dHiuMgaS9iO83+6XcaUv4ODqRAWteFH/OYxQY7oOzE59fiGdcAnE8Z8e/25s+2I FRHZHFcSV4kOBwL4igsRDRFmkWkTp47VFWv7OH1xHDxS52hkWEXQ4d98yQnHygvoaqJD m5BWmZiZxcy3ISCJrTauTURbIsq2xFBt3kBJeUevmCrlvwnR6P017IPjySApMrZ1WlEQ rHzjq8hee3lYaFg3e9aVpEAarGGpI6b9zrgOHfTFRvSEucP85TVPw3fOVv/+h56ouS/k i5Dw== 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=AEb2g9RDPllvEovcK65M0ILnvPGzBPuSPDAE1ig18ZQ=; b=jfZOx1gJaD5v56QPI4lVAOEgr9Zz3UEmDsxmckssA+8V9SRoSBPtaV6M/k5vfFn0kI 4f8hp1+eTgzSQSO2wOv3Z+KTrSb8akLfD648MOlWU0V5yuHeuUm9Fekos0Rjrjt3GzuI 6ndOhbKF6BuzFZtMdM4MSRX9EBOuoczVVn8Ljn/WOMVeOSBleC0Xq2YNo524QROPk1vF NZA7V2Qbfns3KaB9ti7p7nCrMcTDAcgG6ArzNHj1Zu/SEfC84u6ErlcuErx0k7HsILSM Rdv8/2mhjg2aRyzO7hheueMR2rP8B0Sy7f2A5WwCCM2TmlG8P0QAQ+nu5CN/IUqdwpDo xq9g== X-Gm-Message-State: APjAAAWMWXLGCO5P2v3VvDIOo/lEhK9kwJ0dkKGEBm6oqtDPctmdaoJf 57LojurIPdb6CV0zHZ2UJBXFFZjg X-Google-Smtp-Source: APXvYqyYvfmpRcbDlTTfZ0FlnYWdkL9m93dwoC3BJTkRgTT2Z6VmkOtS36M+KkuoVWcj5sixOQ4gyA== X-Received: by 2002:adf:c7c7:: with SMTP id y7mr12512821wrg.44.1565985464230; Fri, 16 Aug 2019 12:57:44 -0700 (PDT) Received: from ?IPv6:2003:ea:8f2f:3200:4112:e131:7f21:ec09? (p200300EA8F2F32004112E1317F21EC09.dip0.t-ipconnect.de. [2003:ea:8f2f:3200:4112:e131:7f21:ec09]) by smtp.googlemail.com with ESMTPSA id a84sm7951484wmf.29.2019.08.16.12.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Aug 2019 12:57:43 -0700 (PDT) Subject: [PATCH net-next 1/2] net: phy: add EEE-related constants From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <45dc22c9-8da3-2540-25bf-6ca1603ce671@gmail.com> Date: Fri, 16 Aug 2019 21:56:27 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add EEE-related constants. This includes the new MMD EEE registers for NBase-T / 802.3bz. Signed-off-by: Heiner Kallweit --- include/uapi/linux/mdio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h index 0a552061f..4bcb41c71 100644 --- a/include/uapi/linux/mdio.h +++ b/include/uapi/linux/mdio.h @@ -45,11 +45,14 @@ #define MDIO_AN_ADVERTISE 16 /* AN advertising (base page) */ #define MDIO_AN_LPA 19 /* AN LP abilities (base page) */ #define MDIO_PCS_EEE_ABLE 20 /* EEE Capability register */ +#define MDIO_PCS_EEE_ABLE2 21 /* EEE Capability register 2 */ #define MDIO_PMA_NG_EXTABLE 21 /* 2.5G/5G PMA/PMD extended ability */ #define MDIO_PCS_EEE_WK_ERR 22 /* EEE wake error counter */ #define MDIO_PHYXS_LNSTAT 24 /* PHY XGXS lane state */ #define MDIO_AN_EEE_ADV 60 /* EEE advertisement */ #define MDIO_AN_EEE_LPABLE 61 /* EEE link partner ability */ +#define MDIO_AN_EEE_ADV2 62 /* EEE advertisement 2 */ +#define MDIO_AN_EEE_LPABLE2 63 /* EEE link partner ability 2 */ /* Media-dependent registers. */ #define MDIO_PMA_10GBT_SWAPPOL 130 /* 10GBASE-T pair swap & polarity */ @@ -276,6 +279,13 @@ #define MDIO_EEE_1000KX 0x0010 /* 1000KX EEE cap */ #define MDIO_EEE_10GKX4 0x0020 /* 10G KX4 EEE cap */ #define MDIO_EEE_10GKR 0x0040 /* 10G KR EEE cap */ +#define MDIO_EEE_40GR_FW 0x0100 /* 40G R fast wake */ +#define MDIO_EEE_40GR_DS 0x0200 /* 40G R deep sleep */ +#define MDIO_EEE_100GR_FW 0x1000 /* 100G R fast wake */ +#define MDIO_EEE_100GR_DS 0x2000 /* 100G R deep sleep */ + +#define MDIO_EEE_2_5GT 0x0001 /* 2.5GT EEE cap */ +#define MDIO_EEE_5GT 0x0002 /* 5GT EEE cap */ /* 2.5G/5G Extended abilities register. */ #define MDIO_PMA_NG_EXTABLE_2_5GBT 0x0001 /* 2.5GBASET ability */ From patchwork Fri Aug 16 19:57:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1148452 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="gvCBgfSq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469Dd91qwkz9sNk for ; Sat, 17 Aug 2019 05:57:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727630AbfHPT5s (ORCPT ); Fri, 16 Aug 2019 15:57:48 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33471 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727562AbfHPT5r (ORCPT ); Fri, 16 Aug 2019 15:57:47 -0400 Received: by mail-wr1-f68.google.com with SMTP id u16so2622837wrr.0 for ; Fri, 16 Aug 2019 12:57: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=to0/oglrdrCKf5DxwkCjZQ1goRlkhYxnjsj8QSAzCfE=; b=gvCBgfSq4wOg96G0/GHPFfRaqih00f/87N/HHH7DIwQHiGQ6nSzE0FpX2fSdg3NFdX 3CJYo5TLMXtTXr50tog0dqGkGHCV+8zDckxnVy8bmMYdde6VIVlW9f6qKr5L9Kt3tTpx u0IShBN0a/KSpKq1ksdfF7uXDUxYqxd7472qU9/kOoOlOdhXKT41Qk8zCOXZqZUQ9LBr gQouSkLF5Dpkp4KNVJzEM5SJkaoqjVVBVYs6RfpWTf0DBq5N+RlRPtascQNhi6j0FQ7G 6a/KLA/jxjjmJDMmbog3RHoI3oe1Jn+EqHM/wbU1aLy8M/kYYVxmZH+q+4cXlt/gmu0E 5RmA== 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=to0/oglrdrCKf5DxwkCjZQ1goRlkhYxnjsj8QSAzCfE=; b=ZAckvxhn+mS8CAiIlphtvzNw1Qf7oI8KxVd102RVU+IzYvAiF6fyx785PpuMKWPwT0 6ZIVY1wXZhqHPHZtjOFl3/5bE0AZD++jpuWo8r2JQQB9xeJSNJmul+rc6+osdQof1bUn Xy4nF3hympC8ipLZTxzwX2mYpMmzLf2tAZjlMBTPscdKo42+2RNEHQ0rL8kJzfOxBGkB lDuOQy0/svXkrUHnqClCMkHrnDi2QMc+zoXz++OGZKWN+Aic4IoFsmC6j/5UKwmzKdw9 PKHylO65pX8Oe67k2M78wxRIHOLf9553SQQ8gNXCvh60n4utMXwDYTY1mHbmrbeoFxpl 54nw== X-Gm-Message-State: APjAAAVzAjJBUIsp43/yu5glgfnj6zi2MbKz+gwrs6kL1DTP4Mx0Gq1e yVMeZPzMIWS80cMxeyG4/m7WEjBo X-Google-Smtp-Source: APXvYqzGWkwZxpd1BcCUem58jwAIr0fN+6YUqAS1ZGbUbaPrZN5aaj3nEmAUz/3igfGROUOl3uqjSg== X-Received: by 2002:adf:e452:: with SMTP id t18mr12673379wrm.0.1565985465429; Fri, 16 Aug 2019 12:57:45 -0700 (PDT) Received: from ?IPv6:2003:ea:8f2f:3200:4112:e131:7f21:ec09? (p200300EA8F2F32004112E1317F21EC09.dip0.t-ipconnect.de. [2003:ea:8f2f:3200:4112:e131:7f21:ec09]) by smtp.googlemail.com with ESMTPSA id r16sm14143581wrc.81.2019.08.16.12.57.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Aug 2019 12:57:44 -0700 (PDT) Subject: [PATCH net-next 2/2] net: phy: realtek: support NBase-T MMD EEE registers on RTL8125 From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <234b7424-8df8-354c-bfca-563d3a07fcc6@gmail.com> Date: Fri, 16 Aug 2019 21:57:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Emulate the 802.3bz MMD EEE registers for 2.5Gbps EEE on RTL8125. Signed-off-by: Heiner Kallweit --- drivers/net/phy/realtek.c | 45 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index fa662099f..677c45985 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -305,6 +305,47 @@ static int rtlgen_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, return ret; } +static int rtl8125_read_mmd(struct phy_device *phydev, int devnum, u16 regnum) +{ + int ret = rtlgen_read_mmd(phydev, devnum, regnum); + + if (ret != -EOPNOTSUPP) + return ret; + + if (devnum == MDIO_MMD_PCS && regnum == MDIO_PCS_EEE_ABLE2) { + rtl821x_write_page(phydev, 0xa6e); + ret = __phy_read(phydev, 0x16); + rtl821x_write_page(phydev, 0); + } else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) { + rtl821x_write_page(phydev, 0xa6d); + ret = __phy_read(phydev, 0x12); + rtl821x_write_page(phydev, 0); + } else if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_LPABLE2) { + rtl821x_write_page(phydev, 0xa6d); + ret = __phy_read(phydev, 0x10); + rtl821x_write_page(phydev, 0); + } + + return ret; +} + +static int rtl8125_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, + u16 val) +{ + int ret = rtlgen_write_mmd(phydev, devnum, regnum, val); + + if (ret != -EOPNOTSUPP) + return ret; + + if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV2) { + rtl821x_write_page(phydev, 0xa6d); + ret = __phy_write(phydev, 0x12, val); + rtl821x_write_page(phydev, 0); + } + + return ret; +} + static int rtl8125_get_features(struct phy_device *phydev) { int val; @@ -473,8 +514,8 @@ static struct phy_driver realtek_drvs[] = { .resume = genphy_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, - .read_mmd = rtlgen_read_mmd, - .write_mmd = rtlgen_write_mmd, + .read_mmd = rtl8125_read_mmd, + .write_mmd = rtl8125_write_mmd, }, { PHY_ID_MATCH_EXACT(0x001cc961), .name = "RTL8366RB Gigabit Ethernet",