Skip to contentSkip to conversation

net/octeontx2: fix exit paths after cq init

PATCH Applied Anoob Joseph 2 participants 2 messages Nov 11, 2019 – Nov 15, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/octeontx2: fix exit paths after cq init

After otx2_nix_register_cq_irqs() is called and the IRQs are setup, otx2_nix_unregister_cq_irqs() need to be called in the subsequent error exit paths.

Fixes d34db5ccbf30 ("net/octeontx2: fix driver reconfiguration")
---
 drivers/net/octeontx2/otx2_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/octeontx2/otx2_ethdev.c +2 -2
index aab34db..18aa0f5 100644
@@ -1700,13 +1700,13 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
 	rc = cgx_intlbk_enable(dev, eth_dev->data->dev_conf.lpbk_mode);
 	if (rc) {
 		otx2_err("Failed to configure cgx loop back mode rc=%d", rc);
-		goto q_irq_fini;
+		goto cq_fini;
 	}
 
 	rc = otx2_nix_rxchan_bpid_cfg(eth_dev, true);
 	if (rc) {
 		otx2_err("Failed to configure nix rx chan bpid cfg rc=%d", rc);
-		goto q_irq_fini;
+		goto cq_fini;
 	}
 
 	rc = otx2_nix_mc_addr_list_install(eth_dev);
Signature · 1 line
2.7.4
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 8 lines · Anoob Joseph

After otx2_nix_register_cq_irqs() is called and the IRQs are setup, otx2_nix_unregister_cq_irqs() need to be called in the subsequent error exit paths.

Fixes d34db5ccbf30 ("net/octeontx2: fix driver reconfiguration")

Applied to dpdk-next-net-mrvl/master. Thanks

Quoted 27 lines
---
 drivers/net/octeontx2/otx2_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/octeontx2/otx2_ethdev.c +2 -3
index aab34db..18aa0f5 100644
@@ -1700,13 +1700,13 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
        rc = cgx_intlbk_enable(dev, eth_dev->data->dev_conf.lpbk_mode);
        if (rc) {
                otx2_err("Failed to configure cgx loop back mode rc=%d", rc);
-               goto q_irq_fini;
+               goto cq_fini;
        }
 
        rc = otx2_nix_rxchan_bpid_cfg(eth_dev, true);
        if (rc) {
                otx2_err("Failed to configure nix rx chan bpid cfg rc=%d", rc);
-               goto q_irq_fini;
+               goto cq_fini;
        }
 
        rc = otx2_nix_mc_addr_list_install(eth_dev);
--

2.7.4