From: Niklas Cassel <niklas.cassel@linaro•org>
To: Vinod Koul <vkoul@kernel•org>
Cc: David S Miller <davem@davemloft•net>,
linux-arm-msm@vger•kernel.org,
Bjorn Andersson <bjorn.andersson@linaro•org>,
netdev@vger•kernel.org, Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
"Nori, Sekhar" <nsekhar@ti•com>,
Peter Ujfalusi <peter.ujfalusi@ti•com>,
Marc Gonzalez <marc.w.gonzalez@free•fr>
Subject: Re: [PATCH v2 2/2] net: phy: at803x: disable delay only for RGMII mode
Date: Mon, 18 Feb 2019 11:28:41 +0100 [thread overview]
Message-ID: <20190218102841.GB25677@centauri.lan> (raw)
In-Reply-To: <20190218101853.4290-2-vkoul@kernel.org>
On Mon, Feb 18, 2019 at 03:48:53PM +0530, Vinod Koul wrote:
> 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 <peter.ujfalusi@ti•com>
> Signed-off-by: Vinod Koul <vkoul@kernel•org>
> ---
> drivers/net/phy/at803x.c | 47 ++++++++++++++++++++++++++++++----------
> 1 file changed, 36 insertions(+), 11 deletions(-)
>
> 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)
> --
> 2.20.1
>
Reviewed-by: Niklas Cassel <niklas.cassel@linaro•org>
next prev parent reply other threads:[~2019-02-18 10:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 10:18 [PATCH v2 1/2] net: phy: at803x: dont inline helpers Vinod Koul
2019-02-18 10:18 ` [PATCH v2 2/2] net: phy: at803x: disable delay only for RGMII mode Vinod Koul
2019-02-18 10:28 ` Niklas Cassel [this message]
2019-02-18 14:40 ` Peter Ujfalusi
2019-02-18 10:28 ` [PATCH v2 1/2] net: phy: at803x: dont inline helpers Niklas Cassel
2019-02-19 0:28 ` David Miller
2019-02-19 5:02 ` Vinod Koul
2019-02-19 5:35 ` Sekhar Nori
2019-02-19 5:39 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190218102841.GB25677@centauri.lan \
--to=niklas.cassel@linaro$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=linux-arm-msm@vger$(echo .)kernel.org \
--cc=marc.w.gonzalez@free$(echo .)fr \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nsekhar@ti$(echo .)com \
--cc=peter.ujfalusi@ti$(echo .)com \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox