From patchwork Sat Dec 2 22:06:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 843946 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="vai/HAK1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yq4xh1PGdz9s7g for ; Sun, 3 Dec 2017 09:07:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752257AbdLBWHJ (ORCPT ); Sat, 2 Dec 2017 17:07:09 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:41084 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752322AbdLBWHG (ORCPT ); Sat, 2 Dec 2017 17:07:06 -0500 Received: by mail-wm0-f68.google.com with SMTP id g75so9020409wme.0 for ; Sat, 02 Dec 2017 14:07:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=acb6azYeyP0OmWvijj3LCOKNLTDj/YgKL6t/z41UiVU=; b=vai/HAK1+Tsh65gONkOEihHGYzBCOduU+8SB6m773el6Rhr/QCKZ9TxZTXwbJUYDf7 MhXpXM7D462kRlsh36r5Jm3WhD3z2D4/Q4pxv8v8PFRhi1FM6VIw+4yvfGsHST/VcoCB zuDQ961TyRiiDFXz5fYoOOSIG5bZOVvoz+pJnuqiZ9CWg7MQbFJQGsBba27t7pa8jAbP nTy00U/xTzURCfdWgF/kxZyz5haaoMqjj5KlfK8NJrsG3wDl1uSS9144KOgeTn4Iy0I/ /IGnNV/+jlzBESSEi0Er43Mcd9JW6ro2mie/wvgyk2Q7fEZoPD81hscOy275b8ExOqZ5 hVJg== 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; bh=acb6azYeyP0OmWvijj3LCOKNLTDj/YgKL6t/z41UiVU=; b=F4gbjVsPaXe4031MFnXC/QhXQvzo2xmMSfyGB3H/gs1YVWbUDhY0OM1ujhubh9Ovw1 1QQDORra5bm0fyRnxuk8n7aLWsxidWC1c1nE//wZeX2VFXqSjQlTjqKDgEi9wwKZhKDt vDXJ+5GSgZVcf4padmyovQTzJP66vbNtgjTGi3uSDCrs9B346VkwYW5yeLPUC1/X88fg 9MMi9+juoVm8tH/1hVOlhJqsD6JXUdjgjTs+7EXwmXekZSG6sRbU2TwVudbzcCvV/CwM aWYZqkxdfQUt7xohoZkAGYctgK09laS8dy+f8WuEAfqvLR1dH9lDKbr0SIcUDvTlFJPY orPg== X-Gm-Message-State: AKGB3mIpOH42qqUG1fze29M1Z2UD11JURH4LCA3JbHnSdIZGDtNv0XJs 9PV4yTr3Db1cN0m5zeOzuT2so3nD X-Google-Smtp-Source: AGs4zMZdZ4JvmVpORj6UNiah33vJHtEBchIN//q7Pxw29uoEHqMdO4ehNvDd/0tcosIbRZGzSnNw/w== X-Received: by 10.28.207.8 with SMTP id f8mr3721091wmg.30.1512252425092; Sat, 02 Dec 2017 14:07:05 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD3EE8B0450E3B0AB6D937D82.dip0.t-ipconnect.de. [2003:dc:d3ee:8b04:50e3:b0ab:6d93:7d82]) by smtp.googlemail.com with ESMTPSA id m64sm4311944wmb.10.2017.12.02.14.07.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Dec 2017 14:07:04 -0800 (PST) From: Martin Blumenstingl To: netdev@vger.kernel.org Cc: f.fainelli@gmail.com, andrew@lunn.ch, linux-amlogic@lists.infradead.org, hkallweit1@gmail.com, Shengzhou.Liu@freescale.com, jaswinder.singh@linaro.org, Martin Blumenstingl Subject: [RfC net-next 1/3] net: phy: realtek: add support for configuring the RX delay on RTL8211F Date: Sat, 2 Dec 2017 23:06:48 +0100 Message-Id: <20171202220650.23391-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171202220650.23391-1-martin.blumenstingl@googlemail.com> References: <20171202220650.23391-1-martin.blumenstingl@googlemail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On RTL8211F the RX delay can also be enabled/disabled. The overall behavior of the RX delay is similar to the behavior of the TX delay, which was already supported by the driver. The RX delay (similar to the TX delay) may be enabled using hardware pin strapping. If the MAC already configures the RX delay (if required) then the RX delay generated by the RTL8211F PHY has to be turned off. While here, update the comment regarding the TX delay why it has to be enabled or disabled within the driver. Also avoid code-duplication by extracting the code to mask/unmask bits in a paged register into a new rtl8211x_page_mask_bits helper function. Signed-off-by: Martin Blumenstingl --- drivers/net/phy/realtek.c | 55 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 5416ec5af042..d4e7f249a4bc 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -32,7 +32,10 @@ #define RTL8211F_INSR 0x1d -#define RTL8211F_TX_DELAY BIT(8) +#define RTL8211F_RX_DELAY_REG 0x15 +#define RTL8211F_RX_DELAY_EN BIT(3) +#define RTL8211F_TX_DELAY_REG 0x11 +#define RTL8211F_TX_DELAY_EN BIT(8) #define RTL8201F_ISR 0x1e #define RTL8201F_IER 0x13 @@ -74,6 +77,23 @@ static int rtl8211x_page_write(struct phy_device *phydev, u16 page, return ret; } +static int rtl8211x_page_mask_bits(struct phy_device *phydev, u16 page, + u16 address, u16 mask, u16 set) +{ + int ret; + u16 val; + + ret = rtl8211x_page_read(phydev, page, address); + if (ret < 0) + return ret; + + val = ret & 0xffff; + val &= ~mask; + val |= (set & mask); + + return rtl8211x_page_write(phydev, page, address, val); +} + static int rtl8201_ack_interrupt(struct phy_device *phydev) { int err; @@ -160,20 +180,35 @@ static int rtl8211f_config_init(struct phy_device *phydev) if (ret < 0) return ret; - ret = rtl8211x_page_read(phydev, 0xd08, 0x11); - if (ret < 0) - return ret; + /* + * enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it. + * this is needed because it can be enabled by pin strapping and + * conflict with the TX-delay configured by the MAC. + */ + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) + val = RTL8211F_TX_DELAY_EN; + else + val = 0; - val = ret & 0xffff; + ret = rtl8211x_page_mask_bits(phydev, 0xd08, RTL8211F_TX_DELAY_REG, + RTL8211F_TX_DELAY_EN, val); + if (ret) + return ret; - /* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */ + /* + * enable RX-delay for rgmii-id and rgmii-rxid, otherwise disable it. + * this is needed because it can be enabled by pin strapping and + * conflict with the RX-delay configured by the MAC. + */ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || - phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) - val |= RTL8211F_TX_DELAY; + phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) + val = RTL8211F_RX_DELAY_EN; else - val &= ~RTL8211F_TX_DELAY; + val = 0; - ret = rtl8211x_page_write(phydev, 0xd08, 0x11, val); + ret = rtl8211x_page_mask_bits(phydev, 0xd08, RTL8211F_RX_DELAY_REG, + RTL8211F_RX_DELAY_EN, val); if (ret) return ret;