diff mbox series

[11/11] net/ngbe: add YT PHY fiber mode autoneg 100M support

Message ID 20230928094758.1076236-12-jiawenwu@trustnetic.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series Wanguxn NICs fixes and supports |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/iol-sample-apps-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS

Commit Message

Jiawen Wu Sept. 28, 2023, 9:47 a.m. UTC 
  Support auto-neg 100M for YT PHY fiber mode.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 doc/guides/rel_notes/release_23_11.rst |  4 ++
 drivers/net/ngbe/base/ngbe_phy_yt.c    | 66 +++++++++++++++++++-------
 2 files changed, 52 insertions(+), 18 deletions(-)

Comments

Ferruh Yigit Sept. 29, 2023, 1:33 p.m. UTC | #1 
On 9/28/2023 10:47 AM, Jiawen Wu wrote:
> Support auto-neg 100M for YT PHY fiber mode.
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  doc/guides/rel_notes/release_23_11.rst |  4 ++
>  drivers/net/ngbe/base/ngbe_phy_yt.c    | 66 +++++++++++++++++++-------
>  2 files changed, 52 insertions(+), 18 deletions(-)
> 
> diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst
> index 9746809a66..578900f504 100644
> --- a/doc/guides/rel_notes/release_23_11.rst
> +++ b/doc/guides/rel_notes/release_23_11.rst
> @@ -41,6 +41,10 @@ DPDK Release 23.11
>  New Features
>  ------------
>  
> +* **Updated Wangxun ngbe driver.**
> +
> +  * Added 100M and auto-neg support in YT PHY fiber mode.
> +
>

This is added into section comment, moved to proper location while merging.
diff mbox series

Patch

diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst
index 9746809a66..578900f504 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -41,6 +41,10 @@  DPDK Release 23.11
 New Features
 ------------
 
+* **Updated Wangxun ngbe driver.**
+
+  * Added 100M and auto-neg support in YT PHY fiber mode.
+
 .. This section should contain new features added in this release.
    Sample format:
 
diff --git a/drivers/net/ngbe/base/ngbe_phy_yt.c b/drivers/net/ngbe/base/ngbe_phy_yt.c
index 754faadd6a..ea313cd9a5 100644
--- a/drivers/net/ngbe/base/ngbe_phy_yt.c
+++ b/drivers/net/ngbe/base/ngbe_phy_yt.c
@@ -205,38 +205,68 @@  s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
 		hw->phy.set_phy_power(hw, true);
 	} else if ((value & YT_CHIP_MODE_MASK) == YT_CHIP_MODE_SEL(1)) {
 		/* fiber to rgmii */
-		hw->phy.autoneg_advertised |= NGBE_LINK_SPEED_1GB_FULL;
+		if (!hw->mac.autoneg) {
+			switch (speed) {
+			case NGBE_LINK_SPEED_1GB_FULL:
+				value = NGBE_LINK_SPEED_1GB_FULL;
+				break;
+			case NGBE_LINK_SPEED_100M_FULL:
+				value = NGBE_LINK_SPEED_100M_FULL;
+				break;
+			default:
+				value = NGBE_LINK_SPEED_1GB_FULL;
+				break;
+			}
+			hw->phy.autoneg_advertised |= value;
+			goto skip_an_fiber;
+		}
 
-		/* RGMII_Config1 : Config rx and tx training delay */
-		value = YT_RGMII_CONF1_RXDELAY |
-			YT_RGMII_CONF1_TXDELAY_FE |
-			YT_RGMII_CONF1_TXDELAY;
+		value = 0;
+		if (speed & NGBE_LINK_SPEED_1GB_FULL)
+			hw->phy.autoneg_advertised |= NGBE_LINK_SPEED_1GB_FULL;
+		if (speed & NGBE_LINK_SPEED_100M_FULL)
+			hw->phy.autoneg_advertised |= NGBE_LINK_SPEED_100M_FULL;
+
+skip_an_fiber:
 		rte_spinlock_lock(&hw->phy_lock);
-		ngbe_write_phy_reg_ext_yt(hw, YT_RGMII_CONF1, 0, value);
-		value = YT_CHIP_MODE_SEL(1) |
-			YT_CHIP_SW_LDO_EN |
-			YT_CHIP_SW_RST;
-		ngbe_write_phy_reg_ext_yt(hw, YT_CHIP, 0, value);
+		ngbe_read_phy_reg_ext_yt(hw, YT_MISC, 0, &value);
+		if (hw->phy.autoneg_advertised & NGBE_LINK_SPEED_1GB_FULL)
+			value |= YT_MISC_RESV;
+		else if (hw->phy.autoneg_advertised & NGBE_LINK_SPEED_100M_FULL)
+			value &= ~YT_MISC_RESV;
+		ngbe_write_phy_reg_ext_yt(hw, YT_MISC, 0, value);
 
+		/* close auto sensing */
 		ngbe_read_phy_reg_sds_ext_yt(hw, YT_AUTO, 0, &value);
 		value &= ~YT_AUTO_SENSING;
 		ngbe_write_phy_reg_sds_ext_yt(hw, YT_AUTO, 0, value);
 
-		ngbe_read_phy_reg_ext_yt(hw, YT_MISC, 0, &value);
-		value |= YT_MISC_RESV;
-		ngbe_write_phy_reg_ext_yt(hw, YT_MISC, 0, value);
-
 		ngbe_read_phy_reg_ext_yt(hw, YT_CHIP, 0, &value);
 		value &= ~YT_CHIP_SW_RST;
 		ngbe_write_phy_reg_ext_yt(hw, YT_CHIP, 0, value);
 
+		/* RGMII_Config1 : Config rx and tx training delay */
+		value = YT_RGMII_CONF1_RXDELAY |
+			YT_RGMII_CONF1_TXDELAY_FE |
+			YT_RGMII_CONF1_TXDELAY;
+
+		ngbe_write_phy_reg_ext_yt(hw, YT_RGMII_CONF1, 0, value);
+		value = YT_CHIP_MODE_SEL(1) |
+			YT_CHIP_SW_LDO_EN |
+			YT_CHIP_SW_RST;
+		ngbe_write_phy_reg_ext_yt(hw, YT_CHIP, 0, value);
+
 		/* software reset */
-		if (hw->mac.autoneg)
+		if (hw->mac.autoneg) {
 			value = YT_BCR_RESET | YT_BCR_ANE | YT_BCR_RESTART_AN |
 				YT_BCR_DUPLEX | YT_BCR_SPEED_SELECT1;
-		else
-			value = YT_BCR_RESET | YT_BCR_DUPLEX |
-				YT_BCR_SPEED_SELECT1;
+		} else {
+			value = YT_BCR_RESET | YT_BCR_DUPLEX;
+			if (speed & NGBE_LINK_SPEED_1GB_FULL)
+				value |= YT_BCR_SPEED_SELECT1;
+			if (speed & NGBE_LINK_SPEED_100M_FULL)
+				value |= YT_BCR_SPEED_SELECT0;
+		}
 		hw->phy.write_reg(hw, YT_BCR, 0, value);
 		rte_spinlock_unlock(&hw->phy_lock);