diff mbox series

[v2,1/2] net/axgbe: 1/2.5Gbps support enabled for axgbe

Message ID 20200110125937.6194-1-gnandiba@amd.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show
Series [v2,1/2] net/axgbe: 1/2.5Gbps support enabled for axgbe | expand

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/checkpatch warning coding style issues

Commit Message

gnandiba@amd.com Jan. 10, 2020, 12:59 p.m. UTC
From: Girish Nandibasappa <girish.nandibasappa@amd.com>

Added support for 1Gbps and 2.5Gbps in axgbe dpdk driver

Signed-off-by: Girish Nandibasappa <girish.nandibasappa@amd.com>
---
 drivers/net/axgbe/axgbe_phy_impl.c | 50 ++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

Comments

Kumar, Ravi1 Jan. 14, 2020, 11:49 a.m. UTC | #1
[AMD Official Use Only - Internal Distribution Only]

Looks good to me. 

Acked-by: Ravi Kumar <ravi1.kumar@amd.com>

Regards,
Ravi

+[CAUTION: External Email]
+
+From: Girish Nandibasappa <girish.nandibasappa@amd.com>
+
+Added support for 1Gbps and 2.5Gbps in axgbe dpdk driver
+
+Signed-off-by: Girish Nandibasappa <girish.nandibasappa@amd.com>
+---
+ drivers/net/axgbe/axgbe_phy_impl.c | 50 ++++++++++++++++++++++++++++--
+ 1 file changed, 48 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
+index 2267c5f81..f0dc11695 100644
+--- a/drivers/net/axgbe/axgbe_phy_impl.c
++++ b/drivers/net/axgbe/axgbe_phy_impl.c
+@@ -610,8 +610,7 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata)
+        if (sfp_base[AXGBE_SFP_BASE_EXT_ID] != AXGBE_SFP_EXT_ID_SFP)
+                return;
+
+-       if (axgbe_phy_sfp_parse_quirks(pdata))
+-               return;
++       axgbe_phy_sfp_parse_quirks(pdata);
+
+        /* Assume ACTIVE cable unless told it is PASSIVE */
+        if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) { @@ -1238,6 +1237,47 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata)
+        phy_data->cur_mode = AXGBE_MODE_KR;  }
+
++static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata) {
++       struct axgbe_phy_data *phy_data = pdata->phy_data;
++       unsigned int s0;
++
++       axgbe_phy_set_redrv_mode(pdata);
++       /* 2.5G/KX */
++       axgbe_phy_start_ratechange(pdata);
++       s0 = 0;
++       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 2);
++       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 0);
++
++       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
++       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
++
++       XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
++
++       phy_data->cur_mode = AXGBE_MODE_KX_2500; }
++
++static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata) {
++       struct axgbe_phy_data *phy_data = pdata->phy_data;
++       unsigned int s0;
++
++       axgbe_phy_set_redrv_mode(pdata);
++
++       /* 1G/SGMII */
++       axgbe_phy_start_ratechange(pdata);
++       s0 = 0;
++       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 1);
++       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2);
++
++       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
++       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
++
++       XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
++
++       phy_data->cur_mode = AXGBE_MODE_SGMII_1000; }
++
+ static enum axgbe_mode axgbe_phy_cur_mode(struct axgbe_port *pdata)  {
+        struct axgbe_phy_data *phy_data = pdata->phy_data; @@ -1408,6 +1448,12 @@ static void axgbe_phy_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode)
+        case AXGBE_MODE_SFI:
+                axgbe_phy_sfi_mode(pdata);
+                break;
++       case AXGBE_MODE_KX_2500:
++               axgbe_phy_kx_2500_mode(pdata);
++               break;
++       case AXGBE_MODE_SGMII_1000:
++               axgbe_phy_sgmii_1000_mode(pdata);
++               break;
+        default:
+                break;
+        }
+--
+2.17.1
+
+
Ferruh Yigit Jan. 17, 2020, 11:22 a.m. UTC | #2
On 1/14/2020 11:49 AM, Kumar, Ravi1 wrote:

<...>

> 
> +[CAUTION: External Email]
> +
> +From: Girish Nandibasappa <girish.nandibasappa@amd.com>
> +
> +Added support for 1Gbps and 2.5Gbps in axgbe dpdk driver
> +
> +Signed-off-by: Girish Nandibasappa <girish.nandibasappa@amd.com>
>
> Acked-by: Ravi Kumar <ravi1.kumar@amd.com>

Series applied to dpdk-next-net/master, thanks	.
diff mbox series

Patch

diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
index 2267c5f81..f0dc11695 100644
--- a/drivers/net/axgbe/axgbe_phy_impl.c
+++ b/drivers/net/axgbe/axgbe_phy_impl.c
@@ -610,8 +610,7 @@  static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata)
 	if (sfp_base[AXGBE_SFP_BASE_EXT_ID] != AXGBE_SFP_EXT_ID_SFP)
 		return;
 
-	if (axgbe_phy_sfp_parse_quirks(pdata))
-		return;
+	axgbe_phy_sfp_parse_quirks(pdata);
 
 	/* Assume ACTIVE cable unless told it is PASSIVE */
 	if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) {
@@ -1238,6 +1237,47 @@  static void axgbe_phy_kr_mode(struct axgbe_port *pdata)
 	phy_data->cur_mode = AXGBE_MODE_KR;
 }
 
+static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata)
+{
+	struct axgbe_phy_data *phy_data = pdata->phy_data;
+	unsigned int s0;
+
+	axgbe_phy_set_redrv_mode(pdata);
+	/* 2.5G/KX */
+	axgbe_phy_start_ratechange(pdata);
+	s0 = 0;
+	XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 2);
+	XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 0);
+
+	XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
+	XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
+
+	XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
+
+	phy_data->cur_mode = AXGBE_MODE_KX_2500;
+}
+
+static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata)
+{
+	struct axgbe_phy_data *phy_data = pdata->phy_data;
+	unsigned int s0;
+
+	axgbe_phy_set_redrv_mode(pdata);
+
+	/* 1G/SGMII */
+	axgbe_phy_start_ratechange(pdata);
+	s0 = 0;
+	XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 1);
+	XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2);
+
+	XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
+	XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
+
+	XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
+
+	phy_data->cur_mode = AXGBE_MODE_SGMII_1000;
+}
+
 static enum axgbe_mode axgbe_phy_cur_mode(struct axgbe_port *pdata)
 {
 	struct axgbe_phy_data *phy_data = pdata->phy_data;
@@ -1408,6 +1448,12 @@  static void axgbe_phy_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode)
 	case AXGBE_MODE_SFI:
 		axgbe_phy_sfi_mode(pdata);
 		break;
+	case AXGBE_MODE_KX_2500:
+		axgbe_phy_kx_2500_mode(pdata);
+		break;
+	case AXGBE_MODE_SGMII_1000:
+		axgbe_phy_sgmii_1000_mode(pdata);
+		break;
 	default:
 		break;
 	}