Skip to contentSkip to conversation

common/cnxk: revert check on bitmap for tm

PATCH In review Nithin Dabilpuram 2 participants 4 messages Mar 3, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 common/cnxk: revert check on bitmap for tm

Revert change to return error on case where no slab of free resources is found. That error check break's a case where there is a spare schq to be reused that was just allocated for sake of contiguous static TM nodes.

Fixes 14f7e5d4bf2d ("common/cnxk: add missing checks of return values")
---
 drivers/common/cnxk/roc_nix_tm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/common/cnxk/roc_nix_tm.c +2 -4
index 7a17780..5b70c7b 100644
@@ -1042,10 +1042,8 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,
 			return -EFAULT;
 		}
 
-		if (!slab) {
-			if (!plt_bitmap_scan(bmp, &pos, &slab))
-				return -ENOENT;
-		}
+		if (!slab)
+			plt_bitmap_scan(bmp, &pos, &slab);
 
 		if (child->priority == parent->rr_prio && spare_schq != -1) {
 			/* Use spare schq first if present */
Signature · 1 line
2.8.4
#1 lore raw

PATCH 2/2 common/cnxk: fix VF data offset

From: Harman Kalra <[email protected]>

Data offset should be adjusted for VF to skip extra 8 bytes of timestamp, if its PF has PTP enabled.

Fixes c443e0d326e1 ("common/cnxk: support NIX PTP")
---
 drivers/common/cnxk/roc_nix.h     | 1 +
 drivers/common/cnxk/roc_nix_ptp.c | 8 ++++++++
 drivers/common/cnxk/version.map   | 1 +
 drivers/net/cnxk/cnxk_ethdev.c    | 4 ++++
 4 files changed, 14 insertions(+)
drivers/common/cnxk/roc_nix.h +1 -0
index 5e6eb58..dbb816d 100644
@@ -864,6 +864,7 @@ int __roc_api roc_nix_ptp_sync_time_adjust(struct roc_nix *roc_nix,
 int __roc_api roc_nix_ptp_info_cb_register(struct roc_nix *roc_nix,
 					   ptp_info_update_t ptp_update);
 void __roc_api roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix);
+bool __roc_api roc_nix_ptp_is_enable(struct roc_nix *roc_nix);
 
 /* VLAN */
 int __roc_api
drivers/common/cnxk/roc_nix_ptp.c +8 -0
index 03c4c6e..05e4211 100644
@@ -120,3 +120,11 @@ roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix)
 
 	dev->ops->ptp_info_update = NULL;
 }
+
+bool
+roc_nix_ptp_is_enable(struct roc_nix *roc_nix)
+{
+	struct nix *nix = roc_nix_to_nix_priv(roc_nix);
+
+	return nix->ptp_en;
+}
drivers/common/cnxk/version.map +1 -0
index d346e6f..2a122e5 100644
@@ -206,6 +206,7 @@ INTERNAL {
 	roc_nix_ptp_clock_read;
 	roc_nix_ptp_info_cb_register;
 	roc_nix_ptp_info_cb_unregister;
+	roc_nix_ptp_is_enable;
 	roc_nix_ptp_rx_ena_dis;
 	roc_nix_ptp_sync_time_adjust;
 	roc_nix_ptp_tx_ena_dis;
drivers/net/cnxk/cnxk_ethdev.c +4 -0
index deb95ae..1fa4131 100644
@@ -1123,6 +1123,10 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
 		goto fail_configure;
 	}
 
+	/* Check if ptp is enable in PF owning this VF*/
+	if (!roc_nix_is_pf(nix) && (!roc_nix_is_sdp(nix)))
+		dev->ptp_en = roc_nix_ptp_is_enable(nix);
+
 	dev->npc.channel = roc_nix_get_base_chan(nix);
 
 	nb_rxq = data->nb_rx_queues;
Signature · 1 line
2.8.4
Acked-by Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] common/cnxk: fix VF data offset

Quoted 10 lines · Nithin Dabilpuram

From: Harman Kalra <[email protected]>

Data offset should be adjusted for VF to skip extra 8 bytes of timestamp, if its PF has PTP enabled.

Fixes c443e0d326e1 ("common/cnxk: support NIX PTP")

Updated the git commit as follows and applied to
dpdk-next-net-mrvl/for-next-net. Thanks

