From patchwork Mon Feb 18 10:18:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 158583 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2311537jaa; Mon, 18 Feb 2019 02:19:35 -0800 (PST) X-Google-Smtp-Source: AHgI3Ibt/y2vYznHTJ4Y+WynBTqAZA03NSPsb9oWQvgNlt3tSoIybXWgLYuRPJMUGLVXIBUIQuvJ X-Received: by 2002:a63:9149:: with SMTP id l70mr18167023pge.65.1550485175515; Mon, 18 Feb 2019 02:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550485175; cv=none; d=google.com; s=arc-20160816; b=s2IjApfstjnvdDMQ2NbcVC2eQIM3dbuA4JVgs03HNRu+cD+4fIsCp1rh+TzVRbiSeC lkLFkTqK9JkOlceh7HF0DyXhrElTXPpEB9kQ/kOpWup5V2jaL7qdiX1pEJ0nZjmG+AQU 2uByy+wSIYpJyKvdi1WGQzjE/o5op07zuG8nNN4KilYpDFl79Z8A1DsO/FZSR0ak/7C8 ZYl+UZ4zBdLVgHYzQ2fmZHHRuhFU1j+itL/1dkwb5lHlCr0+OPNX/jP0QPmiGs89sG+S 6+A2lTSmsxoiiPtULIbmcDz7EPYukVHVZAdnSM+xywxta4xoEZg7rOpIUc3tyL8KlZJ9 8ioQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BLV0QwZG+6nrOYFrj0gzpyzqLZ4fgKvKf7Hu7LWnZJQ=; b=rbj2JUqhSnJbHziWyGbtAz+aFuwbyRQ5thbalZECwP1h84cFnGw1g7jqSrvQYCpR3L j9ypfYbAsFplvWVM+FABhTFtdxs7h+cVT0chPdDf3+/IKJxzb9o5uvSYA9QWgjSeIcMj BRDIqAaOyVTk+gwpIabdTP8jDARGyPUlrlVaN3HKLHnhzGFujNbJmeqrQNLJrX52c0RA DXcJvbpfTuxw2FUiWbSm4IdJPEFbyF4twHLloEQgiD2po4L1ihJpvwEf2BRpEY6tTR3w pMBx0QF/dWGkZBFmOtLa4OTJzFyViQH7IOBpYSDNqMED04Eob3StSQnHBHf0rmWCGuSg RXtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tIy9l3St; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z2si13098211plk.278.2019.02.18.02.19.35; Mon, 18 Feb 2019 02:19:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tIy9l3St; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729068AbfBRKTe (ORCPT + 15 others); Mon, 18 Feb 2019 05:19:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:34794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726166AbfBRKTe (ORCPT ); Mon, 18 Feb 2019 05:19:34 -0500 Received: from localhost.localdomain (unknown [106.200.226.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FAE22175B; Mon, 18 Feb 2019 10:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550485173; bh=Fy781+TWhRN0X7yALYbCCqK1o9uwDhqc0to217CpXjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tIy9l3StqB3b3k0pDM1kWicCISnXIudRIsjqpsVb0s4cl8iQavG+jS2OsxqZA0Vfd IgPH5HySpTRYHD/QCGkJwvFrW4He8eTELNYo4OwSEwN0ukG3D+W0XSdyeKmOeTZ50a KYs/gNgLNbyj+6XEwNoHyRPBVoVxAu2us6Idj7k0= From: Vinod Koul To: David S Miller Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , netdev@vger.kernel.org, Niklas Cassel , Andrew Lunn , Florian Fainelli , "Nori, Sekhar" , Peter Ujfalusi , Marc Gonzalez Subject: [PATCH v2 2/2] net: phy: at803x: disable delay only for RGMII mode Date: Mon, 18 Feb 2019 15:48:53 +0530 Message-Id: <20190218101853.4290-2-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218101853.4290-1-vkoul@kernel.org> References: <20190218101853.4290-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Per "Documentation/devicetree/bindings/net/ethernet.txt" RGMII mode should not have delay in PHY wheras RGMII_ID and RGMII_RXID/RGMII_TXID can have delay in phy. So disable the delay only for RGMII mode and enable for other modes. Also treat the default case as disabled delays. Fixes: cd28d1d6e52e: ("net: phy: at803x: Disable phy delay for RGMII mode") Reported-by: Peter Ujfalusi Signed-off-by: Vinod Koul --- drivers/net/phy/at803x.c | 47 ++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 11 deletions(-) -- 2.20.1 Reviewed-by: Niklas Cassel diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index c6e7d800fd7a..dc1b13f7fc12 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -110,6 +110,18 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg, return phy_write(phydev, AT803X_DEBUG_DATA, val); } +static int at803x_enable_rx_delay(struct phy_device *phydev) +{ + return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0, + AT803X_DEBUG_RX_CLK_DLY_EN); +} + +static int at803x_enable_tx_delay(struct phy_device *phydev) +{ + return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0, + AT803X_DEBUG_TX_CLK_DLY_EN); +} + static int at803x_disable_rx_delay(struct phy_device *phydev) { return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, @@ -255,23 +267,36 @@ static int at803x_config_init(struct phy_device *phydev) if (ret < 0) return ret; - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID || - phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || - phydev->interface == PHY_INTERFACE_MODE_RGMII) { - ret = at803x_disable_rx_delay(phydev); + /* The hardware register default is RX and TX delay enabled, so lets + * first disable the RX and TX delays in phy and enable them based + * on the mode selected + */ + ret = at803x_disable_rx_delay(phydev); + if (ret < 0) + return ret; + ret = at803x_disable_tx_delay(phydev); + if (ret < 0) + return ret; + + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) { + /* If RGMII_ID or RGMII_RXID are specified enable RX delay, + * otherwise keep it disabled + */ + ret = at803x_enable_rx_delay(phydev); if (ret < 0) return ret; } - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID || - phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || - phydev->interface == PHY_INTERFACE_MODE_RGMII) { - ret = at803x_disable_tx_delay(phydev); - if (ret < 0) - return ret; + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) { + /* If RGMII_ID or RGMII_TXID are specified enable TX delay, + * otherwise keep it disabled + */ + ret = at803x_enable_tx_delay(phydev); } - return 0; + return ret; } static int at803x_ack_interrupt(struct phy_device *phydev)