diff mbox series

[v2,17/25] net/axgbe: use definitions for mailbox commands

Message ID	20240507124305.2318-17-venkatkumar.ande@amd.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Ferruh Yigit
Headers	Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Venkat Kumar Ande <venkatkumar.ande@amd.com> To: <dev@dpdk.org> CC: <Selwin.Sebastian@amd.com>, Venkat Kumar Ande <venkatkumar.ande@amd.com> Subject: [PATCH v2 17/25] net/axgbe: use definitions for mailbox commands Date: Tue, 7 May 2024 18:12:57 +0530 Message-ID: <20240507124305.2318-17-venkatkumar.ande@amd.com> In-Reply-To: <20240507124305.2318-1-venkatkumar.ande@amd.com> References: <20240412125013.10498-1-VenkatKumar.Ande@amd.com> <20240507124305.2318-1-venkatkumar.ande@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	[v2,01/25] net/axgbe: fix mdio access for non-zero ports and CL45 PHYs \| [v2,01/25] net/axgbe: fix mdio access for non-zero ports and CL45 PHYs [v2,02/25] net/axgbe: reset link when the link never comes back [v2,03/25] net/axgbe: fix fluctuations for 1G BELFUSE SFP [v2,04/25] net/axgbe: update DMA coherency values [v2,05/25] net/axgbe: disable interrupts during device removal [v2,06/25] net/axgbe: yellow carp devices do not need rrc [v2,07/25] net/axgbe: enable PLL control for fixed PHY modes only [v2,08/25] net/axgbe: fix the SFP codes check for DAC cables [v2,09/25] net/axgbe: fix logic around active and passive cables [v2,10/25] net/axgbe: check only the minimum speed for cables [v2,11/25] net/axgbe: flow Tx Ctrl Registers are h/w version dependent [v2,12/25] net/axgbe: delay AN timeout during KR training [v2,13/25] net/axgbe: remove use of comm owned field [v2,14/25] net/axgbe: remove field of SFP diagnostic support [v2,15/25] net/axgbe: improve SFP 100Mbps auto-negotiation [v2,16/25] net/axgbe: remove unnecessary conversion to bool [v2,17/25] net/axgbe: use definitions for mailbox commands [v2,18/25] net/axgbe: add support for 10 Mbps speed [v2,19/25] net/axgbe: separate C22 and C45 transactions [v2,20/25] net/axgbe: replace mii generic macro for c45 with AXGBE [v2,21/25] net/axgbe: add 2.5GbE support to 10G BaseT mode [v2,22/25] net/axgbe: add support for Rx adaptation [v2,23/25] net/axgbe: fix the false linkup in axgbe PHY status [v2,24/25] net/axgbe: extend 10Mbps support to MAC version 21H [v2,25/25] net/axgbe: modify debug messages

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Venkat Kumar Ande May 7, 2024, 12:42 p.m. UTC

Instead of using hardcoded values, use enumerations for mailbox command
and sub commands.

Signed-off-by: Venkat Kumar Ande <venkatkumar.ande@amd.com>
---
 drivers/net/axgbe/axgbe_ethdev.h   | 25 +++++++++++++++++++++++++
 drivers/net/axgbe/axgbe_phy_impl.c | 25 +++++++++++++++----------
 2 files changed, 40 insertions(+), 10 deletions(-)

Comments

Sebastian, Selwin May 20, 2024, 10:42 a.m. UTC | #1

[AMD Official Use Only - AMD Internal Distribution Only]

Acked-by: Selwin Sebastian<selwin.sebastian@amd.com>

-----Original Message-----
From: Ande, Venkat Kumar <VenkatKumar.Ande@amd.com>
Sent: Tuesday, May 7, 2024 6:13 PM
To: dev@dpdk.org
Cc: Sebastian, Selwin <Selwin.Sebastian@amd.com>; Ande, Venkat Kumar <VenkatKumar.Ande@amd.com>
Subject: [PATCH v2 17/25] net/axgbe: use definitions for mailbox commands

Instead of using hardcoded values, use enumerations for mailbox command and sub commands.

Signed-off-by: Venkat Kumar Ande <venkatkumar.ande@amd.com>
---
 drivers/net/axgbe/axgbe_ethdev.h   | 25 +++++++++++++++++++++++++
 drivers/net/axgbe/axgbe_phy_impl.c | 25 +++++++++++++++----------
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index b9d8a4e74f..6dc1c1274b 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -231,6 +231,31 @@ enum axgbe_mdio_mode {
        AXGBE_MDIO_MODE_CL45,
 };

