net/octeontx2: fix exit paths after cq init
Checks
Commit Message
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")
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
---
drivers/net/octeontx2/otx2_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
On Mon, Nov 11, 2019 at 6:51 PM Anoob Joseph <anoobj@marvell.com> wrote:
>
> 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")
>
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Applied to dpdk-next-net-mrvl/master. Thanks
> ---
> drivers/net/octeontx2/otx2_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
> index aab34db..18aa0f5 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.c
> +++ b/drivers/net/octeontx2/otx2_ethdev.c
> @@ -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
>
@@ -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);