common/cnxk: fix mbuf data offset for VF

If PF has PTP enabled the data offset should be adjusted for VF to skip extra 8 bytes of timestamp as the MAC inserts 8 bytes before the ethernet header.

Fixes c443e0d326e1 ("common/cnxk: support NIX PTP")
Quoted 65 lines
---
 drivers/common/cnxk/roc_nix.h     | 1 +
 drivers/common/cnxk/roc_nix_ptp.c | 8 ++++++++
 drivers/common/cnxk/version.map   | 1 +
 drivers/net/cnxk/cnxk_ethdev.c    | 4 ++++
 4 files changed, 14 insertions(+)
drivers/common/cnxk/roc_nix.h +1 -0
index 5e6eb58..dbb816d 100644
@@ -864,6 +864,7 @@ int __roc_api roc_nix_ptp_sync_time_adjust(struct roc_nix *roc_nix,
 int __roc_api roc_nix_ptp_info_cb_register(struct roc_nix *roc_nix,
                                           ptp_info_update_t ptp_update);
 void __roc_api roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix);
+bool __roc_api roc_nix_ptp_is_enable(struct roc_nix *roc_nix);
 
 /* VLAN */
 int __roc_api
drivers/common/cnxk/roc_nix_ptp.c +8 -0
index 03c4c6e..05e4211 100644
@@ -120,3 +120,11 @@ roc_nix_ptp_info_cb_unregister(struct roc_nix *roc_nix)
 
        dev->ops->ptp_info_update = NULL;
 }
+
+bool
+roc_nix_ptp_is_enable(struct roc_nix *roc_nix)
+{
+       struct nix *nix = roc_nix_to_nix_priv(roc_nix);
+
+       return nix->ptp_en;
+}
drivers/common/cnxk/version.map +1 -0
index d346e6f..2a122e5 100644
@@ -206,6 +206,7 @@ INTERNAL {
        roc_nix_ptp_clock_read;
        roc_nix_ptp_info_cb_register;
        roc_nix_ptp_info_cb_unregister;
+       roc_nix_ptp_is_enable;
        roc_nix_ptp_rx_ena_dis;
        roc_nix_ptp_sync_time_adjust;
        roc_nix_ptp_tx_ena_dis;
drivers/net/cnxk/cnxk_ethdev.c +4 -1
index deb95ae..1fa4131 100644
@@ -1123,6 +1123,10 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
                goto fail_configure;
        }
 
+       /* Check if ptp is enable in PF owning this VF*/
+       if (!roc_nix_is_pf(nix) && (!roc_nix_is_sdp(nix)))
+               dev->ptp_en = roc_nix_ptp_is_enable(nix);
+
        dev->npc.channel = roc_nix_get_base_chan(nix);
 
        nb_rxq = data->nb_rx_queues;
--

2.8.4

Acked-by Acked-by on v1 1/2
#3 lore raw
In reply to Nithin Dabilpuram
Quoted 10 lines · Nithin Dabilpuram

Revert change to return error on case where no slab of free resources is found. That error check break's a case where there is a spare schq to be reused that was just allocated for sake of contiguous static TM nodes.

Fixes 14f7e5d4bf2d ("common/cnxk: add missing checks of return values")

Updated the git commit as follows and applied to
dpdk-next-net-mrvl/for-next-net. Thanks

common/cnxk: fix bitmap usage for TM

Revert change [1] to return error on case where no slab of free resources is found. That error check break's a case where there is a spare schedule queue to be reused that was just allocated for sake of contiguous static TM nodes.

[1]
Fixes 14f7e5d4bf2d ("common/cnxk: add missing checks of return values")
Quoted 24 lines
---
 drivers/common/cnxk/roc_nix_tm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/common/cnxk/roc_nix_tm.c +2 -5
index 7a17780..5b70c7b 100644
@@ -1042,10 +1042,8 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,
                        return -EFAULT;
                }
 
-               if (!slab) {
-                       if (!plt_bitmap_scan(bmp, &pos, &slab))
-                               return -ENOENT;
-               }
+               if (!slab)
+                       plt_bitmap_scan(bmp, &pos, &slab);
 
                if (child->priority == parent->rr_prio && spare_schq != -1) {
                        /* Use spare schq first if present */
--

2.8.4