[PATCH v1] net/zxdh: add pcie bar channel check

[PATCH v1] net/zxdh: add pcie bar channel check

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 1895 bytes --]

Add pcie bar channel check after getting dtb space left.

Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
---
 drivers/net/zxdh/zxdh_np.c | 7 +++++++
 drivers/net/zxdh/zxdh_np.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
index 024da113e2..4e2637e1b6 100644
--- a/drivers/net/zxdh/zxdh_np.c
+++ b/drivers/net/zxdh/zxdh_np.c
@@ -3698,6 +3698,13 @@ zxdh_np_dtb_queue_unused_item_num_get(uint32_t dev_id,
 	rc = zxdh_np_reg_read(dev_id, ZXDH_DTB_INFO_QUEUE_BUF_SPACE,
 		0, queue_id, p_item_num);
 	ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "dpp_reg_read");
+
+	if((*p_item_num & ZXDH_DTB_SPACE_LEFT_MASK) == ZXDH_DTB_SPACE_LEFT_MASK)
+    {
+		PMD_DRV_LOG(ERR, "pcie bar abnormal, get dtb space left false.");
+        return ZXDH_RC_DTB_BAR_ABNORMAL;
+    }
+	
 	return rc;
 }
 
diff --git a/drivers/net/zxdh/zxdh_np.h b/drivers/net/zxdh/zxdh_np.h
index b0823192e7..5b9aec9c8f 100644
--- a/drivers/net/zxdh/zxdh_np.h
+++ b/drivers/net/zxdh/zxdh_np.h
@@ -94,6 +94,7 @@
 #define ZXDH_DTB_TAB_ACK_SUCCESS_MASK            (0xff)
 #define ZXDH_DTB_TAB_ACK_FAILED_MASK             (0x1)
 #define ZXDH_DTB_TAB_ACK_CHECK_VALUE             (0x12345678)
+#define ZXDH_DTB_SPACE_LEFT_MASK                 (0x3F)
 
 #define ZXDH_DTB_TAB_ACK_VLD_SHIFT               (104)
 #define ZXDH_DTB_TAB_ACK_STATUS_SHIFT            (96)
@@ -321,6 +322,7 @@
 #define ZXDH_RC_DTB_DUMP_SIZE_SMALL             (ZXDH_RC_DTB_BASE | 0x16)
 #define ZXDH_RC_DTB_SEARCH_VPORT_QUEUE_ZERO     (ZXDH_RC_DTB_BASE | 0x17)
 #define ZXDH_RC_DTB_QUEUE_NOT_ENABLE            (ZXDH_RC_DTB_BASE | 0x18)
+#define ZXDH_RC_DTB_BAR_ABNORMAL                (ZXDH_RC_DTB_BASE | 0x19)
 
 #define ZXDH_RC_CTRLCH_BASE                     (0xf00)
 #define ZXDH_RC_CTRLCH_MSG_LEN_ZERO             (ZXDH_RC_CTRLCH_BASE | 0x0)
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 3784 bytes --]

[PATCH v1 0/2] fix bug

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 405 bytes --]

V1:
  - Add pcie bar channel check after getting dtb space left.
  - Delete np soft resource uninstallation from NP online uninit process.

Tianhao Zhang (2):
  net/zxdh: add pcie bar channel check
  net/zxdh: delete np soft resource uninstallation

 drivers/net/zxdh/zxdh_np.c | 11 +++++++----
 drivers/net/zxdh/zxdh_np.h |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 752 bytes --]

[PATCH v1 1/2] net/zxdh: add pcie bar channel check

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 1895 bytes --]

Add pcie bar channel check after getting dtb space left.

Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
---
 drivers/net/zxdh/zxdh_np.c | 7 +++++++
 drivers/net/zxdh/zxdh_np.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
index 024da113e2..4e2637e1b6 100644
--- a/drivers/net/zxdh/zxdh_np.c
+++ b/drivers/net/zxdh/zxdh_np.c
@@ -3698,6 +3698,13 @@ zxdh_np_dtb_queue_unused_item_num_get(uint32_t dev_id,
 	rc = zxdh_np_reg_read(dev_id, ZXDH_DTB_INFO_QUEUE_BUF_SPACE,
 		0, queue_id, p_item_num);
 	ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "dpp_reg_read");
