i40e: Remove VF MAC types

The i40e_hw.mac.type cannot to be equal to I40E_MAC_VF or
I40E_MAC_X722_VF so remove helper i40e_is_vf(), simplify
i40e_adminq_init_regs() and remove enums for these VF MAC types.

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20231113231047.548659-14-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 29fc46abf690b8c075a81700fda7e4c1e8f5fb09..896c4390530949f1670dab8876998994b242a32b 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -17,29 +17,16 @@ static void i40e_resume_aq(struct i40e_hw *hw);
 static void i40e_adminq_init_regs(struct i40e_hw *hw)
 {
        /* set head and tail registers in our local struct */
-       if (i40e_is_vf(hw)) {
-               hw->aq.asq.tail = I40E_VF_ATQT1;
-               hw->aq.asq.head = I40E_VF_ATQH1;
-               hw->aq.asq.len  = I40E_VF_ATQLEN1;
-               hw->aq.asq.bal  = I40E_VF_ATQBAL1;
-               hw->aq.asq.bah  = I40E_VF_ATQBAH1;
-               hw->aq.arq.tail = I40E_VF_ARQT1;
-               hw->aq.arq.head = I40E_VF_ARQH1;
-               hw->aq.arq.len  = I40E_VF_ARQLEN1;
-               hw->aq.arq.bal  = I40E_VF_ARQBAL1;
-               hw->aq.arq.bah  = I40E_VF_ARQBAH1;
-       } else {
-               hw->aq.asq.tail = I40E_PF_ATQT;
-               hw->aq.asq.head = I40E_PF_ATQH;
-               hw->aq.asq.len  = I40E_PF_ATQLEN;
-               hw->aq.asq.bal  = I40E_PF_ATQBAL;
-               hw->aq.asq.bah  = I40E_PF_ATQBAH;
-               hw->aq.arq.tail = I40E_PF_ARQT;
-               hw->aq.arq.head = I40E_PF_ARQH;
-               hw->aq.arq.len  = I40E_PF_ARQLEN;
-               hw->aq.arq.bal  = I40E_PF_ARQBAL;
-               hw->aq.arq.bah  = I40E_PF_ARQBAH;
-       }
+       hw->aq.asq.tail = I40E_PF_ATQT;
+       hw->aq.asq.head = I40E_PF_ATQH;
+       hw->aq.asq.len  = I40E_PF_ATQLEN;
+       hw->aq.asq.bal  = I40E_PF_ATQBAL;
+       hw->aq.asq.bah  = I40E_PF_ATQBAH;
+       hw->aq.arq.tail = I40E_PF_ARQT;
+       hw->aq.arq.head = I40E_PF_ARQH;
+       hw->aq.arq.len  = I40E_PF_ARQLEN;
+       hw->aq.arq.bal  = I40E_PF_ARQBAL;
+       hw->aq.arq.bah  = I40E_PF_ARQBAH;
 }
 
 /**

diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 9752d145939cf9b1f6bfbbfda105a417d78d5e3e..e21a8e06f6b2d33134ae79ab841025e5d49fc48e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -64,9 +64,7 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
 enum i40e_mac_type {
        I40E_MAC_UNKNOWN = 0,
        I40E_MAC_XL710,
-       I40E_MAC_VF,
        I40E_MAC_X722,
-       I40E_MAC_X722_VF,
        I40E_MAC_GENERIC,
 };
 
@@ -588,12 +586,6 @@ struct i40e_hw {
        char err_str[16];
 };
 
-static inline bool i40e_is_vf(struct i40e_hw *hw)
-{
-       return (hw->mac.type == I40E_MAC_VF ||
-               hw->mac.type == I40E_MAC_X722_VF);
-}
-
 /**
  * i40e_is_aq_api_ver_ge
  * @hw: pointer to i40e_hw structure