+enum axgbe_mb_cmd {
+       AXGBE_MB_CMD_POWER_OFF = 0,
+       AXGBE_MB_CMD_SET_1G,
+       AXGBE_MB_CMD_SET_2_5G,
+       AXGBE_MB_CMD_SET_10G_SFI,
+       AXGBE_MB_CMD_SET_10G_KR,
+       AXGBE_MB_CMD_RRC
+};
+
+enum axgbe_mb_subcmd {
+       AXGBE_MB_SUBCMD_NONE = 0,
+
+       /* 10GbE SFP subcommands */
+       AXGBE_MB_SUBCMD_ACTIVE = 0,
+       AXGBE_MB_SUBCMD_PASSIVE_1M,
+       AXGBE_MB_SUBCMD_PASSIVE_3M,
+       AXGBE_MB_SUBCMD_PASSIVE_OTHER,
+
+       /* 1GbE Mode subcommands */
+       AXGBE_MB_SUBCMD_10MBITS = 0,
+       AXGBE_MB_SUBCMD_100MBITS,
+       AXGBE_MB_SUBCMD_1G_SGMII,
+       AXGBE_MB_SUBCMD_1G_KX
+};
+
 struct axgbe_phy {
        uint32_t supported;
        uint32_t advertising;
diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
index 2620d44dfb..67a18e7c55 100644
--- a/drivers/net/axgbe/axgbe_phy_impl.c
+++ b/drivers/net/axgbe/axgbe_phy_impl.c
@@ -1219,7 +1219,7 @@ static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable)  }

 static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata,
-                                       unsigned int cmd, unsigned int sub_cmd)
+               enum axgbe_mb_cmd cmd, enum axgbe_mb_subcmd sub_cmd)
 {
        unsigned int s0 = 0;
        unsigned int wait;
@@ -1266,7 +1266,7 @@ static void axgbe_phy_rrc(struct axgbe_port *pdata)


        /* Receiver Reset Cycle */
-       axgbe_phy_perform_ratechange(pdata, 5, 0);
+       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_RRC,
+AXGBE_MB_SUBCMD_NONE);

        PMD_DRV_LOG(DEBUG, "receiver reset complete\n");  } @@ -1276,7 +1276,7 @@ static void axgbe_phy_power_off(struct axgbe_port *pdata)
        struct axgbe_phy_data *phy_data = pdata->phy_data;

        /* Power off */
-       axgbe_phy_perform_ratechange(pdata, 0, 0);
+       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_POWER_OFF,
+AXGBE_MB_SUBCMD_NONE);

        phy_data->cur_mode = AXGBE_MODE_UNKNOWN;

@@ -1291,14 +1291,18 @@ static void axgbe_phy_sfi_mode(struct axgbe_port *pdata)

        /* 10G/SFI */
        if (phy_data->sfp_cable != AXGBE_SFP_CABLE_PASSIVE) {
-               axgbe_phy_perform_ratechange(pdata, 3, 0);
+               axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+                                                       AXGBE_MB_SUBCMD_ACTIVE);
        } else {
                if (phy_data->sfp_cable_len <= 1)
-                       axgbe_phy_perform_ratechange(pdata, 3, 1);
+                       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+                                                       AXGBE_MB_SUBCMD_PASSIVE_1M);
                else if (phy_data->sfp_cable_len <= 3)
-                       axgbe_phy_perform_ratechange(pdata, 3, 2);
+                       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+                                                       AXGBE_MB_SUBCMD_PASSIVE_3M);
                else
-                       axgbe_phy_perform_ratechange(pdata, 3, 3);
+                       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+                                                       AXGBE_MB_SUBCMD_PASSIVE_OTHER);
        }

        phy_data->cur_mode = AXGBE_MODE_SFI;
@@ -1313,7 +1317,8 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata)
        axgbe_phy_set_redrv_mode(pdata);

        /* 10G/KR */
-       axgbe_phy_perform_ratechange(pdata, 4, 0);
+               axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR,
+                                               AXGBE_MB_SUBCMD_NONE);
        phy_data->cur_mode = AXGBE_MODE_KR;

        PMD_DRV_LOG(DEBUG, "10GbE KR mode set\n"); @@ -1326,7 +1331,7 @@ static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata)
        axgbe_phy_set_redrv_mode(pdata);

        /* 2.5G/KX */
-       axgbe_phy_perform_ratechange(pdata, 2, 0);
+       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_2_5G,
+AXGBE_MB_SUBCMD_NONE);
        phy_data->cur_mode = AXGBE_MODE_KX_2500;  }

@@ -1337,7 +1342,7 @@ static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata)
        axgbe_phy_set_redrv_mode(pdata);

        /* 1G/SGMII */
-       axgbe_phy_perform_ratechange(pdata, 1, 2);
+       axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_1G,
+AXGBE_MB_SUBCMD_1G_SGMII);

        phy_data->cur_mode = AXGBE_MODE_SGMII_1000;  }
--
2.34.1

diff mbox series

Patch

diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h
index b9d8a4e74f..6dc1c1274b 100644
--- a/drivers/net/axgbe/axgbe_ethdev.h
+++ b/drivers/net/axgbe/axgbe_ethdev.h
@@ -231,6 +231,31 @@  enum axgbe_mdio_mode {
 	AXGBE_MDIO_MODE_CL45,
 };
 