+
+	if((*p_item_num & ZXDH_DTB_SPACE_LEFT_MASK) == ZXDH_DTB_SPACE_LEFT_MASK)
+    {
+		PMD_DRV_LOG(ERR, "pcie bar abnormal, get dtb space left false.");
+        return ZXDH_RC_DTB_BAR_ABNORMAL;
+    }
+	
 	return rc;
 }
 
diff --git a/drivers/net/zxdh/zxdh_np.h b/drivers/net/zxdh/zxdh_np.h
index b0823192e7..5b9aec9c8f 100644
--- a/drivers/net/zxdh/zxdh_np.h
+++ b/drivers/net/zxdh/zxdh_np.h
@@ -94,6 +94,7 @@
 #define ZXDH_DTB_TAB_ACK_SUCCESS_MASK            (0xff)
 #define ZXDH_DTB_TAB_ACK_FAILED_MASK             (0x1)
 #define ZXDH_DTB_TAB_ACK_CHECK_VALUE             (0x12345678)
+#define ZXDH_DTB_SPACE_LEFT_MASK                 (0x3F)
 
 #define ZXDH_DTB_TAB_ACK_VLD_SHIFT               (104)
 #define ZXDH_DTB_TAB_ACK_STATUS_SHIFT            (96)
@@ -321,6 +322,7 @@
 #define ZXDH_RC_DTB_DUMP_SIZE_SMALL             (ZXDH_RC_DTB_BASE | 0x16)
 #define ZXDH_RC_DTB_SEARCH_VPORT_QUEUE_ZERO     (ZXDH_RC_DTB_BASE | 0x17)
 #define ZXDH_RC_DTB_QUEUE_NOT_ENABLE            (ZXDH_RC_DTB_BASE | 0x18)
+#define ZXDH_RC_DTB_BAR_ABNORMAL                (ZXDH_RC_DTB_BASE | 0x19)
 
 #define ZXDH_RC_CTRLCH_BASE                     (0xf00)
 #define ZXDH_RC_CTRLCH_MSG_LEN_ZERO             (ZXDH_RC_CTRLCH_BASE | 0x0)
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 3784 bytes --]

[PATCH v1 2/2] net/zxdh: delete np soft resource uninstallation

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 702 bytes --]

Delete np soft resource uninstallation from NP online uninit process.

Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
---
 drivers/net/zxdh/zxdh_np.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
index 4e2637e1b6..3bb765e05d 100644
--- a/drivers/net/zxdh/zxdh_np.c
+++ b/drivers/net/zxdh/zxdh_np.c
@@ -4243,10 +4243,6 @@ zxdh_np_online_uninit(uint32_t dev_id,
 	if (rc != 0)
 		PMD_DRV_LOG(ERR, "dtb release port name %s queue id %u", port_name, queue_id);
 
-	rc = zxdh_np_soft_res_uninstall(dev_id);
-	if (rc != 0)
-		PMD_DRV_LOG(ERR, "zxdh_np_soft_res_uninstall failed");
-
 	return 0;
 }
 
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 1321 bytes --]

Re: [PATCH v1 1/2] net/zxdh: add pcie bar channel check

[Stephen Hemminger]

On Mon, 22 Dec 2025 18:25:34 +0800
Tianhao Zhang <zhang.tianhao2@zte.com.cn> wrote:

