[dpdk-dev] [PATCH 1/2] net/txgbe: fix RxTx packet statistics

[dpdk-dev] [PATCH 1/2] net/txgbe: fix RxTx packet statistics

[Jiawen Wu]

Fix specific length packet statistics caused by wrong register addresses.

Fixes: 24a4c76aff4d ("net/txgbe: add error types and registers")
Cc: stable@dpdk.org

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/base/txgbe_regs.h | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/net/txgbe/base/txgbe_regs.h b/drivers/net/txgbe/base/txgbe_regs.h
index 48d9300a2e..144047ba62 100644
--- a/drivers/net/txgbe/base/txgbe_regs.h
+++ b/drivers/net/txgbe/base/txgbe_regs.h
@@ -1072,30 +1072,30 @@ enum txgbe_5tuple_protocol {
 #define TXGBE_MACRXERRCRCH           0x01192C
 #define TXGBE_MACRXERRLENL           0x011978
 #define TXGBE_MACRXERRLENH           0x01197C
-#define TXGBE_MACRX1TO64L            0x001940
-#define TXGBE_MACRX1TO64H            0x001944
-#define TXGBE_MACRX65TO127L          0x001948
-#define TXGBE_MACRX65TO127H          0x00194C
-#define TXGBE_MACRX128TO255L         0x001950
-#define TXGBE_MACRX128TO255H         0x001954
-#define TXGBE_MACRX256TO511L         0x001958
-#define TXGBE_MACRX256TO511H         0x00195C
-#define TXGBE_MACRX512TO1023L        0x001960
-#define TXGBE_MACRX512TO1023H        0x001964
-#define TXGBE_MACRX1024TOMAXL        0x001968
-#define TXGBE_MACRX1024TOMAXH        0x00196C
-#define TXGBE_MACTX1TO64L            0x001834
-#define TXGBE_MACTX1TO64H            0x001838
-#define TXGBE_MACTX65TO127L          0x00183C
-#define TXGBE_MACTX65TO127H          0x001840
-#define TXGBE_MACTX128TO255L         0x001844
-#define TXGBE_MACTX128TO255H         0x001848
-#define TXGBE_MACTX256TO511L         0x00184C
-#define TXGBE_MACTX256TO511H         0x001850
-#define TXGBE_MACTX512TO1023L        0x001854
-#define TXGBE_MACTX512TO1023H        0x001858
-#define TXGBE_MACTX1024TOMAXL        0x00185C
-#define TXGBE_MACTX1024TOMAXH        0x001860
+#define TXGBE_MACRX1TO64L            0x011940
+#define TXGBE_MACRX1TO64H            0x011944
+#define TXGBE_MACRX65TO127L          0x011948
+#define TXGBE_MACRX65TO127H          0x01194C
+#define TXGBE_MACRX128TO255L         0x011950
+#define TXGBE_MACRX128TO255H         0x011954
+#define TXGBE_MACRX256TO511L         0x011958
+#define TXGBE_MACRX256TO511H         0x01195C
+#define TXGBE_MACRX512TO1023L        0x011960
+#define TXGBE_MACRX512TO1023H        0x011964
+#define TXGBE_MACRX1024TOMAXL        0x011968
+#define TXGBE_MACRX1024TOMAXH        0x01196C
+#define TXGBE_MACTX1TO64L            0x011834
+#define TXGBE_MACTX1TO64H            0x011838
+#define TXGBE_MACTX65TO127L          0x01183C
+#define TXGBE_MACTX65TO127H          0x011840
+#define TXGBE_MACTX128TO255L         0x011844
+#define TXGBE_MACTX128TO255H         0x011848
+#define TXGBE_MACTX256TO511L         0x01184C
+#define TXGBE_MACTX256TO511H         0x011850
+#define TXGBE_MACTX512TO1023L        0x011854
+#define TXGBE_MACTX512TO1023H        0x011858
+#define TXGBE_MACTX1024TOMAXL        0x01185C
+#define TXGBE_MACTX1024TOMAXH        0x011860
 
 #define TXGBE_MACRXUNDERSIZE         0x011938
 #define TXGBE_MACRXOVERSIZE          0x01193C
-- 
2.21.0.windows.1

[dpdk-dev] [PATCH 2/2] net/txgbe: fix link process in KR mode

[Jiawen Wu]

Set the 'present' parameter to 0 by default. It is configured by hardware,
users can set it to 1 for manual configuration.

Fixes: f611dada1af8 ("net/txgbe: update link setup process of backplane NICs")
Cc: stable@dpdk.org

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/base/txgbe_phy.c | 2 +-
 drivers/net/txgbe/txgbe_ethdev.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index 2db87ae0c5..3f5229ecc2 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -1456,7 +1456,7 @@ txgbe_set_link_to_kr(struct txgbe_hw *hw, bool autoneg)
 			wr32_epcs(hw, SR_AN_CTRL, 0);
 			wr32_epcs(hw, VR_AN_KR_MODE_CL, 0);
 		}
