From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Date: Thu, 29 Aug 2019 23:54:51 -0400
Subject: bnxt_en: Register buffers for VFs before reserving resources.
Patch-mainline: v5.4-rc1
Git-commit: 91b9be487001d344a39c453ade6cdbd125e06208
References: jsc#SLE-8371 bsc#1153274
When VFs need to be reconfigured dynamically after firmwware reset, the
configuration sequence on the PF needs to be changed to register the VF
buffers first. Otherwise, some VF firmware commands may not succeed as
there may not be PF buffers ready for the re-directed firmware commands.
This sequencing did not matter much before when we only supported
the normal bring-up of VFs.
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -671,6 +671,11 @@ int bnxt_cfg_hw_sriov(struct bnxt *bp, i
{
int rc;
+ /* Register buffers for VFs */
+ rc = bnxt_hwrm_func_buf_rgtr(bp);
+ if (rc)
+ return rc;
+
/* Reserve resources for VFs */
rc = bnxt_func_cfg(bp, *num_vfs);
if (rc != *num_vfs) {
@@ -684,11 +689,6 @@ int bnxt_cfg_hw_sriov(struct bnxt *bp, i
*num_vfs = rc;
}
- /* Register buffers for VFs */
- rc = bnxt_hwrm_func_buf_rgtr(bp);
- if (rc)
- return rc;
-
bnxt_ulp_sriov_cfg(bp, *num_vfs);
return 0;
}