+enum axgbe_mb_cmd {
+	AXGBE_MB_CMD_POWER_OFF = 0,
+	AXGBE_MB_CMD_SET_1G,
+	AXGBE_MB_CMD_SET_2_5G,
+	AXGBE_MB_CMD_SET_10G_SFI,
+	AXGBE_MB_CMD_SET_10G_KR,
+	AXGBE_MB_CMD_RRC
+};
+
+enum axgbe_mb_subcmd {
+	AXGBE_MB_SUBCMD_NONE = 0,
+
+	/* 10GbE SFP subcommands */
+	AXGBE_MB_SUBCMD_ACTIVE = 0,
+	AXGBE_MB_SUBCMD_PASSIVE_1M,
+	AXGBE_MB_SUBCMD_PASSIVE_3M,
+	AXGBE_MB_SUBCMD_PASSIVE_OTHER,
+
+	/* 1GbE Mode subcommands */
+	AXGBE_MB_SUBCMD_10MBITS = 0,
+	AXGBE_MB_SUBCMD_100MBITS,
+	AXGBE_MB_SUBCMD_1G_SGMII,
+	AXGBE_MB_SUBCMD_1G_KX
+};
+
 struct axgbe_phy {
 	uint32_t supported;
 	uint32_t advertising;
diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
index 2620d44dfb..67a18e7c55 100644
--- a/drivers/net/axgbe/axgbe_phy_impl.c
+++ b/drivers/net/axgbe/axgbe_phy_impl.c
@@ -1219,7 +1219,7 @@  static void axgbe_phy_pll_ctrl(struct axgbe_port *pdata, bool enable)
 }
 
 static void axgbe_phy_perform_ratechange(struct axgbe_port *pdata,
-					unsigned int cmd, unsigned int sub_cmd)
+		enum axgbe_mb_cmd cmd, enum axgbe_mb_subcmd sub_cmd)
 {
 	unsigned int s0 = 0;
 	unsigned int wait;
@@ -1266,7 +1266,7 @@  static void axgbe_phy_rrc(struct axgbe_port *pdata)
 
 
 	/* Receiver Reset Cycle */
-	axgbe_phy_perform_ratechange(pdata, 5, 0);
+	axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_RRC, AXGBE_MB_SUBCMD_NONE);
 
 	PMD_DRV_LOG(DEBUG, "receiver reset complete\n");
 }
@@ -1276,7 +1276,7 @@  static void axgbe_phy_power_off(struct axgbe_port *pdata)
 	struct axgbe_phy_data *phy_data = pdata->phy_data;
 
 	/* Power off */
-	axgbe_phy_perform_ratechange(pdata, 0, 0);
+	axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_POWER_OFF, AXGBE_MB_SUBCMD_NONE);
 
 	phy_data->cur_mode = AXGBE_MODE_UNKNOWN;
 
@@ -1291,14 +1291,18 @@  static void axgbe_phy_sfi_mode(struct axgbe_port *pdata)
 
 	/* 10G/SFI */
 	if (phy_data->sfp_cable != AXGBE_SFP_CABLE_PASSIVE) {
-		axgbe_phy_perform_ratechange(pdata, 3, 0);
+		axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+							AXGBE_MB_SUBCMD_ACTIVE);
 	} else {
 		if (phy_data->sfp_cable_len <= 1)
-			axgbe_phy_perform_ratechange(pdata, 3, 1);
+			axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+							AXGBE_MB_SUBCMD_PASSIVE_1M);
 		else if (phy_data->sfp_cable_len <= 3)
-			axgbe_phy_perform_ratechange(pdata, 3, 2);
+			axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+							AXGBE_MB_SUBCMD_PASSIVE_3M);
 		else
-			axgbe_phy_perform_ratechange(pdata, 3, 3);
+			axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_SFI,
+							AXGBE_MB_SUBCMD_PASSIVE_OTHER);
 	}
 
 	phy_data->cur_mode = AXGBE_MODE_SFI;
@@ -1313,7 +1317,8 @@  static void axgbe_phy_kr_mode(struct axgbe_port *pdata)
 	axgbe_phy_set_redrv_mode(pdata);
 
 	/* 10G/KR */
-	axgbe_phy_perform_ratechange(pdata, 4, 0);
+		axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_10G_KR,
+						AXGBE_MB_SUBCMD_NONE);
 	phy_data->cur_mode = AXGBE_MODE_KR;
 
 	PMD_DRV_LOG(DEBUG, "10GbE KR mode set\n");
@@ -1326,7 +1331,7 @@  static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata)
 	axgbe_phy_set_redrv_mode(pdata);
 
 	/* 2.5G/KX */
-	axgbe_phy_perform_ratechange(pdata, 2, 0);
+	axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_2_5G, AXGBE_MB_SUBCMD_NONE);
 	phy_data->cur_mode = AXGBE_MODE_KX_2500;
 }
 
@@ -1337,7 +1342,7 @@  static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata)
 	axgbe_phy_set_redrv_mode(pdata);
 
 	/* 1G/SGMII */
-	axgbe_phy_perform_ratechange(pdata, 1, 2);
+	axgbe_phy_perform_ratechange(pdata, AXGBE_MB_CMD_SET_1G, AXGBE_MB_SUBCMD_1G_SGMII);
 
 	phy_data->cur_mode = AXGBE_MODE_SGMII_1000;
 }