-		if (hw->devarg.present  == 1) {
+		if (hw->devarg.present == 1) {
 			value = rd32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1);
 			value |= TXGBE_PHY_TX_EQ_CTL1_DEF;
 			wr32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1, value);
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 169272ded5..8628ce455f 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -495,7 +495,7 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs)
 	struct rte_kvargs *kvlist;
 	u16 auto_neg = 1;
 	u16 poll = 0;
-	u16 present = 1;
+	u16 present = 0;
 	u16 sgmii = 0;
 	u16 ffe_set = 0;
 	u16 ffe_main = 27;
-- 
2.21.0.windows.1

Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] net/txgbe: fix link process in KR mode

[Ferruh Yigit]

On 11/2/2021 8:10 AM, Jiawen Wu wrote:
> Set the 'present' parameter to 0 by default. It is configured by hardware,
> users can set it to 1 for manual configuration.
> 
> Fixes: f611dada1af8 ("net/txgbe: update link setup process of backplane NICs")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>   drivers/net/txgbe/base/txgbe_phy.c | 2 +-
>   drivers/net/txgbe/txgbe_ethdev.c   | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 

Documentation also needs to be updated for this change.

> diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
> index 2db87ae0c5..3f5229ecc2 100644
> --- a/drivers/net/txgbe/base/txgbe_phy.c
> +++ b/drivers/net/txgbe/base/txgbe_phy.c
> @@ -1456,7 +1456,7 @@ txgbe_set_link_to_kr(struct txgbe_hw *hw, bool autoneg)
>   			wr32_epcs(hw, SR_AN_CTRL, 0);
>   			wr32_epcs(hw, VR_AN_KR_MODE_CL, 0);
>   		}
> -		if (hw->devarg.present  == 1) {
> +		if (hw->devarg.present == 1) {
>   			value = rd32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1);
>   			value |= TXGBE_PHY_TX_EQ_CTL1_DEF;
>   			wr32_epcs(hw, TXGBE_PHY_TX_EQ_CTL1, value);
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
> index 169272ded5..8628ce455f 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -495,7 +495,7 @@ txgbe_parse_devargs(struct txgbe_hw *hw, struct rte_devargs *devargs)
>   	struct rte_kvargs *kvlist;
>   	u16 auto_neg = 1;
>   	u16 poll = 0;
> -	u16 present = 1;
> +	u16 present = 0;
>   	u16 sgmii = 0;
>   	u16 ffe_set = 0;
>   	u16 ffe_main = 27;
> 

Re: [dpdk-dev] [dpdk-stable] [PATCH 1/2] net/txgbe: fix RxTx packet statistics

[Ferruh Yigit]

On 11/2/2021 8:10 AM, Jiawen Wu wrote:
> Fix specific length packet statistics caused by wrong register addresses.
> 
> Fixes: 24a4c76aff4d ("net/txgbe: add error types and registers")
> Cc:stable@dpdk.org
> 
> Signed-off-by: Jiawen Wu<jiawenwu@trustnetic.com>

Applied to dpdk-next-net/main, thanks.