From: "Nuno Sá" <noname.nuno@gmail.com>
To: Vincent Whitchurch <vincent.whitchurch@axis.com>,
Michael Hennerich <michael.hennerich@analog.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@axis.com
Subject: Re: [PATCH net-next] net: phy: adin: allow control of Fast Link Down
Date: Tue, 28 Nov 2023 10:09:24 +0100 [thread overview]
Message-ID: <f40f9c163f094a60443516f1744c8d09b4dc10ca.camel@gmail.com> (raw)
In-Reply-To: <20231127-adin-fld-v1-1-797f6423fd48@axis.com>
On Mon, 2023-11-27 at 16:31 +0100, Vincent Whitchurch wrote:
> Add support to allow Fast Link Down (aka "Enhanced link detection") to
> be controlled via the ETHTOOL_PHY_FAST_LINK_DOWN tunable. These PHYs
> have this feature enabled by default.
>
> Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
> ---
LGTM,
Acked-by: Nuno Sa <nuno.sa@analog.com>
Thanks!
- Nuno Sá
> drivers/net/phy/adin.c | 53
> ++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
> diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
> index 134637584a83..2e1a46e121d9 100644
> --- a/drivers/net/phy/adin.c
> +++ b/drivers/net/phy/adin.c
> @@ -68,6 +68,24 @@
> #define ADIN1300_EEE_CAP_REG 0x8000
> #define ADIN1300_EEE_ADV_REG 0x8001
> #define ADIN1300_EEE_LPABLE_REG 0x8002
> +
> +#define ADIN1300_FLD_EN_REG 0x8E27
> +#define ADIN1300_FLD_PCS_ERR_100_EN BIT(7)
> +#define ADIN1300_FLD_PCS_ERR_1000_EN BIT(6)
> +#define ADIN1300_FLD_SLCR_OUT_STUCK_100_EN BIT(5)
> +#define ADIN1300_FLD_SLCR_OUT_STUCK_1000_EN BIT(4)
> +#define ADIN1300_FLD_SLCR_IN_ZDET_100_EN BIT(3)
> +#define ADIN1300_FLD_SLCR_IN_ZDET_1000_EN BIT(2)
> +#define ADIN1300_FLD_SLCR_IN_INVLD_100_EN BIT(1)
> +#define ADIN1300_FLD_SLCR_IN_INVLD_1000_EN BIT(0)
> +/* These bits are the ones which are enabled by default. */
> +#define ADIN1300_FLD_EN_ON \
> + (ADIN1300_FLD_SLCR_OUT_STUCK_100_EN | \
> + ADIN1300_FLD_SLCR_OUT_STUCK_1000_EN | \
> + ADIN1300_FLD_SLCR_IN_ZDET_100_EN | \
> + ADIN1300_FLD_SLCR_IN_ZDET_1000_EN | \
> + ADIN1300_FLD_SLCR_IN_INVLD_1000_EN)
> +
> #define ADIN1300_CLOCK_STOP_REG 0x9400
> #define ADIN1300_LPI_WAKE_ERR_CNT_REG 0xa000
>
> @@ -416,6 +434,37 @@ static int adin_set_edpd(struct phy_device *phydev, u16
> tx_interval)
> val);
> }
>
> +static int adin_get_fast_down(struct phy_device *phydev, u8 *msecs)
> +{
> + int reg;
> +
> + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_FLD_EN_REG);
> + if (reg < 0)
> + return reg;
> +
> + if (reg & ADIN1300_FLD_EN_ON)
> + *msecs = ETHTOOL_PHY_FAST_LINK_DOWN_ON;
> + else
> + *msecs = ETHTOOL_PHY_FAST_LINK_DOWN_OFF;
> +
> + return 0;
> +}
> +
> +static int adin_set_fast_down(struct phy_device *phydev, const u8 *msecs)
> +{
> + if (*msecs == ETHTOOL_PHY_FAST_LINK_DOWN_ON)
> + return phy_set_bits_mmd(phydev, MDIO_MMD_VEND1,
> + ADIN1300_FLD_EN_REG,
> + ADIN1300_FLD_EN_ON);
> +
> + if (*msecs == ETHTOOL_PHY_FAST_LINK_DOWN_OFF)
> + return phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1,
> + ADIN1300_FLD_EN_REG,
> + ADIN1300_FLD_EN_ON);
> +
> + return -EINVAL;
> +}
> +
> static int adin_get_tunable(struct phy_device *phydev,
> struct ethtool_tunable *tuna, void *data)
> {
> @@ -424,6 +473,8 @@ static int adin_get_tunable(struct phy_device *phydev,
> return adin_get_downshift(phydev, data);
> case ETHTOOL_PHY_EDPD:
> return adin_get_edpd(phydev, data);
> + case ETHTOOL_PHY_FAST_LINK_DOWN:
> + return adin_get_fast_down(phydev, data);
> default:
> return -EOPNOTSUPP;
> }
> @@ -437,6 +488,8 @@ static int adin_set_tunable(struct phy_device *phydev,
> return adin_set_downshift(phydev, *(const u8 *)data);
> case ETHTOOL_PHY_EDPD:
> return adin_set_edpd(phydev, *(const u16 *)data);
> + case ETHTOOL_PHY_FAST_LINK_DOWN:
> + return adin_set_fast_down(phydev, data);
> default:
> return -EOPNOTSUPP;
> }
>
> ---
> base-commit: e1df5202e879bce09845ac62bae30206e1edfb80
> change-id: 20231127-adin-fld-c072c3b79a5a
>
> Best regards,
next prev parent reply other threads:[~2023-11-28 9:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 15:31 [PATCH net-next] net: phy: adin: allow control of Fast Link Down Vincent Whitchurch
2023-11-28 9:09 ` Nuno Sá [this message]
2023-11-28 20:18 ` Andrew Lunn
2023-11-28 20:23 ` Andrew Lunn
2023-11-30 4:10 ` patchwork-bot+netdevbpf
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=f40f9c163f094a60443516f1744c8d09b4dc10ca.camel@gmail.com \
--to=noname.nuno@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kernel@axis.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=michael.hennerich@analog.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=vincent.whitchurch@axis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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