ice: Move VF resources definition to SR-IOV specific file

In order to use some of the VF resources definition in the SR-IOV specific
virtchnl header file, this patch moves applicable code to
ice_virtchnl_pf.h file accordingly... and they should have been defined in
the destination file originally.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index b60e64c0036bd1c0b0bbc806b29b75b323ca06b9..9f9c30d29eb5aebd90d4f763d776353b875a1b43 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -87,16 +87,6 @@ extern const char ice_drv_ver[];
 #define ICE_RES_MISC_VEC_ID    (ICE_RES_VALID_BIT - 1)
 #define ICE_INVAL_Q_INDEX      0xffff
 #define ICE_INVAL_VFID         256
-#define ICE_MAX_VF_COUNT       256
-#define ICE_MAX_QS_PER_VF              256
-#define ICE_MIN_QS_PER_VF              1
-#define ICE_DFLT_QS_PER_VF             4
-#define ICE_NONQ_VECS_VF               1
-#define ICE_MAX_SCATTER_QS_PER_VF      16
-#define ICE_MAX_BASE_QS_PER_VF         16
-#define ICE_MAX_INTR_PER_VF            65
-#define ICE_MIN_INTR_PER_VF            (ICE_MIN_QS_PER_VF + 1)
-#define ICE_DFLT_INTR_PER_VF           (ICE_DFLT_QS_PER_VF + 1)
 
 #define ICE_MAX_RESET_WAIT             20
 

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index 79bb47f73879bf3d648ef4a540fcaefe65e35d15..4d94853f119a307e105c2a0eae68547e9964360b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -26,6 +26,19 @@
 #define ICE_PCI_CIAD_WAIT_COUNT                100
 #define ICE_PCI_CIAD_WAIT_DELAY_US     1
 
+/* VF resources default values and limitation */
+#define ICE_MAX_VF_COUNT               256
+#define ICE_MAX_QS_PER_VF              256
+#define ICE_MIN_QS_PER_VF              1
+#define ICE_DFLT_QS_PER_VF             4
+#define ICE_NONQ_VECS_VF               1
+#define ICE_MAX_SCATTER_QS_PER_VF      16
+#define ICE_MAX_BASE_QS_PER_VF         16
+#define ICE_MAX_INTR_PER_VF            65
+#define ICE_MAX_POLICY_INTR_PER_VF     33
+#define ICE_MIN_INTR_PER_VF            (ICE_MIN_QS_PER_VF + 1)
+#define ICE_DFLT_INTR_PER_VF           (ICE_DFLT_QS_PER_VF + 1)
+
 /* Specific VF states */
 enum ice_vf_states {
        ICE_VF_STATE_INIT = 0,