From: "Russell King (Oracle)" <linux@armlinux•org.uk>
To: Choong Yong Liang <yong.liang.choong@linux•intel.com>
Cc: "Rajneesh Bhardwaj" <irenic.rajneesh@gmail•com>,
"David E Box" <david.e.box@linux•intel.com>,
"Hans de Goede" <hdegoede@redhat•com>,
"Mark Gross" <markgross@kernel•org>,
"Jose Abreu" <Jose.Abreu@synopsys•com>,
"Andrew Lunn" <andrew@lunn•ch>,
"Heiner Kallweit" <hkallweit1@gmail•com>,
"David S . Miller" <davem@davemloft•net>,
"Eric Dumazet" <edumazet@google•com>,
"Jakub Kicinski" <kuba@kernel•org>,
"Paolo Abeni" <pabeni@redhat•com>,
"Marek Behún" <kabel@kernel•org>,
"Jean Delvare" <jdelvare@suse•com>,
"Guenter Roeck" <linux@roeck-us•net>,
"Giuseppe Cavallaro" <peppe.cavallaro@st•com>,
"Alexandre Torgue" <alexandre.torgue@foss•st.com>,
"Jose Abreu" <joabreu@synopsys•com>,
"Maxime Coquelin" <mcoquelin.stm32@gmail•com>,
"Richard Cochran" <richardcochran@gmail•com>,
"Philipp Zabel" <p.zabel@pengutronix•de>,
"Alexei Starovoitov" <ast@kernel•org>,
"Daniel Borkmann" <daniel@iogearbox•net>,
"Jesper Dangaard Brouer" <hawk@kernel•org>,
"John Fastabend" <john.fastabend@gmail•com>,
"Wong Vee Khee" <veekhee@apple•com>,
"Jon Hunter" <jonathanh@nvidia•com>,
"Jesse Brandeburg" <jesse.brandeburg@intel•com>,
"Revanth Kumar Uppala" <ruppala@nvidia•com>,
"Shenwei Wang" <shenwei.wang@nxp•com>,
"Andrey Konovalov" <andrey.konovalov@linaro•org>,
"Jochen Henneberg" <jh@henneberg-systemdesign•com>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-stm32@st-md-mailman•stormreply.com,
linux-arm-kernel@lists•infradead.org,
platform-driver-x86@vger•kernel.org, linux-hwmon@vger•kernel.org,
bpf@vger•kernel.org, "Voon Wei Feng" <weifeng.voon@intel•com>,
"Tan Tee Min" <tee.min.tan@linux•intel.com>,
"Michael Sit Wei Hong" <michael.wei.hong.sit@intel•com>,
"Lai Peter Jun Ann" <jun.ann.lai@intel•com>
Subject: Re: [PATCH net-next v2 3/5] net: phy: update in-band AN mode when changing interface by PHY driver
Date: Fri, 4 Aug 2023 10:02:35 +0100 [thread overview]
Message-ID: <ZMy+q84hVAbTQIk5@shell.armlinux.org.uk> (raw)
In-Reply-To: <20230804084527.2082302-4-yong.liang.choong@linux.intel.com>
On Fri, Aug 04, 2023 at 04:45:25PM +0800, Choong Yong Liang wrote:
> From: "Tan, Tee Min" <tee.min.tan@linux•intel.com>
>
> Add cur_link_an_mode into phy_device struct for PHY drivers to
> communicate the in-band AN mode setting with phylink framework.
>
> As there is a mechanism in PHY drivers to switch the PHY interface
> between SGMII and 2500BaseX according to link speed. In this case,
> the in-band AN mode should be switching based on the PHY interface
> as well, if the PHY interface has been changed/updated by PHY driver.
>
> For e.g., disable in-band AN in 2500BaseX mode, or enable in-band AN
> back for SGMII mode (10/100/1000Mbps).
>
> Signed-off-by: Tan, Tee Min <tee.min.tan@linux•intel.com>
> Signed-off-by: Choong Yong Liang <yong.liang.choong@linux•intel.com>
> ---
> drivers/net/phy/marvell10g.c | 6 ++++++
> drivers/net/phy/phylink.c | 4 ++++
> include/linux/phy.h | 3 +++
> 3 files changed, 13 insertions(+)
>
> diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
> index d4bb90d76881..a9df19278618 100644
> --- a/drivers/net/phy/marvell10g.c
> +++ b/drivers/net/phy/marvell10g.c
> @@ -30,6 +30,7 @@
> #include <linux/phy.h>
> #include <linux/sfp.h>
> #include <linux/netdevice.h>
> +#include <linux/phylink.h>
>
> #define MV_PHY_ALASKA_NBT_QUIRK_MASK 0xfffffffe
> #define MV_PHY_ALASKA_NBT_QUIRK_REV (MARVELL_PHY_ID_88X3310 | 0xa)
> @@ -946,6 +947,9 @@ static void mv3310_update_interface(struct phy_device *phydev)
> * xaui / rxaui modes according to the speed.
> * Florian suggests setting phydev->interface to communicate this to the
> * MAC. Only do this if we are already in one of the above modes.
> + * In-band Auto-negotiation is not supported in 2500BASE-X.
> + * Setting phydev->cur_link_an_mode to communicate this to the
> + * phylink framework.
> */
> switch (phydev->speed) {
> case SPEED_10000:
> @@ -956,11 +960,13 @@ static void mv3310_update_interface(struct phy_device *phydev)
> break;
> case SPEED_2500:
> phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
> + phydev->cur_link_an_mode = MLO_AN_PHY;
> break;
> case SPEED_1000:
> case SPEED_100:
> case SPEED_10:
> phydev->interface = PHY_INTERFACE_MODE_SGMII;
> + phydev->cur_link_an_mode = MLO_AN_INBAND;
> break;
> default:
> break;
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index 4f1c8bb199e9..f9cbb6d7e134 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -1720,6 +1720,8 @@ static void phylink_phy_change(struct phy_device *phydev, bool up)
> pl->phy_state.pause |= MLO_PAUSE_RX;
> pl->phy_state.interface = phydev->interface;
> pl->phy_state.link = up;
> + pl->cur_link_an_mode = phydev->cur_link_an_mode;
> + pl->cfg_link_an_mode = phydev->cur_link_an_mode;
> mutex_unlock(&pl->state_mutex);
>
> phylink_run_resolve(pl);
> @@ -1824,6 +1826,8 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
> if (pl->config->mac_managed_pm)
> phy->mac_managed_pm = true;
>
> + pl->phydev->cur_link_an_mode = pl->cur_link_an_mode;
I am really not happy with exposing phylink's AN mode into phylib.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
next prev parent reply other threads:[~2023-08-04 9:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 8:45 [PATCH net-next v2 0/5] TSN auto negotiation between 1G and 2.5G Choong Yong Liang
2023-08-04 8:45 ` [PATCH net-next v2 1/5] platform/x86: intel_pmc_core: Add IPC mailbox accessor function and add SoC register access Choong Yong Liang
2023-08-07 11:02 ` Hans de Goede
2023-08-10 16:36 ` David E. Box
2023-08-04 8:45 ` [PATCH net-next v2 2/5] net: pcs: xpcs: combine C37 SGMII AN and 2500BASEX for Intel mGbE controller Choong Yong Liang
2023-08-04 8:45 ` [PATCH net-next v2 3/5] net: phy: update in-band AN mode when changing interface by PHY driver Choong Yong Liang
2023-08-04 9:02 ` Russell King (Oracle) [this message]
2023-08-10 9:23 ` Choong Yong Liang
2023-08-04 8:45 ` [PATCH net-next v2 4/5] net: stmmac: enable Intel mGbE 1G/2.5G auto-negotiation support Choong Yong Liang
2023-08-04 8:45 ` [PATCH net-next v2 5/5] stmmac: intel: Add 1G/2.5G auto-negotiation support for ADL-N Choong Yong Liang
2023-08-04 12:04 ` [PATCH net-next v2 0/5] TSN auto negotiation between 1G and 2.5G Andrew Lunn
2023-08-10 9:52 ` Choong Yong Liang
2023-09-21 12:25 ` Choong Yong Liang
2023-09-21 13:21 ` Andrew Lunn
2023-09-21 14:12 ` Russell King (Oracle)
2023-09-21 14:41 ` Andrew Lunn
2023-09-21 14:55 ` Russell King (Oracle)
2024-01-29 13:11 ` Choong Yong Liang
2023-09-21 13:39 ` Russell King (Oracle)
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=ZMy+q84hVAbTQIk5@shell.armlinux.org.uk \
--to=linux@armlinux$(echo .)org.uk \
--cc=Jose.Abreu@synopsys$(echo .)com \
--cc=alexandre.torgue@foss$(echo .)st.com \
--cc=andrew@lunn$(echo .)ch \
--cc=andrey.konovalov@linaro$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=david.e.box@linux$(echo .)intel.com \
--cc=edumazet@google$(echo .)com \
--cc=hawk@kernel$(echo .)org \
--cc=hdegoede@redhat$(echo .)com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=irenic.rajneesh@gmail$(echo .)com \
--cc=jdelvare@suse$(echo .)com \
--cc=jesse.brandeburg@intel$(echo .)com \
--cc=jh@henneberg-systemdesign$(echo .)com \
--cc=joabreu@synopsys$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=jonathanh@nvidia$(echo .)com \
--cc=jun.ann.lai@intel$(echo .)com \
--cc=kabel@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-hwmon@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-stm32@st-md-mailman$(echo .)stormreply.com \
--cc=linux@roeck-us$(echo .)net \
--cc=markgross@kernel$(echo .)org \
--cc=mcoquelin.stm32@gmail$(echo .)com \
--cc=michael.wei.hong.sit@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=pabeni@redhat$(echo .)com \
--cc=peppe.cavallaro@st$(echo .)com \
--cc=platform-driver-x86@vger$(echo .)kernel.org \
--cc=richardcochran@gmail$(echo .)com \
--cc=ruppala@nvidia$(echo .)com \
--cc=shenwei.wang@nxp$(echo .)com \
--cc=tee.min.tan@linux$(echo .)intel.com \
--cc=veekhee@apple$(echo .)com \
--cc=weifeng.voon@intel$(echo .)com \
--cc=yong.liang.choong@linux$(echo .)intel.com \
/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