From patchwork Thu Feb 21 10:23:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 158900 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp314016jaa; Thu, 21 Feb 2019 02:23:51 -0800 (PST) X-Google-Smtp-Source: AHgI3IZrzfo5I+O1XK5mCE+jOycQzmutLhkdrdcxl5Le2LG5bxWcwYQCgmzgprxzXprl32E4LMTx X-Received: by 2002:a63:e10:: with SMTP id d16mr33912015pgl.148.1550744631375; Thu, 21 Feb 2019 02:23:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550744631; cv=none; d=google.com; s=arc-20160816; b=BB9+BfMkOaq0nK/i7a7sL6N3GwzZ6az2VEJkIJgs0BYVECvPpy3I6kRYt4U9NBZK3+ Vv6hwycjlN+9LFZBCv3OgkAwNonAXaK51M1Z3YXgayMzmZ5qhWODow3d4QRLdoWOm81k R+V6prcSPSwXt4IjjPmrMll355hYqtJy49XMDSfRVksT4F1x5zAdqSrSbUaOVEwitOfD T1L3snQhSxUldfR0OMhLvYP9oOBGaUvCjoO0pqngBH/QzGAZwbkC6k2fhsITy1ToTwIh hebTbPk0gnrWryd1VLY06IBLDXBfcE7dvbsAgW9v0cutFaKqVk2SlO1g4bmPvWIGvkow 2lRg== 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=1bsMmFM2JB1csYps7sa3sofxzMSN8MK50nfmW1sWIE8=; b=zHh9PdLQvzY5CufJ6byzeu1uYtSduA5Uv+deHvMdlY2kR7d5otOrP0nnz2jNnimhxI YYwzcsOWAdrlSfb//V60CmubXw9cbCZ58LclgJ9yr14ZuivEBIWhosedMiqpRMS+vAqe 62U6bMMa+xGmXwXQEkPQ+1KtKQxq4yhVLuyauaeNnmNp+mOgC5QBqzXpd/PkSdkxe39B Hzm7TSGfU+19gJOmImz6xbFPqAnA6aN4Ob3WZDBFU0DPcLXoy7Jwahy+KXlL9J5Y9Vq8 zhpDRAsWqzBS7AJBbu3NMvm1r0hPcbg7aDJPW1I4h8cGtQt+omWcJ/vqvuvlzlhsSJ7e CTVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w4gzVfBC; 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 q13si13310767pgc.362.2019.02.21.02.23.51; Thu, 21 Feb 2019 02:23:51 -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=w4gzVfBC; 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 S1727044AbfBUKXu (ORCPT + 15 others); Thu, 21 Feb 2019 05:23:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:42602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725932AbfBUKXu (ORCPT ); Thu, 21 Feb 2019 05:23:50 -0500 Received: from localhost.localdomain (unknown [171.76.105.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 3866F214AF; Thu, 21 Feb 2019 10:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550744629; bh=Ql+DiMQVOwt/6ltC20+zIXwukIR05e3RnssodsTnkvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w4gzVfBCfKSBftEEkiexWgVgCyR4u8V38fEyByAWRZhTgm9rkgWQYDsJcgdYzFFVB zCpxvXiPThUVeTlr3hveUd9WNuihbJzuRreDIzb1lIKYowXy7SB3mNc28LabaHpdAM CgyqgsxhT2Cc6XzaicteZotGVU/qNz3uWzqj07PE= 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 , Peter Ujfalusi Subject: [PATCH net-next v4 1/2] net: phy: at803x: don't inline helpers Date: Thu, 21 Feb 2019 15:53:14 +0530 Message-Id: <20190221102315.12946-2-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221102315.12946-1-vkoul@kernel.org> References: <20190221102315.12946-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 Some helpers were declared with the "inline" function specifier. It is preferable to let the compiler pick the right optimizations, so drop the specifier for at803x_disable_rx_delay() and at803x_disable_tx_delay() Reviewed-by: Niklas Cassel Tested-by: Peter Ujfalusi Reviewed-by: Marc Gonzalez Signed-off-by: Vinod Koul --- drivers/net/phy/at803x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 8ff12938ab47..c6e7d800fd7a 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -110,13 +110,13 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg, return phy_write(phydev, AT803X_DEBUG_DATA, val); } -static inline int at803x_disable_rx_delay(struct phy_device *phydev) +static int at803x_disable_rx_delay(struct phy_device *phydev) { return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, AT803X_DEBUG_RX_CLK_DLY_EN, 0); } -static inline int at803x_disable_tx_delay(struct phy_device *phydev) +static int at803x_disable_tx_delay(struct phy_device *phydev) { return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, AT803X_DEBUG_TX_CLK_DLY_EN, 0); From patchwork Thu Feb 21 10:23:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 158901 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp314063jaa; Thu, 21 Feb 2019 02:23:54 -0800 (PST) X-Google-Smtp-Source: AHgI3IbtJ3gfD+UxNwintdnd8IS5SvwTfKhFVS0IHtw/dYFuwGQ2iyKQTw70OCrNa0aW6OeUPACs X-Received: by 2002:a63:2ad4:: with SMTP id q203mr34418858pgq.43.1550744634903; Thu, 21 Feb 2019 02:23:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550744634; cv=none; d=google.com; s=arc-20160816; b=XW94U+reYXOwDIiKLu32Lnapc9iRihgQBkV1QlbcXI0Ak/6TjIoybnNzXRybiFV0hp QWSmH8lNHSBmiaxc4U+FFP4eeO6TofbtlBPg/fysnRr8U91dEp8OENOs9vJlcT3aiI4w 83zSS6bGa3LZedNkyITM6OACPbQAlJyPJQkclcPnMxACZaUpHAJEbfQHNQf/X7yZS6gJ 7zxb88eJi+V8wDjNLkCBiLQ3tuAskmqswPGtKRECucPU0lszq2mH8SU48fMdn/Vc9N/n gXf6sbLt4k4foBbfZ0AT/nBOO0JjrsmfrQHTyV6XFva1zBYmMH8W6+ZX/JyutK3De5mQ LeRQ== 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=Dit2WulvJ1OWDZTtuAREVVF2SA1HnJL7jW+dVBCv4Jg=; b=wZDfTteDB8aJEUJY0Y//DN13ibdjcYohupCvwKRIBxHFQSaPDzXuetv/bYJHiLR3Ed swKNVg68bncxbUJLLOLfZIJIjoOsm4NWwJ1TREziiwDKgKekKTyG3w8pzeVHrjWGHqOn Ea0ltytGN879H/d+jdf4SQok91y5TGH5szqs1qeX0XxmKu6ESmJnnuYvwL9tpOmJwGvQ KtDyWA3pztfWVhN+R5xaRoLqoxJ2phpTXAhItks8x3O2Nk32pNhZCXZ7+iT7ZPs6/x+1 kQ8vq2fegYDqjBgXhK27OCpQQDKBBRZl5popyoqYQMkJeGhgNHi1FEVbxQlnkK+4LDLJ UUlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sHaHz9wv; 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 q13si13310767pgc.362.2019.02.21.02.23.54; Thu, 21 Feb 2019 02:23:54 -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=sHaHz9wv; 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 S1727515AbfBUKXx (ORCPT + 15 others); Thu, 21 Feb 2019 05:23:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:42682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727457AbfBUKXx (ORCPT ); Thu, 21 Feb 2019 05:23:53 -0500 Received: from localhost.localdomain (unknown [171.76.105.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 003EF20855; Thu, 21 Feb 2019 10:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550744633; bh=kqHd+R7AAxtsHZOr8BvpbLO3VlnFcBbCEilKEFol7dE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sHaHz9wvo7bTWCcbL5qyguvNmc9qrPKPSWAhZwICSdLNsgmL0uFT8vTnBK4QiL4EL +cSgw0DH66QXf84SXQrFZ7Cx+UyM7RMlZPbvV8BnBw9ZCMTLlRFIDQKciS454WQSei fGU8Zz6W4T8Pwvf3AGbaEJ4wGbtRemE9qs8sdrN4= 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 , Peter Ujfalusi Subject: [PATCH net-next v4 2/2] net: phy: at803x: disable delay only for RGMII mode Date: Thu, 21 Feb 2019 15:53:15 +0530 Message-Id: <20190221102315.12946-3-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221102315.12946-1-vkoul@kernel.org> References: <20190221102315.12946-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 whereas 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 Reviewed-by: Niklas Cassel Tested-by: Peter Ujfalusi Signed-off-by: Vinod Koul --- drivers/net/phy/at803x.c | 53 +++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index c6e7d800fd7a..a37532aac4b4 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,42 @@ 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 RX and TX delay default is: + * after HW reset: RX delay enabled and TX delay disabled + * after SW reset: RX delay enabled, while TX delay retains the + * value before reset. + * + * So let's first disable the RX and TX delays in PHY and enable + * them based on the mode selected (this also takes care of RGMII + * mode where we expect delays to be disabled) + */ + + 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)