From patchwork Wed May 8 21:51:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 1097246 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="EUGBa/bC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44zqvh1RGGz9s7h for ; Thu, 9 May 2019 07:52:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728613AbfEHVw1 (ORCPT ); Wed, 8 May 2019 17:52:27 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:42920 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726837AbfEHVw1 (ORCPT ); Wed, 8 May 2019 17:52:27 -0400 Received: by mail-lj1-f194.google.com with SMTP id 188so207146ljf.9; Wed, 08 May 2019 14:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ce9SVTx37srshlbtpi0Hb0qG++vxFook/tLW3MBzfkQ=; b=EUGBa/bCvTdC4VNOvz1rkrBb2Gwa5KHUC8R0B2eGI7S/2dXr9BR07XV86zUZKeFEBz 9X/uasgC+Kkbo5/azf1SnENbU9C08wzZGUkowvGpT6W0W7Rs3oMAJpGAaiZi/ws1LQAF NihI9KniVMMBklTTRSwRqZ4mnfvHpE/JXZsmXFbEAKANxZe9p9yu9unDmY28pbcJcW9H Iw7l7Ot1uy4+RE8Qw22sFSKbIisuqL00t6bCUrrg9hYb5kdlP2vCnfFBMcYwliWfu7jP EDnHxABSqkDMXWXobVs1sWkqNFwRJdHguz4YxJDb9DLeaBfkTRlei6+IM1HNNvXjXaSf k7aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ce9SVTx37srshlbtpi0Hb0qG++vxFook/tLW3MBzfkQ=; b=qHbE4f+N7MSCXPgmpCENB+e0sy8G+58OTYp8HwtubH+xRfgWFEIEX+DccJ0t7d01ei jGc5KTarpvg2QVZgpe5LfXegokQ4Ho/dcVlDBe28hCO7KlSIaQdcAZ+77/Q7gNgN1TD1 967hTIemf/Qoiz9nCObSETjER19wo2f+6INE1pHfM2q0HAVMSV/F1jMzX1o4/gzjr8KW HgEhm4pKhz65yzsW1d8XssJY0anBdDtiDoyNh+WrcAJBFWf2X6/lMWNPBYc7cxux6MWw VOKzRo9dlHqNu5BGTLZNTX4v3At7e+q64+3XQ5CPTxbOlWF9YqYvpibY1Bq30/tXJ5Ym NlIw== X-Gm-Message-State: APjAAAU5s89sueW1c0rGrm8jgjK2ZXD3zEFIXOInMmKSbsaOQqCG3NB/ Xtj363UC+oQtQpMZ046Cebc= X-Google-Smtp-Source: APXvYqzEA88d3HUMmOjd7XrDC2woinUpAtQFkfaf28bs4jGQuIolYfrxMJDEJErzmIggxIthbmwsOQ== X-Received: by 2002:a2e:90cc:: with SMTP id o12mr62371ljg.133.1557352344143; Wed, 08 May 2019 14:52:24 -0700 (PDT) Received: from localhost.localdomain ([5.164.217.122]) by smtp.gmail.com with ESMTPSA id l5sm28279lfh.70.2019.05.08.14.52.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 14:52:23 -0700 (PDT) From: Serge Semin To: Vladimir Oltean , Martin Blumenstingl , Andrew Lunn , Florian Fainelli , Heiner Kallweit , "David S. Miller" Cc: Serge Semin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/2] net: phy: realtek: Add rtl8211e rx/tx delays config Date: Thu, 9 May 2019 00:51:15 +0300 Message-Id: <20190508215115.19802-2-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508215115.19802-1-fancer.lancer@gmail.com> References: <20190508215115.19802-1-fancer.lancer@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are two chip pins named TXDLY and RXDLY which actually adds the 2ns delays to TXC and RXC for TXD/RXD latching. Alas this is the only documented info regarding the RGMII timing control configurations the PHY provides. It turns out the same settings can be setup via MDIO registers hidden in the extension pages layout. Particularly the extension page 0xa4 provides a register 0x1c, which bits 1 and 2 control the described delays. They are used to implement the "rgmii-{id,rxid,txid}" phy-mode. The hidden RGMII configs register utilization was found in the rtl8211e U-boot driver: https://elixir.bootlin.com/u-boot/v2019.01/source/drivers/net/phy/realtek.c#L99 There is also a freebsd-folks discussion regarding this register: https://reviews.freebsd.org/D13591 It confirms that the register bits field must control the so called configuration pins described in the table 12-13 of the official PHY datasheet: 8:6 = PHY Address 5:4 = Auto-Negotiation 3 = Interface Mode Select 2 = RX Delay 1 = TX Delay 0 = SELRGV Reviewed-by: Andrew Lunn Signed-off-by: Serge Semin --- Changelog v2 - Disable delays for rgmii mode and leave them as is for the rest of the modes. - Remove genphy_config_init() invocation. It's redundant for rtl8211e phy. - Fix confused return value checking of extended-page selector call. - Fix commit message typos. Changelog v3 - Add Andrew' Reviewed-by tag - Initialize ret with 0 to prevent the "may be used uninitialized" warning. Changelog v4 - Rebase onto net-next --- drivers/net/phy/realtek.c | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index d6a10f323117..cfbc0ca61123 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -23,11 +23,15 @@ #define RTL821x_INSR 0x13 +#define RTL821x_EXT_PAGE_SELECT 0x1e #define RTL821x_PAGE_SELECT 0x1f #define RTL8211F_INSR 0x1d #define RTL8211F_TX_DELAY BIT(8) +#define RTL8211E_TX_DELAY BIT(1) +#define RTL8211E_RX_DELAY BIT(2) +#define RTL8211E_MODE_MII_GMII BIT(3) #define RTL8201F_ISR 0x1e #define RTL8201F_IER 0x13 @@ -167,6 +171,52 @@ static int rtl8211f_config_init(struct phy_device *phydev) return phy_modify_paged(phydev, 0xd08, 0x11, RTL8211F_TX_DELAY, val); } +static int rtl8211e_config_init(struct phy_device *phydev) +{ + int ret = 0, oldpage; + u16 val; + + /* enable TX/RX delay for rgmii-* modes, and disable them for rgmii. */ + switch (phydev->interface) { + case PHY_INTERFACE_MODE_RGMII: + val = 0; + break; + case PHY_INTERFACE_MODE_RGMII_ID: + val = RTL8211E_TX_DELAY | RTL8211E_RX_DELAY; + break; + case PHY_INTERFACE_MODE_RGMII_RXID: + val = RTL8211E_RX_DELAY; + break; + case PHY_INTERFACE_MODE_RGMII_TXID: + val = RTL8211E_TX_DELAY; + break; + default: /* the rest of the modes imply leaving delays as is. */ + return 0; + } + + /* According to a sample driver there is a 0x1c config register on the + * 0xa4 extension page (0x7) layout. It can be used to disable/enable + * the RX/TX delays otherwise controlled by RXDLY/TXDLY pins. It can + * also be used to customize the whole configuration register: + * 8:6 = PHY Address, 5:4 = Auto-Negotiation, 3 = Interface Mode Select, + * 2 = RX Delay, 1 = TX Delay, 0 = SELRGV (see original PHY datasheet + * for details). + */ + oldpage = phy_select_page(phydev, 0x7); + if (oldpage < 0) + goto err_restore_page; + + ret = phy_write(phydev, RTL821x_EXT_PAGE_SELECT, 0xa4); + if (ret) + goto err_restore_page; + + ret = phy_modify(phydev, 0x1c, RTL8211E_TX_DELAY | RTL8211E_RX_DELAY, + val); + +err_restore_page: + return phy_restore_page(phydev, oldpage, ret); +} + static int rtl8211b_suspend(struct phy_device *phydev) { phy_write(phydev, MII_MMD_DATA, BIT(9)); @@ -239,6 +289,7 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc915), .name = "RTL8211E Gigabit Ethernet", + .config_init = &rtl8211e_config_init, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211e_config_intr, .suspend = genphy_suspend, From patchwork Wed May 8 21:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 1097247 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="Lt7bJnDB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44zqw26phtz9s9y for ; Thu, 9 May 2019 07:52:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728655AbfEHVwm (ORCPT ); Wed, 8 May 2019 17:52:42 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:43259 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726837AbfEHVwm (ORCPT ); Wed, 8 May 2019 17:52:42 -0400 Received: by mail-lf1-f65.google.com with SMTP id u27so13642lfg.10; Wed, 08 May 2019 14:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d18b4qWh4HEgcu9wcn/OtecpmPx7NVhpCmeccDtOwuY=; b=Lt7bJnDBzGiz370T8FOk2I9C3A2+FarSZXJjYhRZatAdfVga39QIRPOOGVnsyGs6uP mOV4+uMPBI94/+dg2apRA2rnZV0pvKqwRRbzT2pltns/+ajxhtxu/Udjtm3T3jLIz0x5 oDLdIoHH8kywuRzSOWJyrzbq4FVnZCBmYPKLPUFZo9XhLX4Aq7BzdBpADaE5cCjQIbOu 4WYSwc43nkoLYqUBmhZEsx7nLkDjvz4nZlJ1vut4+r4rXQSRQKo7/W2ccHK92kKEP1hd eZwplAFZbCjMypEPqzJtD9kWlTPrwp+MPc6gw5WE+AU4C9CY+z8HThO5W/HGSHSNtSuE Jb+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d18b4qWh4HEgcu9wcn/OtecpmPx7NVhpCmeccDtOwuY=; b=Jy7gzXMFAInkvXj5q6mUdP4Cib8E1S9gYXlxo2CnbkDla6tyNjKMFlbq/fXX1Gkkkg ux4fKNqY91EhG8YJAmRsgV8aycdYGHB72zdY1635/q0E9YspNMmaaXckHI9FjeLkMA/Y jdnEjiX0MJFd6Elxj2j1nnmEJsq9VmO/6Gd/ySOU1yp93NffhQxiE32ye8JL9IFLIOxa JIjwJ3chwmAAQz7hy8DBhhHksW1ZXaftgq66r35Jkm49y4QPQivPHUT7qllIkLtvYAcz vtgupZW8A8NMwaBZh1XJybFZXMC8AEVHnwk8pwFoTjhwxuE4RwYGdl8OKI3LoXaCUiC0 K8YQ== X-Gm-Message-State: APjAAAVnM7CK9RB+0VzfR+DGbI5NyZnqUeYRyxQbj1HrLkDnlGiLxG3d sbDEL3bgltOM7u7OfmCXuP4= X-Google-Smtp-Source: APXvYqwE86+xTrNYoh9mO07ThJZjjH/w7wrrJMBEcGpcgybBv1dl6BSjQWtEuD9HOyG1Zt8+/h+WyA== X-Received: by 2002:a19:189:: with SMTP id 131mr237509lfb.74.1557352360316; Wed, 08 May 2019 14:52:40 -0700 (PDT) Received: from localhost.localdomain ([5.164.217.122]) by smtp.gmail.com with ESMTPSA id l5sm28279lfh.70.2019.05.08.14.52.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 14:52:39 -0700 (PDT) From: Serge Semin To: Vladimir Oltean , Martin Blumenstingl , Andrew Lunn , Florian Fainelli , Heiner Kallweit , "David S. Miller" Cc: Serge Semin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/2] net: phy: realtek: Change TX-delay setting for RGMII modes only Date: Thu, 9 May 2019 00:51:17 +0300 Message-Id: <20190508215115.19802-3-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190508215115.19802-1-fancer.lancer@gmail.com> References: <20190508215115.19802-1-fancer.lancer@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's prone to problems if delay is cleared out for other than RGMII modes. So lets set/clear the TX-delay in the config register only if actually RGMII-like interface mode is requested. This only concerns rtl8211f chips. Signed-off-by: Serge Semin --- Changelog v3 - Accept id and rxid interface mode by clearing the TX_DELAY bit in this case. Changelog v4 - Rebase onto net-next --- drivers/net/phy/realtek.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index cfbc0ca61123..761ce3b1e7bd 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -161,12 +161,23 @@ static int rtl8211c_config_init(struct phy_device *phydev) static int rtl8211f_config_init(struct phy_device *phydev) { - u16 val = 0; + u16 val; - /* 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) + /* enable TX-delay for rgmii-{id,txid}, and disable it for rgmii and + * rgmii-rxid. The RX-delay can be enabled by the external RXDLY pin. + */ + switch (phydev->interface) { + case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_RXID: + val = 0; + break; + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_TXID: val = RTL8211F_TX_DELAY; + break; + default: /* the rest of the modes imply leaving delay as is. */ + return 0; + } return phy_modify_paged(phydev, 0xd08, 0x11, RTL8211F_TX_DELAY, val); }