From: Suraj Gupta <suraj.gupta2@amd.com>
To: <radhey.shyam.pandey@amd.com>, <andrew+netdev@lunn.ch>,
<davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <robh@kernel.org>, <krzk+dt@kernel.org>,
<conor+dt@kernel.org>, <michal.simek@amd.com>
Cc: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <git@amd.com>,
<harini.katakam@amd.com>
Subject: [PATCH net-next V2 2/2] net: axienet: Add support for 2500base-X only configuration.
Date: Wed, 12 Mar 2025 15:24:11 +0530 [thread overview]
Message-ID: <20250312095411.1392379-3-suraj.gupta2@amd.com> (raw)
In-Reply-To: <20250312095411.1392379-1-suraj.gupta2@amd.com>
AXI 1G/2.5G ethernet IP has following synthesis options:
1) SGMII/1000base-X only.
2) 2500base-X only.
3) dynamically switching between (1) and (2).
Add support for 2500base-X only configuration.
Co-developed-by: Harini Katakam <harini.katakam@amd.com>
Signed-off-by: Harini Katakam <harini.katakam@amd.com>
Signed-off-by: Suraj Gupta <suraj.gupta2@amd.com>
---
drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 +-
.../net/ethernet/xilinx/xilinx_axienet_main.c | 24 +++++++++++++++----
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
index 5ff742103beb..ded3e32999d5 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -274,7 +274,7 @@
#define XAE_EMMC_RX16BIT 0x01000000 /* 16 bit Rx client enable */
#define XAE_EMMC_LINKSPD_10 0x00000000 /* Link Speed mask for 10 Mbit */
#define XAE_EMMC_LINKSPD_100 0x40000000 /* Link Speed mask for 100 Mbit */
-#define XAE_EMMC_LINKSPD_1000 0x80000000 /* Link Speed mask for 1000 Mbit */
+#define XAE_EMMC_LINKSPD_1000_2500 0x80000000 /* Link Speed mask for 1000 or 2500 Mbit */
/* Bit masks for Axi Ethernet PHYC register */
#define XAE_PHYC_SGMIILINKSPEED_MASK 0xC0000000 /* SGMII link speed mask*/
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 054abf283ab3..0885ce201b0a 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -2583,6 +2583,7 @@ static struct phylink_pcs *axienet_mac_select_pcs(struct phylink_config *config,
struct axienet_local *lp = netdev_priv(ndev);
if (interface == PHY_INTERFACE_MODE_1000BASEX ||
+ interface == PHY_INTERFACE_MODE_2500BASEX ||
interface == PHY_INTERFACE_MODE_SGMII)
return &lp->pcs;
@@ -2616,8 +2617,9 @@ static void axienet_mac_link_up(struct phylink_config *config,
emmc_reg &= ~XAE_EMMC_LINKSPEED_MASK;
switch (speed) {
+ case SPEED_2500:
case SPEED_1000:
- emmc_reg |= XAE_EMMC_LINKSPD_1000;
+ emmc_reg |= XAE_EMMC_LINKSPD_1000_2500;
break;
case SPEED_100:
emmc_reg |= XAE_EMMC_LINKSPD_100;
@@ -2627,7 +2629,7 @@ static void axienet_mac_link_up(struct phylink_config *config,
break;
default:
dev_err(&ndev->dev,
- "Speed other than 10, 100 or 1Gbps is not supported\n");
+ "Speed other than 10, 100, 1Gbps or 2.5Gbps is not supported\n");
break;
}
@@ -3055,7 +3057,8 @@ static int axienet_probe(struct platform_device *pdev)
"error registering MDIO bus: %d\n", ret);
if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII ||
- lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) {
+ lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX ||
+ lp->phy_mode == PHY_INTERFACE_MODE_2500BASEX) {
np = of_parse_phandle(pdev->dev.of_node, "pcs-handle", 0);
if (!np) {
/* Deprecated: Always use "pcs-handle" for pcs_phy.
@@ -3083,8 +3086,19 @@ static int axienet_probe(struct platform_device *pdev)
lp->phylink_config.dev = &ndev->dev;
lp->phylink_config.type = PHYLINK_NETDEV;
lp->phylink_config.mac_managed_pm = true;
- lp->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |
- MAC_10FD | MAC_100FD | MAC_1000FD;
+ lp->phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE;
+
+ /* AXI 1G/2.5G ethernet IP has following synthesis options:
+ * 1) SGMII/1000base-X only.
+ * 2) 2500base-X only.
+ * 3) Dynamically switching between (1) and (2), and is not
+ * implemented in driver.
+ */
+
+ if (axienet_ior(lp, XAE_ABILITY_OFFSET) & XAE_ABILITY_2_5G)
+ lp->phylink_config.mac_capabilities |= MAC_2500FD;
+ else
+ lp->phylink_config.mac_capabilities |= MAC_10FD | MAC_100FD | MAC_1000FD;
__set_bit(lp->phy_mode, lp->phylink_config.supported_interfaces);
if (lp->switch_x_sgmii) {
--
2.25.1
next prev parent reply other threads:[~2025-03-12 9:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 9:54 [PATCH net-next V2 0/2] Add support for 2500Base-X " Suraj Gupta
2025-03-12 9:54 ` [PATCH net-next V2 1/2] dt-bindings: net: xlnx,axi-ethernet: Modify descriptions and phy-mode value to support 2500base-X " Suraj Gupta
2025-03-12 13:17 ` Rob Herring
2025-03-12 9:54 ` Suraj Gupta [this message]
2025-03-12 11:06 ` [PATCH net-next V2 2/2] net: axienet: Add support for " Dawid Osuchowski
2025-03-12 13:25 ` Andrew Lunn
2025-03-12 14:13 ` Russell King (Oracle)
2025-03-12 14:49 ` Gupta, Suraj
2025-03-12 14:58 ` Andrew Lunn
2025-03-12 15:06 ` Gupta, Suraj
2025-03-12 15:33 ` Andrew Lunn
2025-03-12 16:08 ` Gupta, Suraj
2025-03-12 19:02 ` Andrew Lunn
2025-03-12 19:40 ` Russell King (Oracle)
2025-03-12 22:10 ` Andrew Lunn
2025-03-13 3:31 ` Gupta, Suraj
2025-03-13 7:34 ` Gupta, Suraj
2025-03-13 12:47 ` Andrew Lunn
2025-03-19 18:41 ` Gupta, Suraj
2025-03-13 12:54 ` Andrew Lunn
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=20250312095411.1392379-3-suraj.gupta2@amd.com \
--to=suraj.gupta2@amd.com \
--cc=andrew+netdev@lunn.ch \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=git@amd.com \
--cc=harini.katakam@amd.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=radhey.shyam.pandey@amd.com \
--cc=robh@kernel.org \
/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
all inboxes | Powered by JetHome®