bnxt_en: Reserve rings after PCIe AER recovery if NIC interface is down

[ Upstream commit 5311598f7f3293683cdc761df71ae3469327332c ]

After successful PCIe AER recovery, FW will reset all resource
reservations.  If it is IF_UP, the driver will call bnxt_open() and
all resources will be reserved again.  It it is IF_DOWN, we should
call bnxt_reserve_rings() so that we can reserve resources including
RoCE resources to allow RoCE to resume after AER.  Without this
patch, RoCE fails to resume in this IF_DOWN scenario.

Later, if it becomes IF_UP, bnxt_open() will see that resources have
been reserved and will not reserve again.

Fixes: fb1e6e562b37 ("bnxt_en: Fix AER recovery.")
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Reviewed-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Saravanan Vajravel <saravanan.vajravel@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 103e6aa604c33ead791459c1e5ac49e2d2300cc8..4facf0368564bc647e7776f723aa8280e9fbd757 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -16171,8 +16171,12 @@ static void bnxt_io_resume(struct pci_dev *pdev)
        rtnl_lock();
 
        err = bnxt_hwrm_func_qcaps(bp);
-       if (!err && netif_running(netdev))
-               err = bnxt_open(netdev);
+       if (!err) {
+               if (netif_running(netdev))
+                       err = bnxt_open(netdev);
+               else
+                       err = bnxt_reserve_rings(bp, true);
+       }
 
        if (!err)
                netif_device_attach(netdev);