> Add pcie bar channel check after getting dtb space left.
> 
> Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
> ---
>  drivers/net/zxdh/zxdh_np.c | 7 +++++++
>  drivers/net/zxdh/zxdh_np.h | 2 ++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
> index 024da113e2..4e2637e1b6 100644
> --- a/drivers/net/zxdh/zxdh_np.c
> +++ b/drivers/net/zxdh/zxdh_np.c
> @@ -3698,6 +3698,13 @@ zxdh_np_dtb_queue_unused_item_num_get(uint32_t dev_id,
>  	rc = zxdh_np_reg_read(dev_id, ZXDH_DTB_INFO_QUEUE_BUF_SPACE,
>  		0, queue_id, p_item_num);
>  	ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "dpp_reg_read");
> +
> +	if((*p_item_num & ZXDH_DTB_SPACE_LEFT_MASK) == ZXDH_DTB_SPACE_LEFT_MASK)
> +    {
> +		PMD_DRV_LOG(ERR, "pcie bar abnormal, get dtb space left false.");
> +        return ZXDH_RC_DTB_BAR_ABNORMAL;
> +    }
> +	
>  	return rc;
>  }
>  

The DPDK style is like the Linux kernel coding style, the bracket should be on the if() line.
The indentation is also off.

It is also not clear what "space left" means, could you provide a clearer message.

Re: [PATCH v1 2/2] net/zxdh: delete np soft resource uninstallation

[Stephen Hemminger]

On Mon, 22 Dec 2025 18:25:35 +0800
Tianhao Zhang <zhang.tianhao2@zte.com.cn> wrote:

> Delete np soft resource uninstallation from NP online uninit process.
> 
> Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
> ---
>  drivers/net/zxdh/zxdh_np.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
> index 4e2637e1b6..3bb765e05d 100644
> --- a/drivers/net/zxdh/zxdh_np.c
> +++ b/drivers/net/zxdh/zxdh_np.c
> @@ -4243,10 +4243,6 @@ zxdh_np_online_uninit(uint32_t dev_id,
>  	if (rc != 0)
>  		PMD_DRV_LOG(ERR, "dtb release port name %s queue id %u", port_name, queue_id);
>  
> -	rc = zxdh_np_soft_res_uninstall(dev_id);
> -	if (rc != 0)
> -		PMD_DRV_LOG(ERR, "zxdh_np_soft_res_uninstall failed");
> -
>  	return 0;
>  }
>  

OK, but would like a better explanation. I assume it something like "soft reset is not necessary on device cleanup"

[PATCH v2 0/2] fix npsdk bug

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 631 bytes --]

V2:
  - Resolve code style
  - Provide clear error messages.

V1:
  - Add new timeout error return.
  - Add PCIe link health check.
  - Remove the NP software resource uninstallation procedure from the NP online uninit process. 
  - NP software resource uninstallation should be called separately within NP uninit to avoid duplicate resource release.

Tianhao Zhang (2):
  net/zxdh: add pcie bar channel check
  net/zxdh: optimize the procedure for NP online uninit

 drivers/net/zxdh/zxdh_np.c | 12 +++++++-----
 drivers/net/zxdh/zxdh_np.h |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 1189 bytes --]

[PATCH v2 1/2] net/zxdh: add pcie bar channel check

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 2264 bytes --]

After obtaining the DTB element register, check if the PCIe link is abnormal.

Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
---
 drivers/net/zxdh/zxdh_np.c | 8 +++++++-
 drivers/net/zxdh/zxdh_np.h | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
index 024da113e2..89c9283498 100644
--- a/drivers/net/zxdh/zxdh_np.c
+++ b/drivers/net/zxdh/zxdh_np.c
@@ -3698,6 +3698,12 @@ zxdh_np_dtb_queue_unused_item_num_get(uint32_t dev_id,
 	rc = zxdh_np_reg_read(dev_id, ZXDH_DTB_INFO_QUEUE_BUF_SPACE,
 		0, queue_id, p_item_num);
 	ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "dpp_reg_read");
+
+	if ((*p_item_num & ZXDH_DTB_SPACE_LEFT_MASK) == ZXDH_DTB_SPACE_LEFT_MASK) {
+		PMD_DRV_LOG(ERR, "pcie bar abnormal.");
+        return ZXDH_RC_DTB_BAR_ABNORMAL;
+    }
+	
 	return rc;
 }
 
