bnxt_en: Refactor bnxt_sriov_enable().

Refactor the hardware/firmware configuration portion in
bnxt_sriov_enable() into a new function bnxt_cfg_hw_sriov().  This
new function can be called after a firmware reset to reconfigure the
VFs previously enabled.

v2: straight refactor of the code.  Reordering done in the next patch.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index b6a84d0..7506d20 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -667,6 +667,32 @@ static int bnxt_func_cfg(struct bnxt *bp, int num_vfs)
                return bnxt_hwrm_func_cfg(bp, num_vfs);
 }
 
+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs)
+{
+       int rc;
+
+       /* Reserve resources for VFs */
+       rc = bnxt_func_cfg(bp, *num_vfs);
+       if (rc != *num_vfs) {
+               if (rc <= 0) {
+                       netdev_warn(bp->dev, "Unable to reserve resources for SRIOV.\n");
+                       *num_vfs = 0;
+                       return rc;
+               }
+               netdev_warn(bp->dev, "Only able to reserve resources for %d VFs.\n",
+                           rc);
+               *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;
+}
+
 static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
 {
        int rc = 0, vfs_supported;
@@ -732,25 +758,10 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
        if (rc)
                goto err_out1;
 
-       /* Reserve resources for VFs */
-       rc = bnxt_func_cfg(bp, *num_vfs);
-       if (rc != *num_vfs) {
-               if (rc <= 0) {
-                       netdev_warn(bp->dev, "Unable to reserve resources for SRIOV.\n");
-                       *num_vfs = 0;
-                       goto err_out2;
-               }
-               netdev_warn(bp->dev, "Only able to reserve resources for %d VFs.\n", rc);
-               *num_vfs = rc;
-       }
-
-       /* Register buffers for VFs */
-       rc = bnxt_hwrm_func_buf_rgtr(bp);
+       rc = bnxt_cfg_hw_sriov(bp, num_vfs);
        if (rc)
                goto err_out2;
 
-       bnxt_ulp_sriov_cfg(bp, *num_vfs);
-
        rc = pci_enable_sriov(bp->pdev, *num_vfs);
        if (rc)
                goto err_out2;
@@ -1128,6 +1139,13 @@ mac_done:
 }
 #else
 
+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs)
+{
+       if (*num_vfs)
+               return -EOPNOTSUPP;
+       return 0;
+}
+
 void bnxt_sriov_disable(struct bnxt *bp)
 {
 }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
index 2eed9ed..0abf18e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
@@ -36,6 +36,7 @@ int bnxt_set_vf_link_state(struct net_device *, int, int);
 int bnxt_set_vf_spoofchk(struct net_device *, int, bool);
 int bnxt_set_vf_trust(struct net_device *dev, int vf_id, bool trust);
 int bnxt_sriov_configure(struct pci_dev *pdev, int num_vfs);
+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs);
 void bnxt_sriov_disable(struct bnxt *);
 void bnxt_hwrm_exec_fwd_req(struct bnxt *);
 void bnxt_update_vf_mac(struct bnxt *);