@@ -5374,7 +5380,7 @@ zxdh_np_dtb_tab_down_success_status_check(uint32_t dev_id,
 				element_id, 0, ZXDH_DTB_TAB_ACK_UNUSED_MASK);
 			ZXDH_COMM_CHECK_DEV_RC(dev_id, rc, "zxdh_np_dtb_item_ack_wr");
 
-			return ZXDH_ERR;
+			return ZXDH_RC_DTB_OVER_TIME;
 		}
 
 		rd_cnt++;
diff --git a/drivers/net/zxdh/zxdh_np.h b/drivers/net/zxdh/zxdh_np.h
index b0823192e7..80eac8de37 100644
--- a/drivers/net/zxdh/zxdh_np.h
+++ b/drivers/net/zxdh/zxdh_np.h
@@ -94,6 +94,7 @@
 #define ZXDH_DTB_TAB_ACK_SUCCESS_MASK            (0xff)
 #define ZXDH_DTB_TAB_ACK_FAILED_MASK             (0x1)
 #define ZXDH_DTB_TAB_ACK_CHECK_VALUE             (0x12345678)
+#define ZXDH_DTB_SPACE_LEFT_MASK                 (0x3F)
 
 #define ZXDH_DTB_TAB_ACK_VLD_SHIFT               (104)
 #define ZXDH_DTB_TAB_ACK_STATUS_SHIFT            (96)
@@ -321,6 +322,8 @@
 #define ZXDH_RC_DTB_DUMP_SIZE_SMALL             (ZXDH_RC_DTB_BASE | 0x16)
 #define ZXDH_RC_DTB_SEARCH_VPORT_QUEUE_ZERO     (ZXDH_RC_DTB_BASE | 0x17)
 #define ZXDH_RC_DTB_QUEUE_NOT_ENABLE            (ZXDH_RC_DTB_BASE | 0x18)
+#define ZXDH_RC_DTB_OVER_TIME                   (ZXDH_RC_DTB_BASE | 0x19)
+#define ZXDH_RC_DTB_BAR_ABNORMAL                (ZXDH_RC_DTB_BASE | 0x1a)
 
 #define ZXDH_RC_CTRLCH_BASE                     (0xf00)
 #define ZXDH_RC_CTRLCH_MSG_LEN_ZERO             (ZXDH_RC_CTRLCH_BASE | 0x0)
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 4777 bytes --]

[PATCH v2 2/2] net/zxdh: optimize the procedure for NP online uninit

[Tianhao Zhang]

[-- Attachment #1.1.1: Type: text/plain, Size: 849 bytes --]

Remove the NP software resource uninstallation procedure from the NP
online uninit process. The NP software resource uninstallation should be
called separately within NP uninit to avoid duplicate resource
release.

Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
---
 drivers/net/zxdh/zxdh_np.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/zxdh/zxdh_np.c b/drivers/net/zxdh/zxdh_np.c
index 89c9283498..7ee9810920 100644
--- a/drivers/net/zxdh/zxdh_np.c
+++ b/drivers/net/zxdh/zxdh_np.c
@@ -4242,10 +4242,6 @@ zxdh_np_online_uninit(uint32_t dev_id,
 	if (rc != 0)
 		PMD_DRV_LOG(ERR, "dtb release port name %s queue id %u", port_name, queue_id);
 
-	rc = zxdh_np_soft_res_uninstall(dev_id);
-	if (rc != 0)
-		PMD_DRV_LOG(ERR, "zxdh_np_soft_res_uninstall failed");
-
 	return 0;
 }
 
-- 
2.27.0

[-- Attachment #1.1.2: Type: text/html , Size: 1565 bytes --]

Re: [PATCH v2 1/2] net/zxdh: add pcie bar channel check

[Stephen Hemminger]

On Tue, 30 Dec 2025 16:11:26 +0800
Tianhao Zhang <zhang.tianhao2@zte.com.cn> wrote:

> After obtaining the DTB element register, check if the PCIe link is abnormal.
> 
> Signed-off-by: Tianhao Zhang <zhang.tianhao2@zte.com.cn>
> ---

Queued to next-net and fixed the indentation issues reported by checkpatch.