Remove a bunch of unused code and reformat a few lines. Also
remove some now un-necessary files.

Signed-off-by: Jesse Brandeburg <jesse.brandeb...@intel.com>
---
 drivers/net/ethernet/intel/iavf/i40e_adminq.c     |   27 -
 drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 2276 +--------------------
 drivers/net/ethernet/intel/iavf/i40e_common.c     |  337 ---
 drivers/net/ethernet/intel/iavf/i40e_hmc.h        |  215 --
 drivers/net/ethernet/intel/iavf/i40e_lan_hmc.h    |  158 --
 drivers/net/ethernet/intel/iavf/i40e_prototype.h  |   65 +-
 drivers/net/ethernet/intel/iavf/i40e_register.h   |  245 ---
 drivers/net/ethernet/intel/iavf/i40e_type.h       |  783 +------
 8 files changed, 50 insertions(+), 4056 deletions(-)
 delete mode 100644 drivers/net/ethernet/intel/iavf/i40e_hmc.h
 delete mode 100644 drivers/net/ethernet/intel/iavf/i40e_lan_hmc.h

diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq.c 
b/drivers/net/ethernet/intel/iavf/i40e_adminq.c
index 21a0dbf6ccf6..32e0e2d9cdc5 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/iavf/i40e_adminq.c
@@ -7,16 +7,6 @@
 #include "i40e_adminq.h"
 #include "i40e_prototype.h"
 
-/**
- * i40e_is_nvm_update_op - return true if this is an NVM update operation
- * @desc: API request descriptor
- **/
-static inline bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc)
-{
-       return (desc->opcode == i40e_aqc_opc_nvm_erase) ||
-              (desc->opcode == i40e_aqc_opc_nvm_update);
-}
-
 /**
  *  i40e_adminq_init_regs - Initialize AdminQ registers
  *  @hw: pointer to the hardware structure
@@ -569,9 +559,6 @@ i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw)
        i40e_shutdown_asq(hw);
        i40e_shutdown_arq(hw);
 
-       if (hw->nvm_buff.va)
-               i40e_free_virt_mem(hw, &hw->nvm_buff);
-
        return ret_code;
 }
 
@@ -951,17 +938,3 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw,
 
        return ret_code;
 }
-
-void i40evf_resume_aq(struct i40e_hw *hw)
-{
-       /* Registers are reset after PF reset */
-       hw->aq.asq.next_to_use = 0;
-       hw->aq.asq.next_to_clean = 0;
-
-       i40e_config_asq_regs(hw);
-
-       hw->aq.arq.next_to_use = 0;
-       hw->aq.arq.next_to_clean = 0;
-
-       i40e_config_arq_regs(hw);
-}
diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h 
b/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h
index 5fd8529465d4..e7224ff9496f 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h
@@ -307,33 +307,6 @@ enum i40e_admin_queue_opc {
  */
 #define I40E_CHECK_CMD_LENGTH(X)       I40E_CHECK_STRUCT_LEN(16, X)
 
-/* internal (0x00XX) commands */
-
-/* Get version (direct 0x0001) */
-struct i40e_aqc_get_version {
-       __le32 rom_ver;
-       __le32 fw_build;
-       __le16 fw_major;
-       __le16 fw_minor;
-       __le16 api_major;
-       __le16 api_minor;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_version);
-
-/* Send driver version (indirect 0x0002) */
-struct i40e_aqc_driver_version {
-       u8      driver_major_ver;
-       u8      driver_minor_ver;
-       u8      driver_build_ver;
-       u8      driver_subbuild_ver;
-       u8      reserved[4];
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_driver_version);
-
 /* Queue Shutdown (direct 0x0003) */
 struct i40e_aqc_queue_shutdown {
        __le32  driver_unloading;
@@ -343,490 +316,6 @@ struct i40e_aqc_queue_shutdown {
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_queue_shutdown);
 
-/* Set PF context (0x0004, direct) */
-struct i40e_aqc_set_pf_context {
-       u8      pf_id;
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_pf_context);
-
-/* Request resource ownership (direct 0x0008)
- * Release resource ownership (direct 0x0009)
- */
-#define I40E_AQ_RESOURCE_NVM                   1
-#define I40E_AQ_RESOURCE_SDP                   2
-#define I40E_AQ_RESOURCE_ACCESS_READ           1
-#define I40E_AQ_RESOURCE_ACCESS_WRITE          2
-#define I40E_AQ_RESOURCE_NVM_READ_TIMEOUT      3000
-#define I40E_AQ_RESOURCE_NVM_WRITE_TIMEOUT     180000
-
-struct i40e_aqc_request_resource {
-       __le16  resource_id;
-       __le16  access_type;
-       __le32  timeout;
-       __le32  resource_number;
-       u8      reserved[4];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_request_resource);
-
-/* Get function capabilities (indirect 0x000A)
- * Get device capabilities (indirect 0x000B)
- */
-struct i40e_aqc_list_capabilites {
-       u8 command_flags;
-#define I40E_AQ_LIST_CAP_PF_INDEX_EN   1
-       u8 pf_index;
-       u8 reserved[2];
-       __le32 count;
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_list_capabilites);
-
-struct i40e_aqc_list_capabilities_element_resp {
-       __le16  id;
-       u8      major_rev;
-       u8      minor_rev;
-       __le32  number;
-       __le32  logical_id;
-       __le32  phys_id;
-       u8      reserved[16];
-};
-
-/* list of caps */
-
-#define I40E_AQ_CAP_ID_SWITCH_MODE     0x0001
-#define I40E_AQ_CAP_ID_MNG_MODE                0x0002
-#define I40E_AQ_CAP_ID_NPAR_ACTIVE     0x0003
-#define I40E_AQ_CAP_ID_OS2BMC_CAP      0x0004
-#define I40E_AQ_CAP_ID_FUNCTIONS_VALID 0x0005
-#define I40E_AQ_CAP_ID_ALTERNATE_RAM   0x0006
-#define I40E_AQ_CAP_ID_WOL_AND_PROXY   0x0008
-#define I40E_AQ_CAP_ID_SRIOV           0x0012
-#define I40E_AQ_CAP_ID_VF              0x0013
-#define I40E_AQ_CAP_ID_VMDQ            0x0014
-#define I40E_AQ_CAP_ID_8021QBG         0x0015
-#define I40E_AQ_CAP_ID_8021QBR         0x0016
-#define I40E_AQ_CAP_ID_VSI             0x0017
-#define I40E_AQ_CAP_ID_DCB             0x0018
-#define I40E_AQ_CAP_ID_FCOE            0x0021
-#define I40E_AQ_CAP_ID_ISCSI           0x0022
-#define I40E_AQ_CAP_ID_RSS             0x0040
-#define I40E_AQ_CAP_ID_RXQ             0x0041
-#define I40E_AQ_CAP_ID_TXQ             0x0042
-#define I40E_AQ_CAP_ID_MSIX            0x0043
-#define I40E_AQ_CAP_ID_VF_MSIX         0x0044
-#define I40E_AQ_CAP_ID_FLOW_DIRECTOR   0x0045
-#define I40E_AQ_CAP_ID_1588            0x0046
-#define I40E_AQ_CAP_ID_IWARP           0x0051
-#define I40E_AQ_CAP_ID_LED             0x0061
-#define I40E_AQ_CAP_ID_SDP             0x0062
-#define I40E_AQ_CAP_ID_MDIO            0x0063
-#define I40E_AQ_CAP_ID_WSR_PROT                0x0064
-#define I40E_AQ_CAP_ID_NVM_MGMT                0x0080
-#define I40E_AQ_CAP_ID_FLEX10          0x00F1
-#define I40E_AQ_CAP_ID_CEM             0x00F2
-
-/* Set CPPM Configuration (direct 0x0103) */
-struct i40e_aqc_cppm_configuration {
-       __le16  command_flags;
-#define I40E_AQ_CPPM_EN_LTRC   0x0800
-#define I40E_AQ_CPPM_EN_DMCTH  0x1000
-#define I40E_AQ_CPPM_EN_DMCTLX 0x2000
-#define I40E_AQ_CPPM_EN_HPTC   0x4000
-#define I40E_AQ_CPPM_EN_DMARC  0x8000
-       __le16  ttlx;
-       __le32  dmacr;
-       __le16  dmcth;
-       u8      hptc;
-       u8      reserved;
-       __le32  pfltrc;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_cppm_configuration);
-
-/* Set ARP Proxy command / response (indirect 0x0104) */
-struct i40e_aqc_arp_proxy_data {
-       __le16  command_flags;
-#define I40E_AQ_ARP_INIT_IPV4  0x0800
-#define I40E_AQ_ARP_UNSUP_CTL  0x1000
-#define I40E_AQ_ARP_ENA                0x2000
-#define I40E_AQ_ARP_ADD_IPV4   0x4000
-#define I40E_AQ_ARP_DEL_IPV4   0x8000
-       __le16  table_id;
-       __le32  enabled_offloads;
-#define I40E_AQ_ARP_DIRECTED_OFFLOAD_ENABLE    0x00000020
-#define I40E_AQ_ARP_OFFLOAD_ENABLE             0x00000800
-       __le32  ip_addr;
-       u8      mac_addr[6];
-       u8      reserved[2];
-};
-
-I40E_CHECK_STRUCT_LEN(0x14, i40e_aqc_arp_proxy_data);
-
-/* Set NS Proxy Table Entry Command (indirect 0x0105) */
-struct i40e_aqc_ns_proxy_data {
-       __le16  table_idx_mac_addr_0;
-       __le16  table_idx_mac_addr_1;
-       __le16  table_idx_ipv6_0;
-       __le16  table_idx_ipv6_1;
-       __le16  control;
-#define I40E_AQ_NS_PROXY_ADD_0         0x0001
-#define I40E_AQ_NS_PROXY_DEL_0         0x0002
-#define I40E_AQ_NS_PROXY_ADD_1         0x0004
-#define I40E_AQ_NS_PROXY_DEL_1         0x0008
-#define I40E_AQ_NS_PROXY_ADD_IPV6_0    0x0010
-#define I40E_AQ_NS_PROXY_DEL_IPV6_0    0x0020
-#define I40E_AQ_NS_PROXY_ADD_IPV6_1    0x0040
-#define I40E_AQ_NS_PROXY_DEL_IPV6_1    0x0080
-#define I40E_AQ_NS_PROXY_COMMAND_SEQ   0x0100
-#define I40E_AQ_NS_PROXY_INIT_IPV6_TBL 0x0200
-#define I40E_AQ_NS_PROXY_INIT_MAC_TBL  0x0400
-#define I40E_AQ_NS_PROXY_OFFLOAD_ENABLE        0x0800
-#define I40E_AQ_NS_PROXY_DIRECTED_OFFLOAD_ENABLE       0x1000
-       u8      mac_addr_0[6];
-       u8      mac_addr_1[6];
-       u8      local_mac_addr[6];
-       u8      ipv6_addr_0[16]; /* Warning! spec specifies BE byte order */
-       u8      ipv6_addr_1[16];
-};
-
-I40E_CHECK_STRUCT_LEN(0x3c, i40e_aqc_ns_proxy_data);
-
-/* Manage LAA Command (0x0106) - obsolete */
-struct i40e_aqc_mng_laa {
-       __le16  command_flags;
-#define I40E_AQ_LAA_FLAG_WR    0x8000
-       u8      reserved[2];
-       __le32  sal;
-       __le16  sah;
-       u8      reserved2[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_mng_laa);
-
-/* Manage MAC Address Read Command (indirect 0x0107) */
-struct i40e_aqc_mac_address_read {
-       __le16  command_flags;
-#define I40E_AQC_LAN_ADDR_VALID                0x10
-#define I40E_AQC_SAN_ADDR_VALID                0x20
-#define I40E_AQC_PORT_ADDR_VALID       0x40
-#define I40E_AQC_WOL_ADDR_VALID                0x80
-#define I40E_AQC_MC_MAG_EN_VALID       0x100
-#define I40E_AQC_ADDR_VALID_MASK       0x3F0
-       u8      reserved[6];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_mac_address_read);
-
-struct i40e_aqc_mac_address_read_data {
-       u8 pf_lan_mac[6];
-       u8 pf_san_mac[6];
-       u8 port_mac[6];
-       u8 pf_wol_mac[6];
-};
-
-I40E_CHECK_STRUCT_LEN(24, i40e_aqc_mac_address_read_data);
-
-/* Manage MAC Address Write Command (0x0108) */
-struct i40e_aqc_mac_address_write {
-       __le16  command_flags;
-#define I40E_AQC_WRITE_TYPE_LAA_ONLY   0x0000
-#define I40E_AQC_WRITE_TYPE_LAA_WOL    0x4000
-#define I40E_AQC_WRITE_TYPE_PORT       0x8000
-#define I40E_AQC_WRITE_TYPE_UPDATE_MC_MAG      0xC000
-#define I40E_AQC_WRITE_TYPE_MASK       0xC000
-
-       __le16  mac_sah;
-       __le32  mac_sal;
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_mac_address_write);
-
-/* PXE commands (0x011x) */
-
-/* Clear PXE Command and response  (direct 0x0110) */
-struct i40e_aqc_clear_pxe {
-       u8      rx_cnt;
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_clear_pxe);
-
-/* Set WoL Filter (0x0120) */
-
-struct i40e_aqc_set_wol_filter {
-       __le16 filter_index;
-#define I40E_AQC_MAX_NUM_WOL_FILTERS   8
-#define I40E_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT       15
-#define I40E_AQC_SET_WOL_FILTER_TYPE_MAGIC_MASK        (0x1 << \
-               I40E_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT)
-
-#define I40E_AQC_SET_WOL_FILTER_INDEX_SHIFT            0
-#define I40E_AQC_SET_WOL_FILTER_INDEX_MASK     (0x7 << \
-               I40E_AQC_SET_WOL_FILTER_INDEX_SHIFT)
-       __le16 cmd_flags;
-#define I40E_AQC_SET_WOL_FILTER                                0x8000
-#define I40E_AQC_SET_WOL_FILTER_NO_TCO_WOL             0x4000
-#define I40E_AQC_SET_WOL_FILTER_WOL_PRESERVE_ON_PFR    0x2000
-#define I40E_AQC_SET_WOL_FILTER_ACTION_CLEAR           0
-#define I40E_AQC_SET_WOL_FILTER_ACTION_SET             1
-       __le16 valid_flags;
-#define I40E_AQC_SET_WOL_FILTER_ACTION_VALID           0x8000
-#define I40E_AQC_SET_WOL_FILTER_NO_TCO_ACTION_VALID    0x4000
-       u8 reserved[2];
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_wol_filter);
-
-struct i40e_aqc_set_wol_filter_data {
-       u8 filter[128];
-       u8 mask[16];
-};
-
-I40E_CHECK_STRUCT_LEN(0x90, i40e_aqc_set_wol_filter_data);
-
-/* Get Wake Reason (0x0121) */
-
-struct i40e_aqc_get_wake_reason_completion {
-       u8 reserved_1[2];
-       __le16 wake_reason;
-#define I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT     0
-#define I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_MASK (0xFF << \
-               I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT)
-#define I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT  8
-#define I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_MASK   (0xFF << \
-               I40E_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT)
-       u8 reserved_2[12];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_wake_reason_completion);
-
-/* Switch configuration commands (0x02xx) */
-
-/* Used by many indirect commands that only pass an seid and a buffer in the
- * command
- */
-struct i40e_aqc_switch_seid {
-       __le16  seid;
-       u8      reserved[6];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_switch_seid);
-
-/* Get Switch Configuration command (indirect 0x0200)
- * uses i40e_aqc_switch_seid for the descriptor
- */
-struct i40e_aqc_get_switch_config_header_resp {
-       __le16  num_reported;
-       __le16  num_total;
-       u8      reserved[12];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_switch_config_header_resp);
-
-struct i40e_aqc_switch_config_element_resp {
-       u8      element_type;
-#define I40E_AQ_SW_ELEM_TYPE_MAC       1
-#define I40E_AQ_SW_ELEM_TYPE_PF                2
-#define I40E_AQ_SW_ELEM_TYPE_VF                3
-#define I40E_AQ_SW_ELEM_TYPE_EMP       4
-#define I40E_AQ_SW_ELEM_TYPE_BMC       5
-#define I40E_AQ_SW_ELEM_TYPE_PV                16
-#define I40E_AQ_SW_ELEM_TYPE_VEB       17
-#define I40E_AQ_SW_ELEM_TYPE_PA                18
-#define I40E_AQ_SW_ELEM_TYPE_VSI       19
-       u8      revision;
-#define I40E_AQ_SW_ELEM_REV_1          1
-       __le16  seid;
-       __le16  uplink_seid;
-       __le16  downlink_seid;
-       u8      reserved[3];
-       u8      connection_type;
-#define I40E_AQ_CONN_TYPE_REGULAR      0x1
-#define I40E_AQ_CONN_TYPE_DEFAULT      0x2
-#define I40E_AQ_CONN_TYPE_CASCADED     0x3
-       __le16  scheduler_id;
-       __le16  element_info;
-};
-
-I40E_CHECK_STRUCT_LEN(0x10, i40e_aqc_switch_config_element_resp);
-
-/* Get Switch Configuration (indirect 0x0200)
- *    an array of elements are returned in the response buffer
- *    the first in the array is the header, remainder are elements
- */
-struct i40e_aqc_get_switch_config_resp {
-       struct i40e_aqc_get_switch_config_header_resp   header;
-       struct i40e_aqc_switch_config_element_resp      element[1];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_get_switch_config_resp);
-
-/* Add Statistics (direct 0x0201)
- * Remove Statistics (direct 0x0202)
- */
-struct i40e_aqc_add_remove_statistics {
-       __le16  seid;
-       __le16  vlan;
-       __le16  stat_index;
-       u8      reserved[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_statistics);
-
-/* Set Port Parameters command (direct 0x0203) */
-struct i40e_aqc_set_port_parameters {
-       __le16  command_flags;
-#define I40E_AQ_SET_P_PARAMS_SAVE_BAD_PACKETS  1
-#define I40E_AQ_SET_P_PARAMS_PAD_SHORT_PACKETS 2 /* must set! */
-#define I40E_AQ_SET_P_PARAMS_DOUBLE_VLAN_ENA   4
-       __le16  bad_frame_vsi;
-#define I40E_AQ_SET_P_PARAMS_BFRAME_SEID_SHIFT 0x0
-#define I40E_AQ_SET_P_PARAMS_BFRAME_SEID_MASK  0x3FF
-       __le16  default_seid;        /* reserved for command */
-       u8      reserved[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_port_parameters);
-
-/* Get Switch Resource Allocation (indirect 0x0204) */
-struct i40e_aqc_get_switch_resource_alloc {
-       u8      num_entries;         /* reserved for command */
-       u8      reserved[7];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_switch_resource_alloc);
-
-/* expect an array of these structs in the response buffer */
-struct i40e_aqc_switch_resource_alloc_element_resp {
-       u8      resource_type;
-#define I40E_AQ_RESOURCE_TYPE_VEB              0x0
-#define I40E_AQ_RESOURCE_TYPE_VSI              0x1
-#define I40E_AQ_RESOURCE_TYPE_MACADDR          0x2
-#define I40E_AQ_RESOURCE_TYPE_STAG             0x3
-#define I40E_AQ_RESOURCE_TYPE_ETAG             0x4
-#define I40E_AQ_RESOURCE_TYPE_MULTICAST_HASH   0x5
-#define I40E_AQ_RESOURCE_TYPE_UNICAST_HASH     0x6
-#define I40E_AQ_RESOURCE_TYPE_VLAN             0x7
-#define I40E_AQ_RESOURCE_TYPE_VSI_LIST_ENTRY   0x8
-#define I40E_AQ_RESOURCE_TYPE_ETAG_LIST_ENTRY  0x9
-#define I40E_AQ_RESOURCE_TYPE_VLAN_STAT_POOL   0xA
-#define I40E_AQ_RESOURCE_TYPE_MIRROR_RULE      0xB
-#define I40E_AQ_RESOURCE_TYPE_QUEUE_SETS       0xC
-#define I40E_AQ_RESOURCE_TYPE_VLAN_FILTERS     0xD
-#define I40E_AQ_RESOURCE_TYPE_INNER_MAC_FILTERS        0xF
-#define I40E_AQ_RESOURCE_TYPE_IP_FILTERS       0x10
-#define I40E_AQ_RESOURCE_TYPE_GRE_VN_KEYS      0x11
-#define I40E_AQ_RESOURCE_TYPE_VN2_KEYS         0x12
-#define I40E_AQ_RESOURCE_TYPE_TUNNEL_PORTS     0x13
-       u8      reserved1;
-       __le16  guaranteed;
-       __le16  total;
-       __le16  used;
-       __le16  total_unalloced;
-       u8      reserved2[6];
-};
-
-I40E_CHECK_STRUCT_LEN(0x10, i40e_aqc_switch_resource_alloc_element_resp);
-
-/* Set Switch Configuration (direct 0x0205) */
-struct i40e_aqc_set_switch_config {
-       __le16  flags;
-/* flags used for both fields below */
-#define I40E_AQ_SET_SWITCH_CFG_PROMISC         0x0001
-#define I40E_AQ_SET_SWITCH_CFG_L2_FILTER       0x0002
-       __le16  valid_flags;
-       /* The ethertype in switch_tag is dropped on ingress and used
-        * internally by the switch. Set this to zero for the default
-        * of 0x88a8 (802.1ad). Should be zero for firmware API
-        * versions lower than 1.7.
-        */
-       __le16  switch_tag;
-       /* The ethertypes in first_tag and second_tag are used to
-        * match the outer and inner VLAN tags (respectively) when HW
-        * double VLAN tagging is enabled via the set port parameters
-        * AQ command. Otherwise these are both ignored. Set them to
-        * zero for their defaults of 0x8100 (802.1Q). Should be zero
-        * for firmware API versions lower than 1.7.
-        */
-       __le16  first_tag;
-       __le16  second_tag;
-       u8      reserved[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_switch_config);
-
-/* Read Receive control registers  (direct 0x0206)
- * Write Receive control registers (direct 0x0207)
- *     used for accessing Rx control registers that can be
- *     slow and need special handling when under high Rx load
- */
-struct i40e_aqc_rx_ctl_reg_read_write {
-       __le32 reserved1;
-       __le32 address;
-       __le32 reserved2;
-       __le32 value;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_rx_ctl_reg_read_write);
-
-/* Add VSI (indirect 0x0210)
- *    this indirect command uses struct i40e_aqc_vsi_properties_data
- *    as the indirect buffer (128 bytes)
- *
- * Update VSI (indirect 0x211)
- *     uses the same data structure as Add VSI
- *
- * Get VSI (indirect 0x0212)
- *     uses the same completion and data structure as Add VSI
- */
-struct i40e_aqc_add_get_update_vsi {
-       __le16  uplink_seid;
-       u8      connection_type;
-#define I40E_AQ_VSI_CONN_TYPE_NORMAL   0x1
-#define I40E_AQ_VSI_CONN_TYPE_DEFAULT  0x2
-#define I40E_AQ_VSI_CONN_TYPE_CASCADED 0x3
-       u8      reserved1;
-       u8      vf_id;
-       u8      reserved2;
-       __le16  vsi_flags;
-#define I40E_AQ_VSI_TYPE_SHIFT         0x0
-#define I40E_AQ_VSI_TYPE_MASK          (0x3 << I40E_AQ_VSI_TYPE_SHIFT)
-#define I40E_AQ_VSI_TYPE_VF            0x0
-#define I40E_AQ_VSI_TYPE_VMDQ2         0x1
-#define I40E_AQ_VSI_TYPE_PF            0x2
-#define I40E_AQ_VSI_TYPE_EMP_MNG       0x3
-#define I40E_AQ_VSI_FLAG_CASCADED_PV   0x4
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_get_update_vsi);
-
-struct i40e_aqc_add_get_update_vsi_completion {
-       __le16 seid;
-       __le16 vsi_number;
-       __le16 vsi_used;
-       __le16 vsi_free;
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_get_update_vsi_completion);
-
 struct i40e_aqc_vsi_properties_data {
        /* first 96 byte are written by SW */
        __le16  valid_sections;
@@ -952,87 +441,6 @@ struct i40e_aqc_vsi_properties_data {
 
 I40E_CHECK_STRUCT_LEN(128, i40e_aqc_vsi_properties_data);
 
-/* Add Port Virtualizer (direct 0x0220)
- * also used for update PV (direct 0x0221) but only flags are used
- * (IS_CTRL_PORT only works on add PV)
- */
-struct i40e_aqc_add_update_pv {
-       __le16  command_flags;
-#define I40E_AQC_PV_FLAG_PV_TYPE               0x1
-#define I40E_AQC_PV_FLAG_FWD_UNKNOWN_STAG_EN   0x2
-#define I40E_AQC_PV_FLAG_FWD_UNKNOWN_ETAG_EN   0x4
-#define I40E_AQC_PV_FLAG_IS_CTRL_PORT          0x8
-       __le16  uplink_seid;
-       __le16  connected_seid;
-       u8      reserved[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_update_pv);
-
-struct i40e_aqc_add_update_pv_completion {
-       /* reserved for update; for add also encodes error if rc == ENOSPC */
-       __le16  pv_seid;
-#define I40E_AQC_PV_ERR_FLAG_NO_PV     0x1
-#define I40E_AQC_PV_ERR_FLAG_NO_SCHED  0x2
-#define I40E_AQC_PV_ERR_FLAG_NO_COUNTER        0x4
-#define I40E_AQC_PV_ERR_FLAG_NO_ENTRY  0x8
-       u8      reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_update_pv_completion);
-
-/* Get PV Params (direct 0x0222)
- * uses i40e_aqc_switch_seid for the descriptor
- */
-
-struct i40e_aqc_get_pv_params_completion {
-       __le16  seid;
-       __le16  default_stag;
-       __le16  pv_flags; /* same flags as add_pv */
-#define I40E_AQC_GET_PV_PV_TYPE                        0x1
-#define I40E_AQC_GET_PV_FRWD_UNKNOWN_STAG      0x2
-#define I40E_AQC_GET_PV_FRWD_UNKNOWN_ETAG      0x4
-       u8      reserved[8];
-       __le16  default_port_seid;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_pv_params_completion);
-
-/* Add VEB (direct 0x0230) */
-struct i40e_aqc_add_veb {
-       __le16  uplink_seid;
-       __le16  downlink_seid;
-       __le16  veb_flags;
-#define I40E_AQC_ADD_VEB_FLOATING              0x1
-#define I40E_AQC_ADD_VEB_PORT_TYPE_SHIFT       1
-#define I40E_AQC_ADD_VEB_PORT_TYPE_MASK                (0x3 << \
-                                       I40E_AQC_ADD_VEB_PORT_TYPE_SHIFT)
-#define I40E_AQC_ADD_VEB_PORT_TYPE_DEFAULT     0x2
-#define I40E_AQC_ADD_VEB_PORT_TYPE_DATA                0x4
-#define I40E_AQC_ADD_VEB_ENABLE_L2_FILTER      0x8     /* deprecated */
-#define I40E_AQC_ADD_VEB_ENABLE_DISABLE_STATS  0x10
-       u8      enable_tcs;
-       u8      reserved[9];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_veb);
-
-struct i40e_aqc_add_veb_completion {
-       u8      reserved[6];
-       __le16  switch_seid;
-       /* also encodes error if rc == ENOSPC; codes are the same as add_pv */
-       __le16  veb_seid;
-#define I40E_AQC_VEB_ERR_FLAG_NO_VEB           0x1
-#define I40E_AQC_VEB_ERR_FLAG_NO_SCHED         0x2
-#define I40E_AQC_VEB_ERR_FLAG_NO_COUNTER       0x4
-#define I40E_AQC_VEB_ERR_FLAG_NO_ENTRY         0x8
-       __le16  statistic_index;
-       __le16  vebs_used;
-       __le16  vebs_free;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_veb_completion);
-
 /* Get VEB Parameters (direct 0x0232)
  * uses i40e_aqc_switch_seid for the descriptor
  */
@@ -1048,1670 +456,74 @@ struct i40e_aqc_get_veb_parameters_completion {
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_get_veb_parameters_completion);
 
-/* Delete Element (direct 0x0243)
- * uses the generic i40e_aqc_switch_seid
- */
-
-/* Add MAC-VLAN (indirect 0x0250) */
-
-/* used for the command for most vlan commands */
-struct i40e_aqc_macvlan {
-       __le16  num_addresses;
-       __le16  seid[3];
-#define I40E_AQC_MACVLAN_CMD_SEID_NUM_SHIFT    0
-#define I40E_AQC_MACVLAN_CMD_SEID_NUM_MASK     (0x3FF << \
-                                       I40E_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
-#define I40E_AQC_MACVLAN_CMD_SEID_VALID                0x8000
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_macvlan);
-
-/* indirect data for command and response */
-struct i40e_aqc_add_macvlan_element_data {
-       u8      mac_addr[6];
-       __le16  vlan_tag;
-       __le16  flags;
-#define I40E_AQC_MACVLAN_ADD_PERFECT_MATCH     0x0001
-#define I40E_AQC_MACVLAN_ADD_HASH_MATCH                0x0002
-#define I40E_AQC_MACVLAN_ADD_IGNORE_VLAN       0x0004
-#define I40E_AQC_MACVLAN_ADD_TO_QUEUE          0x0008
-#define I40E_AQC_MACVLAN_ADD_USE_SHARED_MAC    0x0010
-       __le16  queue_number;
-#define I40E_AQC_MACVLAN_CMD_QUEUE_SHIFT       0
-#define I40E_AQC_MACVLAN_CMD_QUEUE_MASK                (0x7FF << \
-                                       I40E_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
-       /* response section */
-       u8      match_method;
-#define I40E_AQC_MM_PERFECT_MATCH      0x01
-#define I40E_AQC_MM_HASH_MATCH         0x02
-#define I40E_AQC_MM_ERR_NO_RES         0xFF
-       u8      reserved1[3];
-};
+#define I40E_LINK_SPEED_100MB_SHIFT    0x1
+#define I40E_LINK_SPEED_1000MB_SHIFT   0x2
+#define I40E_LINK_SPEED_10GB_SHIFT     0x3
+#define I40E_LINK_SPEED_40GB_SHIFT     0x4
+#define I40E_LINK_SPEED_20GB_SHIFT     0x5
+#define I40E_LINK_SPEED_25GB_SHIFT     0x6
 
-struct i40e_aqc_add_remove_macvlan_completion {
-       __le16 perfect_mac_used;
-       __le16 perfect_mac_free;
-       __le16 unicast_hash_free;
-       __le16 multicast_hash_free;
-       __le32 addr_high;
-       __le32 addr_low;
+enum i40e_aq_link_speed {
+       I40E_LINK_SPEED_UNKNOWN = 0,
+       I40E_LINK_SPEED_100MB   = BIT(I40E_LINK_SPEED_100MB_SHIFT),
+       I40E_LINK_SPEED_1GB     = BIT(I40E_LINK_SPEED_1000MB_SHIFT),
+       I40E_LINK_SPEED_10GB    = BIT(I40E_LINK_SPEED_10GB_SHIFT),
+       I40E_LINK_SPEED_40GB    = BIT(I40E_LINK_SPEED_40GB_SHIFT),
+       I40E_LINK_SPEED_20GB    = BIT(I40E_LINK_SPEED_20GB_SHIFT),
+       I40E_LINK_SPEED_25GB    = BIT(I40E_LINK_SPEED_25GB_SHIFT),
 };
 
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_macvlan_completion);
-
-/* Remove MAC-VLAN (indirect 0x0251)
- * uses i40e_aqc_macvlan for the descriptor
- * data points to an array of num_addresses of elements
- */
-
-struct i40e_aqc_remove_macvlan_element_data {
-       u8      mac_addr[6];
-       __le16  vlan_tag;
-       u8      flags;
-#define I40E_AQC_MACVLAN_DEL_PERFECT_MATCH     0x01
-#define I40E_AQC_MACVLAN_DEL_HASH_MATCH                0x02
-#define I40E_AQC_MACVLAN_DEL_IGNORE_VLAN       0x08
-#define I40E_AQC_MACVLAN_DEL_ALL_VSIS          0x10
-       u8      reserved[3];
-       /* reply section */
-       u8      error_code;
-#define I40E_AQC_REMOVE_MACVLAN_SUCCESS                0x0
-#define I40E_AQC_REMOVE_MACVLAN_FAIL           0xFF
-       u8      reply_reserved[3];
-};
 
-/* Add VLAN (indirect 0x0252)
- * Remove VLAN (indirect 0x0253)
- * use the generic i40e_aqc_macvlan for the command
+/* Send to PF command (indirect 0x0801) id is only used by PF
+ * Send to VF command (indirect 0x0802) id is only used by PF
+ * Send to Peer PF command (indirect 0x0803)
  */
-struct i40e_aqc_add_remove_vlan_element_data {
-       __le16  vlan_tag;
-       u8      vlan_flags;
-/* flags for add VLAN */
-#define I40E_AQC_ADD_VLAN_LOCAL                        0x1
-#define I40E_AQC_ADD_PVLAN_TYPE_SHIFT          1
-#define I40E_AQC_ADD_PVLAN_TYPE_MASK   (0x3 << I40E_AQC_ADD_PVLAN_TYPE_SHIFT)
-#define I40E_AQC_ADD_PVLAN_TYPE_REGULAR                0x0
-#define I40E_AQC_ADD_PVLAN_TYPE_PRIMARY                0x2
-#define I40E_AQC_ADD_PVLAN_TYPE_SECONDARY      0x4
-#define I40E_AQC_VLAN_PTYPE_SHIFT              3
-#define I40E_AQC_VLAN_PTYPE_MASK       (0x3 << I40E_AQC_VLAN_PTYPE_SHIFT)
-#define I40E_AQC_VLAN_PTYPE_REGULAR_VSI                0x0
-#define I40E_AQC_VLAN_PTYPE_PROMISC_VSI                0x8
-#define I40E_AQC_VLAN_PTYPE_COMMUNITY_VSI      0x10
-#define I40E_AQC_VLAN_PTYPE_ISOLATED_VSI       0x18
-/* flags for remove VLAN */
-#define I40E_AQC_REMOVE_VLAN_ALL       0x1
-       u8      reserved;
-       u8      result;
-/* flags for add VLAN */
-#define I40E_AQC_ADD_VLAN_SUCCESS      0x0
-#define I40E_AQC_ADD_VLAN_FAIL_REQUEST 0xFE
-#define I40E_AQC_ADD_VLAN_FAIL_RESOURCE        0xFF
-/* flags for remove VLAN */
-#define I40E_AQC_REMOVE_VLAN_SUCCESS   0x0
-#define I40E_AQC_REMOVE_VLAN_FAIL      0xFF
-       u8      reserved1[3];
-};
-
-struct i40e_aqc_add_remove_vlan_completion {
+struct i40e_aqc_pf_vf_message {
+       __le32  id;
        u8      reserved[4];
-       __le16  vlans_used;
-       __le16  vlans_free;
        __le32  addr_high;
        __le32  addr_low;
 };
 
-/* Set VSI Promiscuous Modes (direct 0x0254) */
-struct i40e_aqc_set_vsi_promiscuous_modes {
-       __le16  promiscuous_flags;
-       __le16  valid_flags;
-/* flags used for both fields above */
-#define I40E_AQC_SET_VSI_PROMISC_UNICAST       0x01
-#define I40E_AQC_SET_VSI_PROMISC_MULTICAST     0x02
-#define I40E_AQC_SET_VSI_PROMISC_BROADCAST     0x04
-#define I40E_AQC_SET_VSI_DEFAULT               0x08
-#define I40E_AQC_SET_VSI_PROMISC_VLAN          0x10
-#define I40E_AQC_SET_VSI_PROMISC_TX            0x8000
-       __le16  seid;
-#define I40E_AQC_VSI_PROM_CMD_SEID_MASK                0x3FF
-       __le16  vlan_tag;
-#define I40E_AQC_SET_VSI_VLAN_MASK             0x0FFF
-#define I40E_AQC_SET_VSI_VLAN_VALID            0x8000
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_vsi_promiscuous_modes);
-
-/* Add S/E-tag command (direct 0x0255)
- * Uses generic i40e_aqc_add_remove_tag_completion for completion
- */
-struct i40e_aqc_add_tag {
-       __le16  flags;
-#define I40E_AQC_ADD_TAG_FLAG_TO_QUEUE         0x0001
-       __le16  seid;
-#define I40E_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT    0
-#define I40E_AQC_ADD_TAG_CMD_SEID_NUM_MASK     (0x3FF << \
-                                       I40E_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT)
-       __le16  tag;
-       __le16  queue_number;
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_tag);
-
-struct i40e_aqc_add_remove_tag_completion {
-       u8      reserved[12];
-       __le16  tags_used;
-       __le16  tags_free;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_tag_completion);
-
-/* Remove S/E-tag command (direct 0x0256)
- * Uses generic i40e_aqc_add_remove_tag_completion for completion
- */
-struct i40e_aqc_remove_tag {
-       __le16  seid;
-#define I40E_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT 0
-#define I40E_AQC_REMOVE_TAG_CMD_SEID_NUM_MASK  (0x3FF << \
-                                       I40E_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT)
-       __le16  tag;
-       u8      reserved[12];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_tag);
-
-/* Add multicast E-Tag (direct 0x0257)
- * del multicast E-Tag (direct 0x0258) only uses pv_seid and etag fields
- * and no external data
- */
-struct i40e_aqc_add_remove_mcast_etag {
-       __le16  pv_seid;
-       __le16  etag;
-       u8      num_unicast_etags;
-       u8      reserved[3];
-       __le32  addr_high;          /* address of array of 2-byte s-tags */
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_mcast_etag);
+I40E_CHECK_CMD_LENGTH(i40e_aqc_pf_vf_message);
 
-struct i40e_aqc_add_remove_mcast_etag_completion {
-       u8      reserved[4];
-       __le16  mcast_etags_used;
-       __le16  mcast_etags_free;
+struct i40e_aqc_get_set_rss_key {
+#define I40E_AQC_SET_RSS_KEY_VSI_VALID         BIT(15)
+#define I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT      0
+#define I40E_AQC_SET_RSS_KEY_VSI_ID_MASK       (0x3FF << \
+                                       I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT)
+       __le16  vsi_id;
+       u8      reserved[6];
        __le32  addr_high;
        __le32  addr_low;
-
 };
 
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_mcast_etag_completion);
+I40E_CHECK_CMD_LENGTH(i40e_aqc_get_set_rss_key);
 
-/* Update S/E-Tag (direct 0x0259) */
-struct i40e_aqc_update_tag {
-       __le16  seid;
-#define I40E_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT 0
-#define I40E_AQC_UPDATE_TAG_CMD_SEID_NUM_MASK  (0x3FF << \
-                                       I40E_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT)
-       __le16  old_tag;
-       __le16  new_tag;
-       u8      reserved[10];
+struct i40e_aqc_get_set_rss_key_data {
+       u8 standard_rss_key[0x28];
+       u8 extended_hash_key[0xc];
 };
 
-I40E_CHECK_CMD_LENGTH(i40e_aqc_update_tag);
-
-struct i40e_aqc_update_tag_completion {
-       u8      reserved[12];
-       __le16  tags_used;
-       __le16  tags_free;
-};
+I40E_CHECK_STRUCT_LEN(0x34, i40e_aqc_get_set_rss_key_data);
 
-I40E_CHECK_CMD_LENGTH(i40e_aqc_update_tag_completion);
+struct  i40e_aqc_get_set_rss_lut {
+#define I40E_AQC_SET_RSS_LUT_VSI_VALID         BIT(15)
+#define I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT      0
+#define I40E_AQC_SET_RSS_LUT_VSI_ID_MASK       (0x3FF << \
+                                       I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT)
+       __le16  vsi_id;
+#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT  0
+#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK \
+                               BIT(I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)
 
-/* Add Control Packet filter (direct 0x025A)
- * Remove Control Packet filter (direct 0x025B)
- * uses the i40e_aqc_add_oveb_cloud,
- * and the generic direct completion structure
- */
-struct i40e_aqc_add_remove_control_packet_filter {
-       u8      mac[6];
-       __le16  etype;
+#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_VSI    0
+#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_PF     1
        __le16  flags;
-#define I40E_AQC_ADD_CONTROL_PACKET_FLAGS_IGNORE_MAC   0x0001
-#define I40E_AQC_ADD_CONTROL_PACKET_FLAGS_DROP         0x0002
-#define I40E_AQC_ADD_CONTROL_PACKET_FLAGS_TO_QUEUE     0x0004
-#define I40E_AQC_ADD_CONTROL_PACKET_FLAGS_TX           0x0008
-#define I40E_AQC_ADD_CONTROL_PACKET_FLAGS_RX           0x0000
-       __le16  seid;
-#define I40E_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT 0
-#define I40E_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_MASK  (0x3FF << \
-                               I40E_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT)
-       __le16  queue;
-       u8      reserved[2];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_control_packet_filter);
-
-struct i40e_aqc_add_remove_control_packet_filter_completion {
-       __le16  mac_etype_used;
-       __le16  etype_used;
-       __le16  mac_etype_free;
-       __le16  etype_free;
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_control_packet_filter_completion);
-
-/* Add Cloud filters (indirect 0x025C)
- * Remove Cloud filters (indirect 0x025D)
- * uses the i40e_aqc_add_remove_cloud_filters,
- * and the generic indirect completion structure
- */
-struct i40e_aqc_add_remove_cloud_filters {
-       u8      num_filters;
-       u8      reserved;
-       __le16  seid;
-#define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT  0
-#define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_MASK   (0x3FF << \
-                                       I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT)
-       u8      big_buffer_flag;
-#define I40E_AQC_ADD_CLOUD_CMD_BB      1
-       u8      reserved2[3];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_cloud_filters);
-
-struct i40e_aqc_cloud_filters_element_data {
-       u8      outer_mac[6];
-       u8      inner_mac[6];
-       __le16  inner_vlan;
-       union {
-               struct {
-                       u8 reserved[12];
-                       u8 data[4];
-               } v4;
-               struct {
-                       u8 data[16];
-               } v6;
-               struct {
-                       __le16 data[8];
-               } raw_v6;
-       } ipaddr;
-       __le16  flags;
-#define I40E_AQC_ADD_CLOUD_FILTER_SHIFT                        0
-#define I40E_AQC_ADD_CLOUD_FILTER_MASK (0x3F << \
-                                       I40E_AQC_ADD_CLOUD_FILTER_SHIFT)
-/* 0x0000 reserved */
-#define I40E_AQC_ADD_CLOUD_FILTER_OIP                  0x0001
-/* 0x0002 reserved */
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN           0x0003
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_TEN_ID    0x0004
-/* 0x0005 reserved */
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_TEN_ID          0x0006
-/* 0x0007 reserved */
-/* 0x0008 reserved */
-#define I40E_AQC_ADD_CLOUD_FILTER_OMAC                 0x0009
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC                 0x000A
-#define I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC     0x000B
-#define I40E_AQC_ADD_CLOUD_FILTER_IIP                  0x000C
-/* 0x0010 to 0x0017 is for custom filters */
-#define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT              0x0010 /* Dest IP + L4 
Port */
-#define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT             0x0011 /* Dest MAC + L4 
Port */
-#define I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT                0x0012 /* Dest 
MAC + VLAN + L4 Port */
-
-#define I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE              0x0080
-#define I40E_AQC_ADD_CLOUD_VNK_SHIFT                   6
-#define I40E_AQC_ADD_CLOUD_VNK_MASK                    0x00C0
-#define I40E_AQC_ADD_CLOUD_FLAGS_IPV4                  0
-#define I40E_AQC_ADD_CLOUD_FLAGS_IPV6                  0x0100
-
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT              9
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK               0x1E00
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN              0
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC         1
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE             2
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_IP                 3
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_RESERVED           4
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE          5
-
-#define I40E_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_MAC      0x2000
-#define I40E_AQC_ADD_CLOUD_FLAGS_SHARED_INNER_MAC      0x4000
-#define I40E_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_IP       0x8000
-
-       __le32  tenant_id;
-       u8      reserved[4];
-       __le16  queue_number;
-#define I40E_AQC_ADD_CLOUD_QUEUE_SHIFT         0
-#define I40E_AQC_ADD_CLOUD_QUEUE_MASK          (0x7FF << \
-                                                I40E_AQC_ADD_CLOUD_QUEUE_SHIFT)
-       u8      reserved2[14];
-       /* response section */
-       u8      allocation_result;
-#define I40E_AQC_ADD_CLOUD_FILTER_SUCCESS      0x0
-#define I40E_AQC_ADD_CLOUD_FILTER_FAIL         0xFF
-       u8      response_reserved[7];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_cloud_filters_element_data);
-
-/* i40e_aqc_cloud_filters_element_bb is used when
- * I40E_AQC_ADD_CLOUD_CMD_BB flag is set.
- */
-struct i40e_aqc_cloud_filters_element_bb {
-       struct i40e_aqc_cloud_filters_element_data element;
-       u16     general_fields[32];
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0   0
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1   1
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2   2
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0   3
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1   4
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2   5
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0   6
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1   7
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2   8
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0   9
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1   10
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2   11
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD0   12
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD1   13
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD2   14
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0   15
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD1   16
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD2   17
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD3   18
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD4   19
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD5   20
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD6   21
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD7   22
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD0   23
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD1   24
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD2   25
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD3   26
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD4   27
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD5   28
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD6   29
-#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD7   30
-};
-
-I40E_CHECK_STRUCT_LEN(0x80, i40e_aqc_cloud_filters_element_bb);
-
-struct i40e_aqc_remove_cloud_filters_completion {
-       __le16 perfect_ovlan_used;
-       __le16 perfect_ovlan_free;
-       __le16 vlan_used;
-       __le16 vlan_free;
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_cloud_filters_completion);
-
-/* Replace filter Command 0x025F
- * uses the i40e_aqc_replace_cloud_filters,
- * and the generic indirect completion structure
- */
-struct i40e_filter_data {
-       u8 filter_type;
-       u8 input[3];
-};
-
-I40E_CHECK_STRUCT_LEN(4, i40e_filter_data);
-
-struct i40e_aqc_replace_cloud_filters_cmd {
-       u8      valid_flags;
-#define I40E_AQC_REPLACE_L1_FILTER             0x0
-#define I40E_AQC_REPLACE_CLOUD_FILTER          0x1
-#define I40E_AQC_GET_CLOUD_FILTERS             0x2
-#define I40E_AQC_MIRROR_CLOUD_FILTER           0x4
-#define I40E_AQC_HIGH_PRIORITY_CLOUD_FILTER    0x8
-       u8      old_filter_type;
-       u8      new_filter_type;
-       u8      tr_bit;
-       u8      reserved[4];
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_replace_cloud_filters_cmd);
-
-struct i40e_aqc_replace_cloud_filters_cmd_buf {
-       u8      data[32];
-/* Filter type INPUT codes*/
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_ENTRIES_MAX   3
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_VALIDATED     BIT(7)
-
-/* Field Vector offsets */
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_MAC_DA     0
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_ETH   6
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG       7
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_VLAN       8
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_OVLAN 9
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_IVLAN 10
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_TUNNLE_KEY 11
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC       12
-/* big FLU */
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IP_DA      14
-/* big FLU */
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_OIP_DA     15
-
-#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_INNER_VLAN 37
-       struct i40e_filter_data filters[8];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_replace_cloud_filters_cmd_buf);
-
-/* Add Mirror Rule (indirect or direct 0x0260)
- * Delete Mirror Rule (indirect or direct 0x0261)
- * note: some rule types (4,5) do not use an external buffer.
- *       take care to set the flags correctly.
- */
-struct i40e_aqc_add_delete_mirror_rule {
-       __le16 seid;
-       __le16 rule_type;
-#define I40E_AQC_MIRROR_RULE_TYPE_SHIFT                0
-#define I40E_AQC_MIRROR_RULE_TYPE_MASK         (0x7 << \
-                                               I40E_AQC_MIRROR_RULE_TYPE_SHIFT)
-#define I40E_AQC_MIRROR_RULE_TYPE_VPORT_INGRESS        1
-#define I40E_AQC_MIRROR_RULE_TYPE_VPORT_EGRESS 2
-#define I40E_AQC_MIRROR_RULE_TYPE_VLAN         3
-#define I40E_AQC_MIRROR_RULE_TYPE_ALL_INGRESS  4
-#define I40E_AQC_MIRROR_RULE_TYPE_ALL_EGRESS   5
-       __le16 num_entries;
-       __le16 destination;  /* VSI for add, rule id for delete */
-       __le32 addr_high;    /* address of array of 2-byte VSI or VLAN ids */
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule);
-
-struct i40e_aqc_add_delete_mirror_rule_completion {
-       u8      reserved[2];
-       __le16  rule_id;  /* only used on add */
-       __le16  mirror_rules_used;
-       __le16  mirror_rules_free;
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion);
-
-/* Dynamic Device Personalization */
-struct i40e_aqc_write_personalization_profile {
-       u8      flags;
-       u8      reserved[3];
-       __le32  profile_track_id;
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile);
-
-struct i40e_aqc_write_ddp_resp {
-       __le32 error_offset;
-       __le32 error_info;
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-struct i40e_aqc_get_applied_profiles {
-       u8      flags;
-#define I40E_AQC_GET_DDP_GET_CONF      0x1
-#define I40E_AQC_GET_DDP_GET_RDPU_CONF 0x2
-       u8      rsv[3];
-       __le32  reserved;
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_applied_profiles);
-
-/* DCB 0x03xx*/
-
-/* PFC Ignore (direct 0x0301)
- *    the command and response use the same descriptor structure
- */
-struct i40e_aqc_pfc_ignore {
-       u8      tc_bitmap;
-       u8      command_flags; /* unused on response */
-#define I40E_AQC_PFC_IGNORE_SET                0x80
-#define I40E_AQC_PFC_IGNORE_CLEAR      0x0
-       u8      reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_pfc_ignore);
-
-/* DCB Update (direct 0x0302) uses the i40e_aq_desc structure
- * with no parameters
- */
-
-/* TX scheduler 0x04xx */
-
-/* Almost all the indirect commands use
- * this generic struct to pass the SEID in param0
- */
-struct i40e_aqc_tx_sched_ind {
-       __le16  vsi_seid;
-       u8      reserved[6];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_tx_sched_ind);
-
-/* Several commands respond with a set of queue set handles */
-struct i40e_aqc_qs_handles_resp {
-       __le16 qs_handles[8];
-};
-
-/* Configure VSI BW limits (direct 0x0400) */
-struct i40e_aqc_configure_vsi_bw_limit {
-       __le16  vsi_seid;
-       u8      reserved[2];
-       __le16  credit;
-       u8      reserved1[2];
-       u8      max_credit; /* 0-3, limit = 2^max */
-       u8      reserved2[7];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_configure_vsi_bw_limit);
-
-/* Configure VSI Bandwidth Limit per Traffic Type (indirect 0x0406)
- *    responds with i40e_aqc_qs_handles_resp
- */
-struct i40e_aqc_configure_vsi_ets_sla_bw_data {
-       u8      tc_valid_bits;
-       u8      reserved[15];
-       __le16  tc_bw_credits[8]; /* FW writesback QS handles here */
-
-       /* 4 bits per tc 0-7, 4th bit is reserved, limit = 2^max */
-       __le16  tc_bw_max[2];
-       u8      reserved1[28];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_configure_vsi_ets_sla_bw_data);
-
-/* Configure VSI Bandwidth Allocation per Traffic Type (indirect 0x0407)
- *    responds with i40e_aqc_qs_handles_resp
- */
-struct i40e_aqc_configure_vsi_tc_bw_data {
-       u8      tc_valid_bits;
-       u8      reserved[3];
-       u8      tc_bw_credits[8];
-       u8      reserved1[4];
-       __le16  qs_handles[8];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_configure_vsi_tc_bw_data);
-
-/* Query vsi bw configuration (indirect 0x0408) */
-struct i40e_aqc_query_vsi_bw_config_resp {
-       u8      tc_valid_bits;
-       u8      tc_suspended_bits;
-       u8      reserved[14];
-       __le16  qs_handles[8];
-       u8      reserved1[4];
-       __le16  port_bw_limit;
-       u8      reserved2[2];
-       u8      max_bw; /* 0-3, limit = 2^max */
-       u8      reserved3[23];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_query_vsi_bw_config_resp);
-
-/* Query VSI Bandwidth Allocation per Traffic Type (indirect 0x040A) */
-struct i40e_aqc_query_vsi_ets_sla_config_resp {
-       u8      tc_valid_bits;
-       u8      reserved[3];
-       u8      share_credits[8];
-       __le16  credits[8];
-
-       /* 4 bits per tc 0-7, 4th bit is reserved, limit = 2^max */
-       __le16  tc_bw_max[2];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_query_vsi_ets_sla_config_resp);
-
-/* Configure Switching Component Bandwidth Limit (direct 0x0410) */
-struct i40e_aqc_configure_switching_comp_bw_limit {
-       __le16  seid;
-       u8      reserved[2];
-       __le16  credit;
-       u8      reserved1[2];
-       u8      max_bw; /* 0-3, limit = 2^max */
-       u8      reserved2[7];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_configure_switching_comp_bw_limit);
-
-/* Enable  Physical Port ETS (indirect 0x0413)
- * Modify  Physical Port ETS (indirect 0x0414)
- * Disable Physical Port ETS (indirect 0x0415)
- */
-struct i40e_aqc_configure_switching_comp_ets_data {
-       u8      reserved[4];
-       u8      tc_valid_bits;
-       u8      seepage;
-#define I40E_AQ_ETS_SEEPAGE_EN_MASK    0x1
-       u8      tc_strict_priority_flags;
-       u8      reserved1[17];
-       u8      tc_bw_share_credits[8];
-       u8      reserved2[96];
-};
-
-I40E_CHECK_STRUCT_LEN(0x80, i40e_aqc_configure_switching_comp_ets_data);
-
-/* Configure Switching Component Bandwidth Limits per Tc (indirect 0x0416) */
-struct i40e_aqc_configure_switching_comp_ets_bw_limit_data {
-       u8      tc_valid_bits;
-       u8      reserved[15];
-       __le16  tc_bw_credit[8];
-
-       /* 4 bits per tc 0-7, 4th bit is reserved, limit = 2^max */
-       __le16  tc_bw_max[2];
-       u8      reserved1[28];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40,
-                     i40e_aqc_configure_switching_comp_ets_bw_limit_data);
-
-/* Configure Switching Component Bandwidth Allocation per Tc
- * (indirect 0x0417)
- */
-struct i40e_aqc_configure_switching_comp_bw_config_data {
-       u8      tc_valid_bits;
-       u8      reserved[2];
-       u8      absolute_credits; /* bool */
-       u8      tc_bw_share_credits[8];
-       u8      reserved1[20];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_configure_switching_comp_bw_config_data);
-
-/* Query Switching Component Configuration (indirect 0x0418) */
-struct i40e_aqc_query_switching_comp_ets_config_resp {
-       u8      tc_valid_bits;
-       u8      reserved[35];
-       __le16  port_bw_limit;
-       u8      reserved1[2];
-       u8      tc_bw_max; /* 0-3, limit = 2^max */
-       u8      reserved2[23];
-};
-
-I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_query_switching_comp_ets_config_resp);
-
-/* Query PhysicalPort ETS Configuration (indirect 0x0419) */
-struct i40e_aqc_query_port_ets_config_resp {
-       u8      reserved[4];
-       u8      tc_valid_bits;
-       u8      reserved1;
-       u8      tc_strict_priority_bits;
-       u8      reserved2;
-       u8      tc_bw_share_credits[8];
-       __le16  tc_bw_limits[8];
-
-       /* 4 bits per tc 0-7, 4th bit reserved, limit = 2^max */
-       __le16  tc_bw_max[2];
-       u8      reserved3[32];
-};
-
-I40E_CHECK_STRUCT_LEN(0x44, i40e_aqc_query_port_ets_config_resp);
-
-/* Query Switching Component Bandwidth Allocation per Traffic Type
- * (indirect 0x041A)
- */
-struct i40e_aqc_query_switching_comp_bw_config_resp {
-       u8      tc_valid_bits;
-       u8      reserved[2];
-       u8      absolute_credits_enable; /* bool */
-       u8      tc_bw_share_credits[8];
-       __le16  tc_bw_limits[8];
-
-       /* 4 bits per tc 0-7, 4th bit is reserved, limit = 2^max */
-       __le16  tc_bw_max[2];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_query_switching_comp_bw_config_resp);
-
-/* Suspend/resume port TX traffic
- * (direct 0x041B and 0x041C) uses the generic SEID struct
- */
-
-/* Configure partition BW
- * (indirect 0x041D)
- */
-struct i40e_aqc_configure_partition_bw_data {
-       __le16  pf_valid_bits;
-       u8      min_bw[16];      /* guaranteed bandwidth */
-       u8      max_bw[16];      /* bandwidth limit */
-};
-
-I40E_CHECK_STRUCT_LEN(0x22, i40e_aqc_configure_partition_bw_data);
-
-/* Get and set the active HMC resource profile and status.
- * (direct 0x0500) and (direct 0x0501)
- */
-struct i40e_aq_get_set_hmc_resource_profile {
-       u8      pm_profile;
-       u8      pe_vf_enabled;
-       u8      reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aq_get_set_hmc_resource_profile);
-
-enum i40e_aq_hmc_profile {
-       /* I40E_HMC_PROFILE_NO_CHANGE   = 0, reserved */
-       I40E_HMC_PROFILE_DEFAULT        = 1,
-       I40E_HMC_PROFILE_FAVOR_VF       = 2,
-       I40E_HMC_PROFILE_EQUAL          = 3,
-};
-
-/* Get PHY Abilities (indirect 0x0600) uses the generic indirect struct */
-
-/* set in param0 for get phy abilities to report qualified modules */
-#define I40E_AQ_PHY_REPORT_QUALIFIED_MODULES   0x0001
-#define I40E_AQ_PHY_REPORT_INITIAL_VALUES      0x0002
-
-enum i40e_aq_phy_type {
-       I40E_PHY_TYPE_SGMII                     = 0x0,
-       I40E_PHY_TYPE_1000BASE_KX               = 0x1,
-       I40E_PHY_TYPE_10GBASE_KX4               = 0x2,
-       I40E_PHY_TYPE_10GBASE_KR                = 0x3,
-       I40E_PHY_TYPE_40GBASE_KR4               = 0x4,
-       I40E_PHY_TYPE_XAUI                      = 0x5,
-       I40E_PHY_TYPE_XFI                       = 0x6,
-       I40E_PHY_TYPE_SFI                       = 0x7,
-       I40E_PHY_TYPE_XLAUI                     = 0x8,
-       I40E_PHY_TYPE_XLPPI                     = 0x9,
-       I40E_PHY_TYPE_40GBASE_CR4_CU            = 0xA,
-       I40E_PHY_TYPE_10GBASE_CR1_CU            = 0xB,
-       I40E_PHY_TYPE_10GBASE_AOC               = 0xC,
-       I40E_PHY_TYPE_40GBASE_AOC               = 0xD,
-       I40E_PHY_TYPE_UNRECOGNIZED              = 0xE,
-       I40E_PHY_TYPE_UNSUPPORTED               = 0xF,
-       I40E_PHY_TYPE_100BASE_TX                = 0x11,
-       I40E_PHY_TYPE_1000BASE_T                = 0x12,
-       I40E_PHY_TYPE_10GBASE_T                 = 0x13,
-       I40E_PHY_TYPE_10GBASE_SR                = 0x14,
-       I40E_PHY_TYPE_10GBASE_LR                = 0x15,
-       I40E_PHY_TYPE_10GBASE_SFPP_CU           = 0x16,
-       I40E_PHY_TYPE_10GBASE_CR1               = 0x17,
-       I40E_PHY_TYPE_40GBASE_CR4               = 0x18,
-       I40E_PHY_TYPE_40GBASE_SR4               = 0x19,
-       I40E_PHY_TYPE_40GBASE_LR4               = 0x1A,
-       I40E_PHY_TYPE_1000BASE_SX               = 0x1B,
-       I40E_PHY_TYPE_1000BASE_LX               = 0x1C,
-       I40E_PHY_TYPE_1000BASE_T_OPTICAL        = 0x1D,
-       I40E_PHY_TYPE_20GBASE_KR2               = 0x1E,
-       I40E_PHY_TYPE_25GBASE_KR                = 0x1F,
-       I40E_PHY_TYPE_25GBASE_CR                = 0x20,
-       I40E_PHY_TYPE_25GBASE_SR                = 0x21,
-       I40E_PHY_TYPE_25GBASE_LR                = 0x22,
-       I40E_PHY_TYPE_25GBASE_AOC               = 0x23,
-       I40E_PHY_TYPE_25GBASE_ACC               = 0x24,
-       I40E_PHY_TYPE_MAX,
-       I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP   = 0xFD,
-       I40E_PHY_TYPE_EMPTY                     = 0xFE,
-       I40E_PHY_TYPE_DEFAULT                   = 0xFF,
-};
-
-#define I40E_LINK_SPEED_100MB_SHIFT    0x1
-#define I40E_LINK_SPEED_1000MB_SHIFT   0x2
-#define I40E_LINK_SPEED_10GB_SHIFT     0x3
-#define I40E_LINK_SPEED_40GB_SHIFT     0x4
-#define I40E_LINK_SPEED_20GB_SHIFT     0x5
-#define I40E_LINK_SPEED_25GB_SHIFT     0x6
-
-enum i40e_aq_link_speed {
-       I40E_LINK_SPEED_UNKNOWN = 0,
-       I40E_LINK_SPEED_100MB   = BIT(I40E_LINK_SPEED_100MB_SHIFT),
-       I40E_LINK_SPEED_1GB     = BIT(I40E_LINK_SPEED_1000MB_SHIFT),
-       I40E_LINK_SPEED_10GB    = BIT(I40E_LINK_SPEED_10GB_SHIFT),
-       I40E_LINK_SPEED_40GB    = BIT(I40E_LINK_SPEED_40GB_SHIFT),
-       I40E_LINK_SPEED_20GB    = BIT(I40E_LINK_SPEED_20GB_SHIFT),
-       I40E_LINK_SPEED_25GB    = BIT(I40E_LINK_SPEED_25GB_SHIFT),
-};
-
-struct i40e_aqc_module_desc {
-       u8 oui[3];
-       u8 reserved1;
-       u8 part_number[16];
-       u8 revision[4];
-       u8 reserved2[8];
-};
-
-I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_module_desc);
-
-struct i40e_aq_get_phy_abilities_resp {
-       __le32  phy_type;       /* bitmap using the above enum for offsets */
-       u8      link_speed;     /* bitmap using the above enum bit patterns */
-       u8      abilities;
-#define I40E_AQ_PHY_FLAG_PAUSE_TX      0x01
-#define I40E_AQ_PHY_FLAG_PAUSE_RX      0x02
-#define I40E_AQ_PHY_FLAG_LOW_POWER     0x04
-#define I40E_AQ_PHY_LINK_ENABLED       0x08
-#define I40E_AQ_PHY_AN_ENABLED         0x10
-#define I40E_AQ_PHY_FLAG_MODULE_QUAL   0x20
-#define I40E_AQ_PHY_FEC_ABILITY_KR     0x40
-#define I40E_AQ_PHY_FEC_ABILITY_RS     0x80
-       __le16  eee_capability;
-#define I40E_AQ_EEE_100BASE_TX         0x0002
-#define I40E_AQ_EEE_1000BASE_T         0x0004
-#define I40E_AQ_EEE_10GBASE_T          0x0008
-#define I40E_AQ_EEE_1000BASE_KX                0x0010
-#define I40E_AQ_EEE_10GBASE_KX4                0x0020
-#define I40E_AQ_EEE_10GBASE_KR         0x0040
-       __le32  eeer_val;
-       u8      d3_lpan;
-#define I40E_AQ_SET_PHY_D3_LPAN_ENA    0x01
-       u8      phy_type_ext;
-#define I40E_AQ_PHY_TYPE_EXT_25G_KR    0X01
-#define I40E_AQ_PHY_TYPE_EXT_25G_CR    0X02
-#define I40E_AQ_PHY_TYPE_EXT_25G_SR    0x04
-#define I40E_AQ_PHY_TYPE_EXT_25G_LR    0x08
-#define I40E_AQ_PHY_TYPE_EXT_25G_AOC   0x10
-#define I40E_AQ_PHY_TYPE_EXT_25G_ACC   0x20
-       u8      fec_cfg_curr_mod_ext_info;
-#define I40E_AQ_ENABLE_FEC_KR          0x01
-#define I40E_AQ_ENABLE_FEC_RS          0x02
-#define I40E_AQ_REQUEST_FEC_KR         0x04
-#define I40E_AQ_REQUEST_FEC_RS         0x08
-#define I40E_AQ_ENABLE_FEC_AUTO                0x10
-#define I40E_AQ_FEC
-#define I40E_AQ_MODULE_TYPE_EXT_MASK   0xE0
-#define I40E_AQ_MODULE_TYPE_EXT_SHIFT  5
-
-       u8      ext_comp_code;
-       u8      phy_id[4];
-       u8      module_type[3];
-       u8      qualified_module_count;
-#define I40E_AQ_PHY_MAX_QMS            16
-       struct i40e_aqc_module_desc     qualified_module[I40E_AQ_PHY_MAX_QMS];
-};
-
-I40E_CHECK_STRUCT_LEN(0x218, i40e_aq_get_phy_abilities_resp);
-
-/* Set PHY Config (direct 0x0601) */
-struct i40e_aq_set_phy_config { /* same bits as above in all */
-       __le32  phy_type;
-       u8      link_speed;
-       u8      abilities;
-/* bits 0-2 use the values from get_phy_abilities_resp */
-#define I40E_AQ_PHY_ENABLE_LINK                0x08
-#define I40E_AQ_PHY_ENABLE_AN          0x10
-#define I40E_AQ_PHY_ENABLE_ATOMIC_LINK 0x20
-       __le16  eee_capability;
-       __le32  eeer;
-       u8      low_power_ctrl;
-       u8      phy_type_ext;
-#define I40E_AQ_PHY_TYPE_EXT_25G_KR    0X01
-#define I40E_AQ_PHY_TYPE_EXT_25G_CR    0X02
-#define I40E_AQ_PHY_TYPE_EXT_25G_SR    0x04
-#define I40E_AQ_PHY_TYPE_EXT_25G_LR    0x08
-       u8      fec_config;
-#define I40E_AQ_SET_FEC_ABILITY_KR     BIT(0)
-#define I40E_AQ_SET_FEC_ABILITY_RS     BIT(1)
-#define I40E_AQ_SET_FEC_REQUEST_KR     BIT(2)
-#define I40E_AQ_SET_FEC_REQUEST_RS     BIT(3)
-#define I40E_AQ_SET_FEC_AUTO           BIT(4)
-#define I40E_AQ_PHY_FEC_CONFIG_SHIFT   0x0
-#define I40E_AQ_PHY_FEC_CONFIG_MASK    (0x1F << I40E_AQ_PHY_FEC_CONFIG_SHIFT)
-       u8      reserved;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aq_set_phy_config);
-
-/* Set MAC Config command data structure (direct 0x0603) */
-struct i40e_aq_set_mac_config {
-       __le16  max_frame_size;
-       u8      params;
-#define I40E_AQ_SET_MAC_CONFIG_CRC_EN          0x04
-#define I40E_AQ_SET_MAC_CONFIG_PACING_MASK     0x78
-#define I40E_AQ_SET_MAC_CONFIG_PACING_SHIFT    3
-#define I40E_AQ_SET_MAC_CONFIG_PACING_NONE     0x0
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1B_13TX  0xF
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_9TX  0x9
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_4TX  0x8
-#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_7TX  0x7
-#define I40E_AQ_SET_MAC_CONFIG_PACING_2DW_3TX  0x6
-#define I40E_AQ_SET_MAC_CONFIG_PACING_1DW_1TX  0x5
-#define I40E_AQ_SET_MAC_CONFIG_PACING_3DW_2TX  0x4
-#define I40E_AQ_SET_MAC_CONFIG_PACING_7DW_3TX  0x3
-#define I40E_AQ_SET_MAC_CONFIG_PACING_4DW_1TX  0x2
-#define I40E_AQ_SET_MAC_CONFIG_PACING_9DW_1TX  0x1
-       u8      tx_timer_priority; /* bitmap */
-       __le16  tx_timer_value;
-       __le16  fc_refresh_threshold;
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aq_set_mac_config);
-
-/* Restart Auto-Negotiation (direct 0x605) */
-struct i40e_aqc_set_link_restart_an {
-       u8      command;
-#define I40E_AQ_PHY_RESTART_AN 0x02
-#define I40E_AQ_PHY_LINK_ENABLE        0x04
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_link_restart_an);
-
-/* Get Link Status cmd & response data structure (direct 0x0607) */
-struct i40e_aqc_get_link_status {
-       __le16  command_flags; /* only field set on command */
-#define I40E_AQ_LSE_MASK               0x3
-#define I40E_AQ_LSE_NOP                        0x0
-#define I40E_AQ_LSE_DISABLE            0x2
-#define I40E_AQ_LSE_ENABLE             0x3
-/* only response uses this flag */
-#define I40E_AQ_LSE_IS_ENABLED         0x1
-       u8      phy_type;    /* i40e_aq_phy_type   */
-       u8      link_speed;  /* i40e_aq_link_speed */
-       u8      link_info;
-#define I40E_AQ_LINK_UP                        0x01    /* obsolete */
-#define I40E_AQ_LINK_UP_FUNCTION       0x01
-#define I40E_AQ_LINK_FAULT             0x02
-#define I40E_AQ_LINK_FAULT_TX          0x04
-#define I40E_AQ_LINK_FAULT_RX          0x08
-#define I40E_AQ_LINK_FAULT_REMOTE      0x10
-#define I40E_AQ_LINK_UP_PORT           0x20
-#define I40E_AQ_MEDIA_AVAILABLE                0x40
-#define I40E_AQ_SIGNAL_DETECT          0x80
-       u8      an_info;
-#define I40E_AQ_AN_COMPLETED           0x01
-#define I40E_AQ_LP_AN_ABILITY          0x02
-#define I40E_AQ_PD_FAULT               0x04
-#define I40E_AQ_FEC_EN                 0x08
-#define I40E_AQ_PHY_LOW_POWER          0x10
-#define I40E_AQ_LINK_PAUSE_TX          0x20
-#define I40E_AQ_LINK_PAUSE_RX          0x40
-#define I40E_AQ_QUALIFIED_MODULE       0x80
-       u8      ext_info;
-#define I40E_AQ_LINK_PHY_TEMP_ALARM    0x01
-#define I40E_AQ_LINK_XCESSIVE_ERRORS   0x02
-#define I40E_AQ_LINK_TX_SHIFT          0x02
-#define I40E_AQ_LINK_TX_MASK           (0x03 << I40E_AQ_LINK_TX_SHIFT)
-#define I40E_AQ_LINK_TX_ACTIVE         0x00
-#define I40E_AQ_LINK_TX_DRAINED                0x01
-#define I40E_AQ_LINK_TX_FLUSHED                0x03
-#define I40E_AQ_LINK_FORCED_40G                0x10
-/* 25G Error Codes */
-#define I40E_AQ_25G_NO_ERR             0X00
-#define I40E_AQ_25G_NOT_PRESENT                0X01
-#define I40E_AQ_25G_NVM_CRC_ERR                0X02
-#define I40E_AQ_25G_SBUS_UCODE_ERR     0X03
-#define I40E_AQ_25G_SERDES_UCODE_ERR   0X04
-#define I40E_AQ_25G_NIMB_UCODE_ERR     0X05
-       u8      loopback; /* use defines from i40e_aqc_set_lb_mode */
-/* Since firmware API 1.7 loopback field keeps power class info as well */
-#define I40E_AQ_LOOPBACK_MASK          0x07
-#define I40E_AQ_PWR_CLASS_SHIFT_LB     6
-#define I40E_AQ_PWR_CLASS_MASK_LB      (0x03 << I40E_AQ_PWR_CLASS_SHIFT_LB)
-       __le16  max_frame_size;
-       u8      config;
-#define I40E_AQ_CONFIG_FEC_KR_ENA      0x01
-#define I40E_AQ_CONFIG_FEC_RS_ENA      0x02
-#define I40E_AQ_CONFIG_CRC_ENA         0x04
-#define I40E_AQ_CONFIG_PACING_MASK     0x78
-       union {
-               struct {
-                       u8      power_desc;
-#define I40E_AQ_LINK_POWER_CLASS_1     0x00
-#define I40E_AQ_LINK_POWER_CLASS_2     0x01
-#define I40E_AQ_LINK_POWER_CLASS_3     0x02
-#define I40E_AQ_LINK_POWER_CLASS_4     0x03
-#define I40E_AQ_PWR_CLASS_MASK         0x03
-                       u8      reserved[4];
-               };
-               struct {
-                       u8      link_type[4];
-                       u8      link_type_ext;
-               };
-       };
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_link_status);
-
-/* Set event mask command (direct 0x613) */
-struct i40e_aqc_set_phy_int_mask {
-       u8      reserved[8];
-       __le16  event_mask;
-#define I40E_AQ_EVENT_LINK_UPDOWN      0x0002
-#define I40E_AQ_EVENT_MEDIA_NA         0x0004
-#define I40E_AQ_EVENT_LINK_FAULT       0x0008
-#define I40E_AQ_EVENT_PHY_TEMP_ALARM   0x0010
-#define I40E_AQ_EVENT_EXCESSIVE_ERRORS 0x0020
-#define I40E_AQ_EVENT_SIGNAL_DETECT    0x0040
-#define I40E_AQ_EVENT_AN_COMPLETED     0x0080
-#define I40E_AQ_EVENT_MODULE_QUAL_FAIL 0x0100
-#define I40E_AQ_EVENT_PORT_TX_SUSPENDED        0x0200
-       u8      reserved1[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_phy_int_mask);
-
-/* Get Local AN advt register (direct 0x0614)
- * Set Local AN advt register (direct 0x0615)
- * Get Link Partner AN advt register (direct 0x0616)
- */
-struct i40e_aqc_an_advt_reg {
-       __le32  local_an_reg0;
-       __le16  local_an_reg1;
-       u8      reserved[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_an_advt_reg);
-
-/* Set Loopback mode (0x0618) */
-struct i40e_aqc_set_lb_mode {
-       __le16  lb_mode;
-#define I40E_AQ_LB_PHY_LOCAL   0x01
-#define I40E_AQ_LB_PHY_REMOTE  0x02
-#define I40E_AQ_LB_MAC_LOCAL   0x04
-       u8      reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_lb_mode);
-
-/* Set PHY Debug command (0x0622) */
-struct i40e_aqc_set_phy_debug {
-       u8      command_flags;
-#define I40E_AQ_PHY_DEBUG_RESET_INTERNAL       0x02
-#define I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT 2
-#define I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_MASK  (0x03 << \
-                                       I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT)
-#define I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_NONE  0x00
-#define I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_HARD  0x01
-#define I40E_AQ_PHY_DEBUG_RESET_EXTERNAL_SOFT  0x02
-#define I40E_AQ_PHY_DEBUG_DISABLE_LINK_FW      0x10
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_phy_debug);
-
-enum i40e_aq_phy_reg_type {
-       I40E_AQC_PHY_REG_INTERNAL       = 0x1,
-       I40E_AQC_PHY_REG_EXERNAL_BASET  = 0x2,
-       I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3
-};
-
-/* Run PHY Activity (0x0626) */
-struct i40e_aqc_run_phy_activity {
-       __le16  activity_id;
-       u8      flags;
-       u8      reserved1;
-       __le32  control;
-       __le32  data;
-       u8      reserved2[4];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity);
-
-/* Set PHY Register command (0x0628) */
-/* Get PHY Register command (0x0629) */
-struct i40e_aqc_phy_register_access {
-       u8      phy_interface;
-#define I40E_AQ_PHY_REG_ACCESS_INTERNAL        0
-#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL        1
-#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2
-       u8      dev_address;
-       u8      reserved1[2];
-       __le32  reg_address;
-       __le32  reg_value;
-       u8      reserved2[4];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_phy_register_access);
-
-/* NVM Read command (indirect 0x0701)
- * NVM Erase commands (direct 0x0702)
- * NVM Update commands (indirect 0x0703)
- */
-struct i40e_aqc_nvm_update {
-       u8      command_flags;
-#define I40E_AQ_NVM_LAST_CMD                   0x01
-#define I40E_AQ_NVM_REARRANGE_TO_FLAT          0x20
-#define I40E_AQ_NVM_REARRANGE_TO_STRUCT                0x40
-#define I40E_AQ_NVM_FLASH_ONLY                 0x80
-#define I40E_AQ_NVM_PRESERVATION_FLAGS_SHIFT   1
-#define I40E_AQ_NVM_PRESERVATION_FLAGS_MASK    0x03
-#define I40E_AQ_NVM_PRESERVATION_FLAGS_SELECTED        0x03
-#define I40E_AQ_NVM_PRESERVATION_FLAGS_ALL     0x01
-       u8      module_pointer;
-       __le16  length;
-       __le32  offset;
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_update);
-
-/* NVM Config Read (indirect 0x0704) */
-struct i40e_aqc_nvm_config_read {
-       __le16  cmd_flags;
-#define I40E_AQ_ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK  1
-#define I40E_AQ_ANVM_READ_SINGLE_FEATURE               0
-#define I40E_AQ_ANVM_READ_MULTIPLE_FEATURES            1
-       __le16  element_count;
-       __le16  element_id;     /* Feature/field ID */
-       __le16  element_id_msw; /* MSWord of field ID */
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_config_read);
-
-/* NVM Config Write (indirect 0x0705) */
-struct i40e_aqc_nvm_config_write {
-       __le16  cmd_flags;
-       __le16  element_count;
-       u8      reserved[4];
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_config_write);
-
-/* Used for 0x0704 as well as for 0x0705 commands */
-#define I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT                1
-#define I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_MASK \
-                               BIT(I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT)
-#define I40E_AQ_ANVM_FEATURE           0
-#define I40E_AQ_ANVM_IMMEDIATE_FIELD   BIT(FEATURE_OR_IMMEDIATE_SHIFT)
-struct i40e_aqc_nvm_config_data_feature {
-       __le16 feature_id;
-#define I40E_AQ_ANVM_FEATURE_OPTION_OEM_ONLY           0x01
-#define I40E_AQ_ANVM_FEATURE_OPTION_DWORD_MAP          0x08
-#define I40E_AQ_ANVM_FEATURE_OPTION_POR_CSR            0x10
-       __le16 feature_options;
-       __le16 feature_selection;
-};
-
-I40E_CHECK_STRUCT_LEN(0x6, i40e_aqc_nvm_config_data_feature);
-
-struct i40e_aqc_nvm_config_data_immediate_field {
-       __le32 field_id;
-       __le32 field_value;
-       __le16 field_options;
-       __le16 reserved;
-};
-
-I40E_CHECK_STRUCT_LEN(0xc, i40e_aqc_nvm_config_data_immediate_field);
-
-/* OEM Post Update (indirect 0x0720)
- * no command data struct used
- */
- struct i40e_aqc_nvm_oem_post_update {
-#define I40E_AQ_NVM_OEM_POST_UPDATE_EXTERNAL_DATA      0x01
-       u8 sel_data;
-       u8 reserved[7];
-};
-
-I40E_CHECK_STRUCT_LEN(0x8, i40e_aqc_nvm_oem_post_update);
-
-struct i40e_aqc_nvm_oem_post_update_buffer {
-       u8 str_len;
-       u8 dev_addr;
-       __le16 eeprom_addr;
-       u8 data[36];
-};
-
-I40E_CHECK_STRUCT_LEN(0x28, i40e_aqc_nvm_oem_post_update_buffer);
-
-/* Thermal Sensor (indirect 0x0721)
- *     read or set thermal sensor configs and values
- *     takes a sensor and command specific data buffer, not detailed here
- */
-struct i40e_aqc_thermal_sensor {
-       u8 sensor_action;
-#define I40E_AQ_THERMAL_SENSOR_READ_CONFIG     0
-#define I40E_AQ_THERMAL_SENSOR_SET_CONFIG      1
-#define I40E_AQ_THERMAL_SENSOR_READ_TEMP       2
-       u8 reserved[7];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_thermal_sensor);
-
-/* Send to PF command (indirect 0x0801) id is only used by PF
- * Send to VF command (indirect 0x0802) id is only used by PF
- * Send to Peer PF command (indirect 0x0803)
- */
-struct i40e_aqc_pf_vf_message {
-       __le32  id;
-       u8      reserved[4];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_pf_vf_message);
-
-/* Alternate structure */
-
-/* Direct write (direct 0x0900)
- * Direct read (direct 0x0902)
- */
-struct i40e_aqc_alternate_write {
-       __le32 address0;
-       __le32 data0;
-       __le32 address1;
-       __le32 data1;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_alternate_write);
-
-/* Indirect write (indirect 0x0901)
- * Indirect read (indirect 0x0903)
- */
-
-struct i40e_aqc_alternate_ind_write {
-       __le32 address;
-       __le32 length;
-       __le32 addr_high;
-       __le32 addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_alternate_ind_write);
-
-/* Done alternate write (direct 0x0904)
- * uses i40e_aq_desc
- */
-struct i40e_aqc_alternate_write_done {
-       __le16  cmd_flags;
-#define I40E_AQ_ALTERNATE_MODE_BIOS_MASK       1
-#define I40E_AQ_ALTERNATE_MODE_BIOS_LEGACY     0
-#define I40E_AQ_ALTERNATE_MODE_BIOS_UEFI       1
-#define I40E_AQ_ALTERNATE_RESET_NEEDED         2
-       u8      reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_alternate_write_done);
-
-/* Set OEM mode (direct 0x0905) */
-struct i40e_aqc_alternate_set_mode {
-       __le32  mode;
-#define I40E_AQ_ALTERNATE_MODE_NONE    0
-#define I40E_AQ_ALTERNATE_MODE_OEM     1
-       u8      reserved[12];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_alternate_set_mode);
-
-/* Clear port Alternate RAM (direct 0x0906) uses i40e_aq_desc */
-
-/* async events 0x10xx */
-
-/* Lan Queue Overflow Event (direct, 0x1001) */
-struct i40e_aqc_lan_overflow {
-       __le32  prtdcb_rupto;
-       __le32  otx_ctl;
-       u8      reserved[8];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lan_overflow);
-
-/* Get LLDP MIB (indirect 0x0A00) */
-struct i40e_aqc_lldp_get_mib {
-       u8      type;
-       u8      reserved1;
-#define I40E_AQ_LLDP_MIB_TYPE_MASK             0x3
-#define I40E_AQ_LLDP_MIB_LOCAL                 0x0
-#define I40E_AQ_LLDP_MIB_REMOTE                        0x1
-#define I40E_AQ_LLDP_MIB_LOCAL_AND_REMOTE      0x2
-#define I40E_AQ_LLDP_BRIDGE_TYPE_MASK          0xC
-#define I40E_AQ_LLDP_BRIDGE_TYPE_SHIFT         0x2
-#define I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE        0x0
-#define I40E_AQ_LLDP_BRIDGE_TYPE_NON_TPMR      0x1
-#define I40E_AQ_LLDP_TX_SHIFT                  0x4
-#define I40E_AQ_LLDP_TX_MASK                   (0x03 << I40E_AQ_LLDP_TX_SHIFT)
-/* TX pause flags use I40E_AQ_LINK_TX_* above */
-       __le16  local_len;
-       __le16  remote_len;
-       u8      reserved2[2];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_get_mib);
-
-/* Configure LLDP MIB Change Event (direct 0x0A01)
- * also used for the event (with type in the command field)
- */
-struct i40e_aqc_lldp_update_mib {
-       u8      command;
-#define I40E_AQ_LLDP_MIB_UPDATE_ENABLE 0x0
-#define I40E_AQ_LLDP_MIB_UPDATE_DISABLE        0x1
-       u8      reserved[7];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_mib);
-
-/* Add LLDP TLV (indirect 0x0A02)
- * Delete LLDP TLV (indirect 0x0A04)
- */
-struct i40e_aqc_lldp_add_tlv {
-       u8      type; /* only nearest bridge and non-TPMR from 0x0A00 */
-       u8      reserved1[1];
-       __le16  len;
-       u8      reserved2[4];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_add_tlv);
-
-/* Update LLDP TLV (indirect 0x0A03) */
-struct i40e_aqc_lldp_update_tlv {
-       u8      type; /* only nearest bridge and non-TPMR from 0x0A00 */
-       u8      reserved;
-       __le16  old_len;
-       __le16  new_offset;
-       __le16  new_len;
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_update_tlv);
-
-/* Stop LLDP (direct 0x0A05) */
-struct i40e_aqc_lldp_stop {
-       u8      command;
-#define I40E_AQ_LLDP_AGENT_STOP                0x0
-#define I40E_AQ_LLDP_AGENT_SHUTDOWN    0x1
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop);
-
-/* Start LLDP (direct 0x0A06) */
-
-struct i40e_aqc_lldp_start {
-       u8      command;
-#define I40E_AQ_LLDP_AGENT_START       0x1
-       u8      reserved[15];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);
-
-/* Set DCB (direct 0x0303) */
-struct i40e_aqc_set_dcb_parameters {
-       u8 command;
-#define I40E_AQ_DCB_SET_AGENT  0x1
-#define I40E_DCB_VALID         0x1
-       u8 valid_flags;
-       u8 reserved[14];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_set_dcb_parameters);
-
-/* Apply MIB changes (0x0A07)
- * uses the generic struc as it contains no data
- */
-
-/* Add Udp Tunnel command and completion (direct 0x0B00) */
-struct i40e_aqc_add_udp_tunnel {
-       __le16  udp_port;
-       u8      reserved0[3];
-       u8      protocol_type;
-#define I40E_AQC_TUNNEL_TYPE_VXLAN     0x00
-#define I40E_AQC_TUNNEL_TYPE_NGE       0x01
-#define I40E_AQC_TUNNEL_TYPE_TEREDO    0x10
-#define I40E_AQC_TUNNEL_TYPE_VXLAN_GPE 0x11
-       u8      reserved1[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_udp_tunnel);
-
-struct i40e_aqc_add_udp_tunnel_completion {
-       __le16 udp_port;
-       u8      filter_entry_index;
-       u8      multiple_pfs;
-#define I40E_AQC_SINGLE_PF             0x0
-#define I40E_AQC_MULTIPLE_PFS          0x1
-       u8      total_filters;
-       u8      reserved[11];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_add_udp_tunnel_completion);
-
-/* remove UDP Tunnel command (0x0B01) */
-struct i40e_aqc_remove_udp_tunnel {
-       u8      reserved[2];
-       u8      index; /* 0 to 15 */
-       u8      reserved2[13];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_udp_tunnel);
-
-struct i40e_aqc_del_udp_tunnel_completion {
-       __le16  udp_port;
-       u8      index; /* 0 to 15 */
-       u8      multiple_pfs;
-       u8      total_filters_used;
-       u8      reserved1[11];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_del_udp_tunnel_completion);
-
-struct i40e_aqc_get_set_rss_key {
-#define I40E_AQC_SET_RSS_KEY_VSI_VALID         BIT(15)
-#define I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT      0
-#define I40E_AQC_SET_RSS_KEY_VSI_ID_MASK       (0x3FF << \
-                                       I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT)
-       __le16  vsi_id;
-       u8      reserved[6];
-       __le32  addr_high;
-       __le32  addr_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_get_set_rss_key);
-
-struct i40e_aqc_get_set_rss_key_data {
-       u8 standard_rss_key[0x28];
-       u8 extended_hash_key[0xc];
-};
-
-I40E_CHECK_STRUCT_LEN(0x34, i40e_aqc_get_set_rss_key_data);
-
-struct  i40e_aqc_get_set_rss_lut {
-#define I40E_AQC_SET_RSS_LUT_VSI_VALID         BIT(15)
-#define I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT      0
-#define I40E_AQC_SET_RSS_LUT_VSI_ID_MASK       (0x3FF << \
-                                       I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT)
-       __le16  vsi_id;
-#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT  0
-#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK \
-                               BIT(I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)
-
-#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_VSI    0
-#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_PF     1
-       __le16  flags;
-       u8      reserved[4];
+       u8      reserved[4];
        __le32  addr_high;
        __le32  addr_low;
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_get_set_rss_lut);
-
-/* tunnel key structure 0x0B10 */
-
-struct i40e_aqc_tunnel_key_structure_A0 {
-       __le16     key1_off;
-       __le16     key1_len;
-       __le16     key2_off;
-       __le16     key2_len;
-       __le16     flags;
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDE 0x01
-/* response flags */
-#define I40E_AQC_TUNNEL_KEY_STRUCT_SUCCESS    0x01
-#define I40E_AQC_TUNNEL_KEY_STRUCT_MODIFIED   0x02
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDDEN 0x03
-       u8         resreved[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_tunnel_key_structure_A0);
-
-struct i40e_aqc_tunnel_key_structure {
-       u8      key1_off;
-       u8      key2_off;
-       u8      key1_len;  /* 0 to 15 */
-       u8      key2_len;  /* 0 to 15 */
-       u8      flags;
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDE    0x01
-/* response flags */
-#define I40E_AQC_TUNNEL_KEY_STRUCT_SUCCESS     0x01
-#define I40E_AQC_TUNNEL_KEY_STRUCT_MODIFIED    0x02
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDDEN  0x03
-       u8      network_key_index;
-#define I40E_AQC_NETWORK_KEY_INDEX_VXLAN               0x0
-#define I40E_AQC_NETWORK_KEY_INDEX_NGE                 0x1
-#define I40E_AQC_NETWORK_KEY_INDEX_FLEX_MAC_IN_UDP     0x2
-#define I40E_AQC_NETWORK_KEY_INDEX_GRE                 0x3
-       u8      reserved[10];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_tunnel_key_structure);
-
-/* OEM mode commands (direct 0xFE0x) */
-struct i40e_aqc_oem_param_change {
-       __le32  param_type;
-#define I40E_AQ_OEM_PARAM_TYPE_PF_CTL  0
-#define I40E_AQ_OEM_PARAM_TYPE_BW_CTL  1
-#define I40E_AQ_OEM_PARAM_MAC          2
-       __le32  param_value1;
-       __le16  param_value2;
-       u8      reserved[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_oem_param_change);
-
-struct i40e_aqc_oem_state_change {
-       __le32  state;
-#define I40E_AQ_OEM_STATE_LINK_DOWN    0x0
-#define I40E_AQ_OEM_STATE_LINK_UP      0x1
-       u8      reserved[12];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_oem_state_change);
-
-/* Initialize OCSD (0xFE02, direct) */
-struct i40e_aqc_opc_oem_ocsd_initialize {
-       u8 type_status;
-       u8 reserved1[3];
-       __le32 ocsd_memory_block_addr_high;
-       __le32 ocsd_memory_block_addr_low;
-       __le32 requested_update_interval;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_opc_oem_ocsd_initialize);
-
-/* Initialize OCBB  (0xFE03, direct) */
-struct i40e_aqc_opc_oem_ocbb_initialize {
-       u8 type_status;
-       u8 reserved1[3];
-       __le32 ocbb_memory_block_addr_high;
-       __le32 ocbb_memory_block_addr_low;
-       u8 reserved2[4];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_opc_oem_ocbb_initialize);
-
-/* debug commands */
-
-/* get device id (0xFF00) uses the generic structure */
-
-/* set test more (0xFF01, internal) */
-
-struct i40e_acq_set_test_mode {
-       u8      mode;
-#define I40E_AQ_TEST_PARTIAL   0
-#define I40E_AQ_TEST_FULL      1
-#define I40E_AQ_TEST_NVM       2
-       u8      reserved[3];
-       u8      command;
-#define I40E_AQ_TEST_OPEN      0
-#define I40E_AQ_TEST_CLOSE     1
-#define I40E_AQ_TEST_INC       2
-       u8      reserved2[3];
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_acq_set_test_mode);
-
-/* Debug Read Register command (0xFF03)
- * Debug Write Register command (0xFF04)
- */
-struct i40e_aqc_debug_reg_read_write {
-       __le32 reserved;
-       __le32 address;
-       __le32 value_high;
-       __le32 value_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_debug_reg_read_write);
-
-/* Scatter/gather Reg Read  (indirect 0xFF05)
- * Scatter/gather Reg Write (indirect 0xFF06)
- */
-
-/* i40e_aq_desc is used for the command */
-struct i40e_aqc_debug_reg_sg_element_data {
-       __le32 address;
-       __le32 value;
-};
-
-/* Debug Modify register (direct 0xFF07) */
-struct i40e_aqc_debug_modify_reg {
-       __le32 address;
-       __le32 value;
-       __le32 clear_mask;
-       __le32 set_mask;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_debug_modify_reg);
-
-/* dump internal data (0xFF08, indirect) */
-
-#define I40E_AQ_CLUSTER_ID_AUX         0
-#define I40E_AQ_CLUSTER_ID_SWITCH_FLU  1
-#define I40E_AQ_CLUSTER_ID_TXSCHED     2
-#define I40E_AQ_CLUSTER_ID_HMC         3
-#define I40E_AQ_CLUSTER_ID_MAC0                4
-#define I40E_AQ_CLUSTER_ID_MAC1                5
-#define I40E_AQ_CLUSTER_ID_MAC2                6
-#define I40E_AQ_CLUSTER_ID_MAC3                7
-#define I40E_AQ_CLUSTER_ID_DCB         8
-#define I40E_AQ_CLUSTER_ID_EMP_MEM     9
-#define I40E_AQ_CLUSTER_ID_PKT_BUF     10
-#define I40E_AQ_CLUSTER_ID_ALTRAM      11
-
-struct i40e_aqc_debug_dump_internals {
-       u8      cluster_id;
-       u8      table_id;
-       __le16  data_size;
-       __le32  idx;
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_debug_dump_internals);
-
-struct i40e_aqc_debug_modify_internals {
-       u8      cluster_id;
-       u8      cluster_specific_params[7];
-       __le32  address_high;
-       __le32  address_low;
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_debug_modify_internals);
-
 #endif /* _I40E_ADMINQ_CMD_H_ */
diff --git a/drivers/net/ethernet/intel/iavf/i40e_common.c 
b/drivers/net/ethernet/intel/iavf/i40e_common.c
index eea280ba411e..6ebca11f039e 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_common.c
+++ b/drivers/net/ethernet/intel/iavf/i40e_common.c
@@ -891,135 +891,6 @@ struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {
        I40E_PTT_UNUSED_ENTRY(255)
 };
 
-/**
- * i40evf_aq_rx_ctl_read_register - use FW to read from an Rx control register
- * @hw: pointer to the hw struct
- * @reg_addr: register address
- * @reg_val: ptr to register value
- * @cmd_details: pointer to command details structure or NULL
- *
- * Use the firmware to read the Rx control register,
- * especially useful if the Rx unit is under heavy pressure
- **/
-i40e_status i40evf_aq_rx_ctl_read_register(struct i40e_hw *hw,
-                               u32 reg_addr, u32 *reg_val,
-                               struct i40e_asq_cmd_details *cmd_details)
-{
-       struct i40e_aq_desc desc;
-       struct i40e_aqc_rx_ctl_reg_read_write *cmd_resp =
-               (struct i40e_aqc_rx_ctl_reg_read_write *)&desc.params.raw;
-       i40e_status status;
-
-       if (!reg_val)
-               return I40E_ERR_PARAM;
-
-       i40evf_fill_default_direct_cmd_desc(&desc,
-                                           i40e_aqc_opc_rx_ctl_reg_read);
-
-       cmd_resp->address = cpu_to_le32(reg_addr);
-
-       status = i40evf_asq_send_command(hw, &desc, NULL, 0, cmd_details);
-
-       if (status == 0)
-               *reg_val = le32_to_cpu(cmd_resp->value);
-
-       return status;
-}
-
-/**
- * i40evf_read_rx_ctl - read from an Rx control register
- * @hw: pointer to the hw struct
- * @reg_addr: register address
- **/
-u32 i40evf_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr)
-{
-       i40e_status status = 0;
-       bool use_register;
-       int retry = 5;
-       u32 val = 0;
-
-       use_register = (((hw->aq.api_maj_ver == 1) &&
-                       (hw->aq.api_min_ver < 5)) ||
-                       (hw->mac.type == I40E_MAC_X722));
-       if (!use_register) {
-do_retry:
-               status = i40evf_aq_rx_ctl_read_register(hw, reg_addr,
-                                                       &val, NULL);
-               if (hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN && retry) {
-                       usleep_range(1000, 2000);
-                       retry--;
-                       goto do_retry;
-               }
-       }
-
-       /* if the AQ access failed, try the old-fashioned way */
-       if (status || use_register)
-               val = rd32(hw, reg_addr);
-
-       return val;
-}
-
-/**
- * i40evf_aq_rx_ctl_write_register
- * @hw: pointer to the hw struct
- * @reg_addr: register address
- * @reg_val: register value
- * @cmd_details: pointer to command details structure or NULL
- *
- * Use the firmware to write to an Rx control register,
- * especially useful if the Rx unit is under heavy pressure
- **/
-i40e_status i40evf_aq_rx_ctl_write_register(struct i40e_hw *hw,
-                               u32 reg_addr, u32 reg_val,
-                               struct i40e_asq_cmd_details *cmd_details)
-{
-       struct i40e_aq_desc desc;
-       struct i40e_aqc_rx_ctl_reg_read_write *cmd =
-               (struct i40e_aqc_rx_ctl_reg_read_write *)&desc.params.raw;
-       i40e_status status;
-
-       i40evf_fill_default_direct_cmd_desc(&desc,
-                                           i40e_aqc_opc_rx_ctl_reg_write);
-
-       cmd->address = cpu_to_le32(reg_addr);
-       cmd->value = cpu_to_le32(reg_val);
-
-       status = i40evf_asq_send_command(hw, &desc, NULL, 0, cmd_details);
-
-       return status;
-}
-
-/**
- * i40evf_write_rx_ctl - write to an Rx control register
- * @hw: pointer to the hw struct
- * @reg_addr: register address
- * @reg_val: register value
- **/
-void i40evf_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val)
-{
-       i40e_status status = 0;
-       bool use_register;
-       int retry = 5;
-
-       use_register = (((hw->aq.api_maj_ver == 1) &&
-                       (hw->aq.api_min_ver < 5)) ||
-                       (hw->mac.type == I40E_MAC_X722));
-       if (!use_register) {
-do_retry:
-               status = i40evf_aq_rx_ctl_write_register(hw, reg_addr,
-                                                        reg_val, NULL);
-               if (hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN && retry) {
-                       usleep_range(1000, 2000);
-                       retry--;
-                       goto do_retry;
-               }
-       }
-
-       /* if the AQ access failed, try the old-fashioned way */
-       if (status || use_register)
-               wr32(hw, reg_addr, reg_val);
-}
-
 /**
  * i40e_aq_send_msg_to_pf
  * @hw: pointer to the hardware structure
@@ -1110,211 +981,3 @@ i40e_status i40e_vf_reset(struct i40e_hw *hw)
        return i40e_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF,
                                      0, NULL, 0, NULL);
 }
-
-/**
- * i40evf_aq_write_ddp - Write dynamic device personalization (ddp)
- * @hw: pointer to the hw struct
- * @buff: command buffer (size in bytes = buff_size)
- * @buff_size: buffer size in bytes
- * @track_id: package tracking id
- * @error_offset: returns error offset
- * @error_info: returns error information
- * @cmd_details: pointer to command details structure or NULL
- **/
-enum
-i40e_status_code i40evf_aq_write_ddp(struct i40e_hw *hw, void *buff,
-                                    u16 buff_size, u32 track_id,
-                                    u32 *error_offset, u32 *error_info,
-                                    struct i40e_asq_cmd_details *cmd_details)
-{
-       struct i40e_aq_desc desc;
-       struct i40e_aqc_write_personalization_profile *cmd =
-               (struct i40e_aqc_write_personalization_profile *)
-               &desc.params.raw;
-       struct i40e_aqc_write_ddp_resp *resp;
-       i40e_status status;
-
-       i40evf_fill_default_direct_cmd_desc(&desc,
-                                           
i40e_aqc_opc_write_personalization_profile);
-
-       desc.flags |= cpu_to_le16(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD);
-       if (buff_size > I40E_AQ_LARGE_BUF)
-               desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);
-
-       desc.datalen = cpu_to_le16(buff_size);
-
-       cmd->profile_track_id = cpu_to_le32(track_id);
-
-       status = i40evf_asq_send_command(hw, &desc, buff, buff_size, 
cmd_details);
-       if (!status) {
-               resp = (struct i40e_aqc_write_ddp_resp *)&desc.params.raw;
-               if (error_offset)
-                       *error_offset = le32_to_cpu(resp->error_offset);
-               if (error_info)
-                       *error_info = le32_to_cpu(resp->error_info);
-       }
-
-       return status;
-}
-
-/**
- * i40evf_aq_get_ddp_list - Read dynamic device personalization (ddp)
- * @hw: pointer to the hw struct
- * @buff: command buffer (size in bytes = buff_size)
- * @buff_size: buffer size in bytes
- * @flags: AdminQ command flags
- * @cmd_details: pointer to command details structure or NULL
- **/
-enum
-i40e_status_code i40evf_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
-                                       u16 buff_size, u8 flags,
-                                      struct i40e_asq_cmd_details *cmd_details)
-{
-       struct i40e_aq_desc desc;
-       struct i40e_aqc_get_applied_profiles *cmd =
-               (struct i40e_aqc_get_applied_profiles *)&desc.params.raw;
-       i40e_status status;
-
-       i40evf_fill_default_direct_cmd_desc(&desc,
-                                           
i40e_aqc_opc_get_personalization_profile_list);
-
-       desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);
-       if (buff_size > I40E_AQ_LARGE_BUF)
-               desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);
-       desc.datalen = cpu_to_le16(buff_size);
-
-       cmd->flags = flags;
-
-       status = i40evf_asq_send_command(hw, &desc, buff, buff_size, 
cmd_details);
-
-       return status;
-}
-
-/**
- * i40evf_find_segment_in_package
- * @segment_type: the segment type to search for (i.e., SEGMENT_TYPE_I40E)
- * @pkg_hdr: pointer to the package header to be searched
- *
- * This function searches a package file for a particular segment type. On
- * success it returns a pointer to the segment header, otherwise it will
- * return NULL.
- **/
-struct i40e_generic_seg_header *
-i40evf_find_segment_in_package(u32 segment_type,
-                              struct i40e_package_header *pkg_hdr)
-{
-       struct i40e_generic_seg_header *segment;
-       u32 i;
-
-       /* Search all package segments for the requested segment type */
-       for (i = 0; i < pkg_hdr->segment_count; i++) {
-               segment =
-                       (struct i40e_generic_seg_header *)((u8 *)pkg_hdr +
-                        pkg_hdr->segment_offset[i]);
-
-               if (segment->type == segment_type)
-                       return segment;
-       }
-
-       return NULL;
-}
-
-/**
- * i40evf_write_profile
- * @hw: pointer to the hardware structure
- * @profile: pointer to the profile segment of the package to be downloaded
- * @track_id: package tracking id
- *
- * Handles the download of a complete package.
- */
-enum i40e_status_code
-i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,
-                    u32 track_id)
-{
-       i40e_status status = 0;
-       struct i40e_section_table *sec_tbl;
-       struct i40e_profile_section_header *sec = NULL;
-       u32 dev_cnt;
-       u32 vendor_dev_id;
-       u32 *nvm;
-       u32 section_size = 0;
-       u32 offset = 0, info = 0;
-       u32 i;
-
-       dev_cnt = profile->device_table_count;
-
-       for (i = 0; i < dev_cnt; i++) {
-               vendor_dev_id = profile->device_table[i].vendor_dev_id;
-               if ((vendor_dev_id >> 16) == PCI_VENDOR_ID_INTEL)
-                       if (hw->device_id == (vendor_dev_id & 0xFFFF))
-                               break;
-       }
-       if (i == dev_cnt) {
-               i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support 
DDP");
-               return I40E_ERR_DEVICE_NOT_SUPPORTED;
-       }
-
-       nvm = (u32 *)&profile->device_table[dev_cnt];
-       sec_tbl = (struct i40e_section_table *)&nvm[nvm[0] + 1];
-
-       for (i = 0; i < sec_tbl->section_count; i++) {
-               sec = (struct i40e_profile_section_header *)((u8 *)profile +
-                                            sec_tbl->section_offset[i]);
-
-               /* Skip 'AQ', 'note' and 'name' sections */
-               if (sec->section.type != SECTION_TYPE_MMIO)
-                       continue;
-
-               section_size = sec->section.size +
-                       sizeof(struct i40e_profile_section_header);
-
-               /* Write profile */
-               status = i40evf_aq_write_ddp(hw, (void *)sec, (u16)section_size,
-                                            track_id, &offset, &info, NULL);
-               if (status) {
-                       i40e_debug(hw, I40E_DEBUG_PACKAGE,
-                                  "Failed to write profile: offset %d, info 
%d",
-                                  offset, info);
-                       break;
-               }
-       }
-       return status;
-}
-
-/**
- * i40evf_add_pinfo_to_list
- * @hw: pointer to the hardware structure
- * @profile: pointer to the profile segment of the package
- * @profile_info_sec: buffer for information section
- * @track_id: package tracking id
- *
- * Register a profile to the list of loaded profiles.
- */
-enum i40e_status_code
-i40evf_add_pinfo_to_list(struct i40e_hw *hw,
-                        struct i40e_profile_segment *profile,
-                        u8 *profile_info_sec, u32 track_id)
-{
-       i40e_status status = 0;
-       struct i40e_profile_section_header *sec = NULL;
-       struct i40e_profile_info *pinfo;
-       u32 offset = 0, info = 0;
-
-       sec = (struct i40e_profile_section_header *)profile_info_sec;
-       sec->tbl_size = 1;
-       sec->data_end = sizeof(struct i40e_profile_section_header) +
-                       sizeof(struct i40e_profile_info);
-       sec->section.type = SECTION_TYPE_INFO;
-       sec->section.offset = sizeof(struct i40e_profile_section_header);
-       sec->section.size = sizeof(struct i40e_profile_info);
-       pinfo = (struct i40e_profile_info *)(profile_info_sec +
-                                            sec->section.offset);
-       pinfo->track_id = track_id;
-       pinfo->version = profile->version;
-       pinfo->op = I40E_DDP_ADD_TRACKID;
-       memcpy(pinfo->name, profile->name, I40E_DDP_NAME_SIZE);
-
-       status = i40evf_aq_write_ddp(hw, (void *)sec, sec->data_end,
-                                    track_id, &offset, &info, NULL);
-       return status;
-}
diff --git a/drivers/net/ethernet/intel/iavf/i40e_hmc.h 
b/drivers/net/ethernet/intel/iavf/i40e_hmc.h
deleted file mode 100644
index 1c78de838857..000000000000
--- a/drivers/net/ethernet/intel/iavf/i40e_hmc.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
-
-#ifndef _I40E_HMC_H_
-#define _I40E_HMC_H_
-
-#define I40E_HMC_MAX_BP_COUNT 512
-
-/* forward-declare the HW struct for the compiler */
-struct i40e_hw;
-
-#define I40E_HMC_INFO_SIGNATURE                0x484D5347 /* HMSG */
-#define I40E_HMC_PD_CNT_IN_SD          512
-#define I40E_HMC_DIRECT_BP_SIZE                0x200000 /* 2M */
-#define I40E_HMC_PAGED_BP_SIZE         4096
-#define I40E_HMC_PD_BP_BUF_ALIGNMENT   4096
-#define I40E_FIRST_VF_FPM_ID           16
-
-struct i40e_hmc_obj_info {
-       u64 base;       /* base addr in FPM */
-       u32 max_cnt;    /* max count available for this hmc func */
-       u32 cnt;        /* count of objects driver actually wants to create */
-       u64 size;       /* size in bytes of one object */
-};
-
-enum i40e_sd_entry_type {
-       I40E_SD_TYPE_INVALID = 0,
-       I40E_SD_TYPE_PAGED   = 1,
-       I40E_SD_TYPE_DIRECT  = 2
-};
-
-struct i40e_hmc_bp {
-       enum i40e_sd_entry_type entry_type;
-       struct i40e_dma_mem addr; /* populate to be used by hw */
-       u32 sd_pd_index;
-       u32 ref_cnt;
-};
-
-struct i40e_hmc_pd_entry {
-       struct i40e_hmc_bp bp;
-       u32 sd_index;
-       bool rsrc_pg;
-       bool valid;
-};
-
-struct i40e_hmc_pd_table {
-       struct i40e_dma_mem pd_page_addr; /* populate to be used by hw */
-       struct i40e_hmc_pd_entry  *pd_entry; /* [512] for sw book keeping */
-       struct i40e_virt_mem pd_entry_virt_mem; /* virt mem for pd_entry */
-
-       u32 ref_cnt;
-       u32 sd_index;
-};
-
-struct i40e_hmc_sd_entry {
-       enum i40e_sd_entry_type entry_type;
-       bool valid;
-
-       union {
-               struct i40e_hmc_pd_table pd_table;
-               struct i40e_hmc_bp bp;
-       } u;
-};
-
-struct i40e_hmc_sd_table {
-       struct i40e_virt_mem addr; /* used to track sd_entry allocations */
-       u32 sd_cnt;
-       u32 ref_cnt;
-       struct i40e_hmc_sd_entry *sd_entry; /* (sd_cnt*512) entries max */
-};
-
-struct i40e_hmc_info {
-       u32 signature;
-       /* equals to pci func num for PF and dynamically allocated for VFs */
-       u8 hmc_fn_id;
-       u16 first_sd_index; /* index of the first available SD */
-
-       /* hmc objects */
-       struct i40e_hmc_obj_info *hmc_obj;
-       struct i40e_virt_mem hmc_obj_virt_mem;
-       struct i40e_hmc_sd_table sd_table;
-};
-
-#define I40E_INC_SD_REFCNT(sd_table)   ((sd_table)->ref_cnt++)
-#define I40E_INC_PD_REFCNT(pd_table)   ((pd_table)->ref_cnt++)
-#define I40E_INC_BP_REFCNT(bp)         ((bp)->ref_cnt++)
-
-#define I40E_DEC_SD_REFCNT(sd_table)   ((sd_table)->ref_cnt--)
-#define I40E_DEC_PD_REFCNT(pd_table)   ((pd_table)->ref_cnt--)
-#define I40E_DEC_BP_REFCNT(bp)         ((bp)->ref_cnt--)
-
-/**
- * I40E_SET_PF_SD_ENTRY - marks the sd entry as valid in the hardware
- * @hw: pointer to our hw struct
- * @pa: pointer to physical address
- * @sd_index: segment descriptor index
- * @type: if sd entry is direct or paged
- **/
-#define I40E_SET_PF_SD_ENTRY(hw, pa, sd_index, type)                   \
-{                                                                      \
-       u32 val1, val2, val3;                                           \
-       val1 = (u32)(upper_32_bits(pa));                                \
-       val2 = (u32)(pa) | (I40E_HMC_MAX_BP_COUNT <<                    \
-                I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_SHIFT) |              \
-               ((((type) == I40E_SD_TYPE_PAGED) ? 0 : 1) <<            \
-               I40E_PFHMC_SDDATALOW_PMSDTYPE_SHIFT) |                  \
-               BIT(I40E_PFHMC_SDDATALOW_PMSDVALID_SHIFT);              \
-       val3 = (sd_index) | BIT_ULL(I40E_PFHMC_SDCMD_PMSDWR_SHIFT);     \
-       wr32((hw), I40E_PFHMC_SDDATAHIGH, val1);                        \
-       wr32((hw), I40E_PFHMC_SDDATALOW, val2);                         \
-       wr32((hw), I40E_PFHMC_SDCMD, val3);                             \
-}
-
-/**
- * I40E_CLEAR_PF_SD_ENTRY - marks the sd entry as invalid in the hardware
- * @hw: pointer to our hw struct
- * @sd_index: segment descriptor index
- * @type: if sd entry is direct or paged
- **/
-#define I40E_CLEAR_PF_SD_ENTRY(hw, sd_index, type)                     \
-{                                                                      \
-       u32 val2, val3;                                                 \
-       val2 = (I40E_HMC_MAX_BP_COUNT <<                                \
-               I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_SHIFT) |               \
-               ((((type) == I40E_SD_TYPE_PAGED) ? 0 : 1) <<            \
-               I40E_PFHMC_SDDATALOW_PMSDTYPE_SHIFT);                   \
-       val3 = (sd_index) | BIT_ULL(I40E_PFHMC_SDCMD_PMSDWR_SHIFT);     \
-       wr32((hw), I40E_PFHMC_SDDATAHIGH, 0);                           \
-       wr32((hw), I40E_PFHMC_SDDATALOW, val2);                         \
-       wr32((hw), I40E_PFHMC_SDCMD, val3);                             \
-}
-
-/**
- * I40E_INVALIDATE_PF_HMC_PD - Invalidates the pd cache in the hardware
- * @hw: pointer to our hw struct
- * @sd_idx: segment descriptor index
- * @pd_idx: page descriptor index
- **/
-#define I40E_INVALIDATE_PF_HMC_PD(hw, sd_idx, pd_idx)                  \
-       wr32((hw), I40E_PFHMC_PDINV,                                    \
-           (((sd_idx) << I40E_PFHMC_PDINV_PMSDIDX_SHIFT) |             \
-            ((pd_idx) << I40E_PFHMC_PDINV_PMPDIDX_SHIFT)))
-
-/**
- * I40E_FIND_SD_INDEX_LIMIT - finds segment descriptor index limit
- * @hmc_info: pointer to the HMC configuration information structure
- * @type: type of HMC resources we're searching
- * @index: starting index for the object
- * @cnt: number of objects we're trying to create
- * @sd_idx: pointer to return index of the segment descriptor in question
- * @sd_limit: pointer to return the maximum number of segment descriptors
- *
- * This function calculates the segment descriptor index and index limit
- * for the resource defined by i40e_hmc_rsrc_type.
- **/
-#define I40E_FIND_SD_INDEX_LIMIT(hmc_info, type, index, cnt, sd_idx, sd_limit)\
-{                                                                      \
-       u64 fpm_addr, fpm_limit;                                        \
-       fpm_addr = (hmc_info)->hmc_obj[(type)].base +                   \
-                  (hmc_info)->hmc_obj[(type)].size * (index);          \
-       fpm_limit = fpm_addr + (hmc_info)->hmc_obj[(type)].size * (cnt);\
-       *(sd_idx) = (u32)(fpm_addr / I40E_HMC_DIRECT_BP_SIZE);          \
-       *(sd_limit) = (u32)((fpm_limit - 1) / I40E_HMC_DIRECT_BP_SIZE); \
-       /* add one more to the limit to correct our range */            \
-       *(sd_limit) += 1;                                               \
-}
-
-/**
- * I40E_FIND_PD_INDEX_LIMIT - finds page descriptor index limit
- * @hmc_info: pointer to the HMC configuration information struct
- * @type: HMC resource type we're examining
- * @idx: starting index for the object
- * @cnt: number of objects we're trying to create
- * @pd_index: pointer to return page descriptor index
- * @pd_limit: pointer to return page descriptor index limit
- *
- * Calculates the page descriptor index and index limit for the resource
- * defined by i40e_hmc_rsrc_type.
- **/
-#define I40E_FIND_PD_INDEX_LIMIT(hmc_info, type, idx, cnt, pd_index, pd_limit)\
-{                                                                      \
-       u64 fpm_adr, fpm_limit;                                         \
-       fpm_adr = (hmc_info)->hmc_obj[(type)].base +                    \
-                 (hmc_info)->hmc_obj[(type)].size * (idx);             \
-       fpm_limit = fpm_adr + (hmc_info)->hmc_obj[(type)].size * (cnt); \
-       *(pd_index) = (u32)(fpm_adr / I40E_HMC_PAGED_BP_SIZE);          \
-       *(pd_limit) = (u32)((fpm_limit - 1) / I40E_HMC_PAGED_BP_SIZE);  \
-       /* add one more to the limit to correct our range */            \
-       *(pd_limit) += 1;                                               \
-}
-i40e_status i40e_add_sd_table_entry(struct i40e_hw *hw,
-                                             struct i40e_hmc_info *hmc_info,
-                                             u32 sd_index,
-                                             enum i40e_sd_entry_type type,
-                                             u64 direct_mode_sz);
-
-i40e_status i40e_add_pd_table_entry(struct i40e_hw *hw,
-                                             struct i40e_hmc_info *hmc_info,
-                                             u32 pd_index,
-                                             struct i40e_dma_mem *rsrc_pg);
-i40e_status i40e_remove_pd_bp(struct i40e_hw *hw,
-                                       struct i40e_hmc_info *hmc_info,
-                                       u32 idx);
-i40e_status i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info,
-                                            u32 idx);
-i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw,
-                                           struct i40e_hmc_info *hmc_info,
-                                           u32 idx, bool is_pf);
-i40e_status i40e_prep_remove_pd_page(struct i40e_hmc_info *hmc_info,
-                                              u32 idx);
-i40e_status i40e_remove_pd_page_new(struct i40e_hw *hw,
-                                             struct i40e_hmc_info *hmc_info,
-                                             u32 idx, bool is_pf);
-
-#endif /* _I40E_HMC_H_ */
diff --git a/drivers/net/ethernet/intel/iavf/i40e_lan_hmc.h 
b/drivers/net/ethernet/intel/iavf/i40e_lan_hmc.h
deleted file mode 100644
index 82b00f70a632..000000000000
--- a/drivers/net/ethernet/intel/iavf/i40e_lan_hmc.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
-
-#ifndef _I40E_LAN_HMC_H_
-#define _I40E_LAN_HMC_H_
-
-/* forward-declare the HW struct for the compiler */
-struct i40e_hw;
-
-/* HMC element context information */
-
-/* Rx queue context data
- *
- * The sizes of the variables may be larger than needed due to crossing byte
- * boundaries. If we do not have the width of the variable set to the correct
- * size then we could end up shifting bits off the top of the variable when the
- * variable is at the top of a byte and crosses over into the next byte.
- */
-struct i40e_hmc_obj_rxq {
-       u16 head;
-       u16 cpuid; /* bigger than needed, see above for reason */
-       u64 base;
-       u16 qlen;
-#define I40E_RXQ_CTX_DBUFF_SHIFT 7
-       u16 dbuff; /* bigger than needed, see above for reason */
-#define I40E_RXQ_CTX_HBUFF_SHIFT 6
-       u16 hbuff; /* bigger than needed, see above for reason */
-       u8  dtype;
-       u8  dsize;
-       u8  crcstrip;
-       u8  fc_ena;
-       u8  l2tsel;
-       u8  hsplit_0;
-       u8  hsplit_1;
-       u8  showiv;
-       u32 rxmax; /* bigger than needed, see above for reason */
-       u8  tphrdesc_ena;
-       u8  tphwdesc_ena;
-       u8  tphdata_ena;
-       u8  tphhead_ena;
-       u16 lrxqthresh; /* bigger than needed, see above for reason */
-       u8  prefena;    /* NOTE: normally must be set to 1 at init */
-};
-
-/* Tx queue context data
-*
-* The sizes of the variables may be larger than needed due to crossing byte
-* boundaries. If we do not have the width of the variable set to the correct
-* size then we could end up shifting bits off the top of the variable when the
-* variable is at the top of a byte and crosses over into the next byte.
-*/
-struct i40e_hmc_obj_txq {
-       u16 head;
-       u8  new_context;
-       u64 base;
-       u8  fc_ena;
-       u8  timesync_ena;
-       u8  fd_ena;
-       u8  alt_vlan_ena;
-       u16 thead_wb;
-       u8  cpuid;
-       u8  head_wb_ena;
-       u16 qlen;
-       u8  tphrdesc_ena;
-       u8  tphrpacket_ena;
-       u8  tphwdesc_ena;
-       u64 head_wb_addr;
-       u32 crc;
-       u16 rdylist;
-       u8  rdylist_act;
-};
-
-/* for hsplit_0 field of Rx HMC context */
-enum i40e_hmc_obj_rx_hsplit_0 {
-       I40E_HMC_OBJ_RX_HSPLIT_0_NO_SPLIT      = 0,
-       I40E_HMC_OBJ_RX_HSPLIT_0_SPLIT_L2      = 1,
-       I40E_HMC_OBJ_RX_HSPLIT_0_SPLIT_IP      = 2,
-       I40E_HMC_OBJ_RX_HSPLIT_0_SPLIT_TCP_UDP = 4,
-       I40E_HMC_OBJ_RX_HSPLIT_0_SPLIT_SCTP    = 8,
-};
-
-/* fcoe_cntx and fcoe_filt are for debugging purpose only */
-struct i40e_hmc_obj_fcoe_cntx {
-       u32 rsv[32];
-};
-
-struct i40e_hmc_obj_fcoe_filt {
-       u32 rsv[8];
-};
-
-/* Context sizes for LAN objects */
-enum i40e_hmc_lan_object_size {
-       I40E_HMC_LAN_OBJ_SZ_8   = 0x3,
-       I40E_HMC_LAN_OBJ_SZ_16  = 0x4,
-       I40E_HMC_LAN_OBJ_SZ_32  = 0x5,
-       I40E_HMC_LAN_OBJ_SZ_64  = 0x6,
-       I40E_HMC_LAN_OBJ_SZ_128 = 0x7,
-       I40E_HMC_LAN_OBJ_SZ_256 = 0x8,
-       I40E_HMC_LAN_OBJ_SZ_512 = 0x9,
-};
-
-#define I40E_HMC_L2OBJ_BASE_ALIGNMENT 512
-#define I40E_HMC_OBJ_SIZE_TXQ         128
-#define I40E_HMC_OBJ_SIZE_RXQ         32
-#define I40E_HMC_OBJ_SIZE_FCOE_CNTX   128
-#define I40E_HMC_OBJ_SIZE_FCOE_FILT   64
-
-enum i40e_hmc_lan_rsrc_type {
-       I40E_HMC_LAN_FULL  = 0,
-       I40E_HMC_LAN_TX    = 1,
-       I40E_HMC_LAN_RX    = 2,
-       I40E_HMC_FCOE_CTX  = 3,
-       I40E_HMC_FCOE_FILT = 4,
-       I40E_HMC_LAN_MAX   = 5
-};
-
-enum i40e_hmc_model {
-       I40E_HMC_MODEL_DIRECT_PREFERRED = 0,
-       I40E_HMC_MODEL_DIRECT_ONLY      = 1,
-       I40E_HMC_MODEL_PAGED_ONLY       = 2,
-       I40E_HMC_MODEL_UNKNOWN,
-};
-
-struct i40e_hmc_lan_create_obj_info {
-       struct i40e_hmc_info *hmc_info;
-       u32 rsrc_type;
-       u32 start_idx;
-       u32 count;
-       enum i40e_sd_entry_type entry_type;
-       u64 direct_mode_sz;
-};
-
-struct i40e_hmc_lan_delete_obj_info {
-       struct i40e_hmc_info *hmc_info;
-       u32 rsrc_type;
-       u32 start_idx;
-       u32 count;
-};
-
-i40e_status i40e_init_lan_hmc(struct i40e_hw *hw, u32 txq_num,
-                                       u32 rxq_num, u32 fcoe_cntx_num,
-                                       u32 fcoe_filt_num);
-i40e_status i40e_configure_lan_hmc(struct i40e_hw *hw,
-                                            enum i40e_hmc_model model);
-i40e_status i40e_shutdown_lan_hmc(struct i40e_hw *hw);
-
-i40e_status i40e_clear_lan_tx_queue_context(struct i40e_hw *hw,
-                                                     u16 queue);
-i40e_status i40e_set_lan_tx_queue_context(struct i40e_hw *hw,
-                                                   u16 queue,
-                                                   struct i40e_hmc_obj_txq *s);
-i40e_status i40e_clear_lan_rx_queue_context(struct i40e_hw *hw,
-                                                     u16 queue);
-i40e_status i40e_set_lan_rx_queue_context(struct i40e_hw *hw,
-                                                   u16 queue,
-                                                   struct i40e_hmc_obj_rxq *s);
-
-#endif /* _I40E_LAN_HMC_H_ */
diff --git a/drivers/net/ethernet/intel/iavf/i40e_prototype.h 
b/drivers/net/ethernet/intel/iavf/i40e_prototype.h
index a358f4b9d5aa..ef7f74489bfc 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/iavf/i40e_prototype.h
@@ -60,71 +60,12 @@ static inline struct i40e_rx_ptype_decoded 
decode_rx_desc_ptype(u8 ptype)
        return i40evf_ptype_lookup[ptype];
 }
 
-/* prototype for functions used for SW locks */
-
 /* i40e_common for VF drivers*/
 void i40e_vf_parse_hw_config(struct i40e_hw *hw,
                             struct virtchnl_vf_resource *msg);
 i40e_status i40e_vf_reset(struct i40e_hw *hw);
 i40e_status i40e_aq_send_msg_to_pf(struct i40e_hw *hw,
-                               enum virtchnl_ops v_opcode,
-                               i40e_status v_retval,
-                               u8 *msg, u16 msglen,
-                               struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_set_filter_control(struct i40e_hw *hw,
-                               struct i40e_filter_control_settings *settings);
-i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw,
-                               u8 *mac_addr, u16 ethtype, u16 flags,
-                               u16 vsi_seid, u16 queue, bool is_add,
-                               struct i40e_control_filter_stats *stats,
-                               struct i40e_asq_cmd_details *cmd_details);
-void i40e_add_filter_to_drop_tx_flow_control_frames(struct i40e_hw *hw,
-                                                   u16 vsi_seid);
-i40e_status i40evf_aq_rx_ctl_read_register(struct i40e_hw *hw,
-                               u32 reg_addr, u32 *reg_val,
-                               struct i40e_asq_cmd_details *cmd_details);
-u32 i40evf_read_rx_ctl(struct i40e_hw *hw, u32 reg_addr);
-i40e_status i40evf_aq_rx_ctl_write_register(struct i40e_hw *hw,
-                               u32 reg_addr, u32 reg_val,
-                               struct i40e_asq_cmd_details *cmd_details);
-void i40evf_write_rx_ctl(struct i40e_hw *hw, u32 reg_addr, u32 reg_val);
-i40e_status i40e_aq_set_phy_register(struct i40e_hw *hw,
-                                    u8 phy_select, u8 dev_addr,
-                                    u32 reg_addr, u32 reg_val,
-                                    struct i40e_asq_cmd_details *cmd_details);
-i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw,
-                                    u8 phy_select, u8 dev_addr,
-                                    u32 reg_addr, u32 *reg_val,
-                                    struct i40e_asq_cmd_details *cmd_details);
-
-i40e_status i40e_read_phy_register(struct i40e_hw *hw, u8 page,
-                                  u16 reg, u8 phy_addr, u16 *value);
-i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page,
-                                   u16 reg, u8 phy_addr, u16 value);
-i40e_status i40e_read_phy_register(struct i40e_hw *hw, u8 page, u16 reg,
-                                  u8 phy_addr, u16 *value);
-i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page, u16 reg,
-                                   u8 phy_addr, u16 value);
-u8 i40e_get_phy_address(struct i40e_hw *hw, u8 dev_num);
-i40e_status i40e_blink_phy_link_led(struct i40e_hw *hw,
-                                   u32 time, u32 interval);
-i40e_status i40evf_aq_write_ddp(struct i40e_hw *hw, void *buff,
-                               u16 buff_size, u32 track_id,
-                               u32 *error_offset, u32 *error_info,
-                               struct i40e_asq_cmd_details *
-                               cmd_details);
-i40e_status i40evf_aq_get_ddp_list(struct i40e_hw *hw, void *buff,
-                                  u16 buff_size, u8 flags,
-                                  struct i40e_asq_cmd_details *
-                                  cmd_details);
-struct i40e_generic_seg_header *
-i40evf_find_segment_in_package(u32 segment_type,
-                              struct i40e_package_header *pkg_header);
-enum i40e_status_code
-i40evf_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *i40e_seg,
-                    u32 track_id);
-enum i40e_status_code
-i40evf_add_pinfo_to_list(struct i40e_hw *hw,
-                        struct i40e_profile_segment *profile,
-                        u8 *profile_info_sec, u32 track_id);
+                                  enum virtchnl_ops v_opcode,
+                                  i40e_status v_retval, u8 *msg, u16 msglen,
+                                  struct i40e_asq_cmd_details *cmd_details);
 #endif /* _I40E_PROTOTYPE_H_ */
diff --git a/drivers/net/ethernet/intel/iavf/i40e_register.h 
b/drivers/net/ethernet/intel/iavf/i40e_register.h
index 49e1f57d99cc..20b464ac1542 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_register.h
+++ b/drivers/net/ethernet/intel/iavf/i40e_register.h
@@ -4,40 +4,12 @@
 #ifndef _I40E_REGISTER_H_
 #define _I40E_REGISTER_H_
 
-#define I40E_VFMSIX_PBA1(_i) (0x00002000 + ((_i) * 4)) /* _i=0...19 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_PBA1_MAX_INDEX 19
-#define I40E_VFMSIX_PBA1_PENBIT_SHIFT 0
-#define I40E_VFMSIX_PBA1_PENBIT_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_PBA1_PENBIT_SHIFT)
-#define I40E_VFMSIX_TADD1(_i) (0x00002100 + ((_i) * 16)) /* _i=0...639 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TADD1_MAX_INDEX 639
-#define I40E_VFMSIX_TADD1_MSIXTADD10_SHIFT 0
-#define I40E_VFMSIX_TADD1_MSIXTADD10_MASK I40E_MASK(0x3, 
I40E_VFMSIX_TADD1_MSIXTADD10_SHIFT)
-#define I40E_VFMSIX_TADD1_MSIXTADD_SHIFT 2
-#define I40E_VFMSIX_TADD1_MSIXTADD_MASK I40E_MASK(0x3FFFFFFF, 
I40E_VFMSIX_TADD1_MSIXTADD_SHIFT)
-#define I40E_VFMSIX_TMSG1(_i) (0x00002108 + ((_i) * 16)) /* _i=0...639 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TMSG1_MAX_INDEX 639
-#define I40E_VFMSIX_TMSG1_MSIXTMSG_SHIFT 0
-#define I40E_VFMSIX_TMSG1_MSIXTMSG_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_TMSG1_MSIXTMSG_SHIFT)
-#define I40E_VFMSIX_TUADD1(_i) (0x00002104 + ((_i) * 16)) /* _i=0...639 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TUADD1_MAX_INDEX 639
-#define I40E_VFMSIX_TUADD1_MSIXTUADD_SHIFT 0
-#define I40E_VFMSIX_TUADD1_MSIXTUADD_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_TUADD1_MSIXTUADD_SHIFT)
-#define I40E_VFMSIX_TVCTRL1(_i) (0x0000210C + ((_i) * 16)) /* _i=0...639 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TVCTRL1_MAX_INDEX 639
-#define I40E_VFMSIX_TVCTRL1_MASK_SHIFT 0
-#define I40E_VFMSIX_TVCTRL1_MASK_MASK I40E_MASK(0x1, 
I40E_VFMSIX_TVCTRL1_MASK_SHIFT)
 #define I40E_VF_ARQBAH1 0x00006000 /* Reset: EMPR */
-#define I40E_VF_ARQBAH1_ARQBAH_SHIFT 0
-#define I40E_VF_ARQBAH1_ARQBAH_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VF_ARQBAH1_ARQBAH_SHIFT)
 #define I40E_VF_ARQBAL1 0x00006C00 /* Reset: EMPR */
-#define I40E_VF_ARQBAL1_ARQBAL_SHIFT 0
-#define I40E_VF_ARQBAL1_ARQBAL_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VF_ARQBAL1_ARQBAL_SHIFT)
 #define I40E_VF_ARQH1 0x00007400 /* Reset: EMPR */
 #define I40E_VF_ARQH1_ARQH_SHIFT 0
 #define I40E_VF_ARQH1_ARQH_MASK I40E_MASK(0x3FF, I40E_VF_ARQH1_ARQH_SHIFT)
 #define I40E_VF_ARQLEN1 0x00008000 /* Reset: EMPR */
-#define I40E_VF_ARQLEN1_ARQLEN_SHIFT 0
-#define I40E_VF_ARQLEN1_ARQLEN_MASK I40E_MASK(0x3FF, 
I40E_VF_ARQLEN1_ARQLEN_SHIFT)
 #define I40E_VF_ARQLEN1_ARQVFE_SHIFT 28
 #define I40E_VF_ARQLEN1_ARQVFE_MASK I40E_MASK(0x1, 
I40E_VF_ARQLEN1_ARQVFE_SHIFT)
 #define I40E_VF_ARQLEN1_ARQOVFL_SHIFT 29
@@ -47,20 +19,10 @@
 #define I40E_VF_ARQLEN1_ARQENABLE_SHIFT 31
 #define I40E_VF_ARQLEN1_ARQENABLE_MASK I40E_MASK(0x1, 
I40E_VF_ARQLEN1_ARQENABLE_SHIFT)
 #define I40E_VF_ARQT1 0x00007000 /* Reset: EMPR */
-#define I40E_VF_ARQT1_ARQT_SHIFT 0
-#define I40E_VF_ARQT1_ARQT_MASK I40E_MASK(0x3FF, I40E_VF_ARQT1_ARQT_SHIFT)
 #define I40E_VF_ATQBAH1 0x00007800 /* Reset: EMPR */
-#define I40E_VF_ATQBAH1_ATQBAH_SHIFT 0
-#define I40E_VF_ATQBAH1_ATQBAH_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VF_ATQBAH1_ATQBAH_SHIFT)
 #define I40E_VF_ATQBAL1 0x00007C00 /* Reset: EMPR */
-#define I40E_VF_ATQBAL1_ATQBAL_SHIFT 0
-#define I40E_VF_ATQBAL1_ATQBAL_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VF_ATQBAL1_ATQBAL_SHIFT)
 #define I40E_VF_ATQH1 0x00006400 /* Reset: EMPR */
-#define I40E_VF_ATQH1_ATQH_SHIFT 0
-#define I40E_VF_ATQH1_ATQH_MASK I40E_MASK(0x3FF, I40E_VF_ATQH1_ATQH_SHIFT)
 #define I40E_VF_ATQLEN1 0x00006800 /* Reset: EMPR */
-#define I40E_VF_ATQLEN1_ATQLEN_SHIFT 0
-#define I40E_VF_ATQLEN1_ATQLEN_MASK I40E_MASK(0x3FF, 
I40E_VF_ATQLEN1_ATQLEN_SHIFT)
 #define I40E_VF_ATQLEN1_ATQVFE_SHIFT 28
 #define I40E_VF_ATQLEN1_ATQVFE_MASK I40E_MASK(0x1, 
I40E_VF_ATQLEN1_ATQVFE_SHIFT)
 #define I40E_VF_ATQLEN1_ATQOVFL_SHIFT 29
@@ -70,244 +32,37 @@
 #define I40E_VF_ATQLEN1_ATQENABLE_SHIFT 31
 #define I40E_VF_ATQLEN1_ATQENABLE_MASK I40E_MASK(0x1, 
I40E_VF_ATQLEN1_ATQENABLE_SHIFT)
 #define I40E_VF_ATQT1 0x00008400 /* Reset: EMPR */
-#define I40E_VF_ATQT1_ATQT_SHIFT 0
-#define I40E_VF_ATQT1_ATQT_MASK I40E_MASK(0x3FF, I40E_VF_ATQT1_ATQT_SHIFT)
 #define I40E_VFGEN_RSTAT 0x00008800 /* Reset: VFR */
 #define I40E_VFGEN_RSTAT_VFR_STATE_SHIFT 0
 #define I40E_VFGEN_RSTAT_VFR_STATE_MASK I40E_MASK(0x3, 
I40E_VFGEN_RSTAT_VFR_STATE_SHIFT)
 #define I40E_VFINT_DYN_CTL01 0x00005C00 /* Reset: VFR */
 #define I40E_VFINT_DYN_CTL01_INTENA_SHIFT 0
 #define I40E_VFINT_DYN_CTL01_INTENA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_INTENA_SHIFT)
-#define I40E_VFINT_DYN_CTL01_CLEARPBA_SHIFT 1
-#define I40E_VFINT_DYN_CTL01_CLEARPBA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_CLEARPBA_SHIFT)
-#define I40E_VFINT_DYN_CTL01_SWINT_TRIG_SHIFT 2
-#define I40E_VFINT_DYN_CTL01_SWINT_TRIG_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_SWINT_TRIG_SHIFT)
 #define I40E_VFINT_DYN_CTL01_ITR_INDX_SHIFT 3
 #define I40E_VFINT_DYN_CTL01_ITR_INDX_MASK I40E_MASK(0x3, 
I40E_VFINT_DYN_CTL01_ITR_INDX_SHIFT)
-#define I40E_VFINT_DYN_CTL01_INTERVAL_SHIFT 5
-#define I40E_VFINT_DYN_CTL01_INTERVAL_MASK I40E_MASK(0xFFF, 
I40E_VFINT_DYN_CTL01_INTERVAL_SHIFT)
-#define I40E_VFINT_DYN_CTL01_SW_ITR_INDX_ENA_SHIFT 24
-#define I40E_VFINT_DYN_CTL01_SW_ITR_INDX_ENA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_SW_ITR_INDX_ENA_SHIFT)
-#define I40E_VFINT_DYN_CTL01_SW_ITR_INDX_SHIFT 25
-#define I40E_VFINT_DYN_CTL01_SW_ITR_INDX_MASK I40E_MASK(0x3, 
I40E_VFINT_DYN_CTL01_SW_ITR_INDX_SHIFT)
-#define I40E_VFINT_DYN_CTL01_INTENA_MSK_SHIFT 31
-#define I40E_VFINT_DYN_CTL01_INTENA_MSK_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_INTENA_MSK_SHIFT)
 #define I40E_VFINT_DYN_CTLN1(_INTVF) (0x00003800 + ((_INTVF) * 4)) /* 
_i=0...15 */ /* Reset: VFR */
-#define I40E_VFINT_DYN_CTLN1_MAX_INDEX 15
 #define I40E_VFINT_DYN_CTLN1_INTENA_SHIFT 0
 #define I40E_VFINT_DYN_CTLN1_INTENA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_INTENA_SHIFT)
-#define I40E_VFINT_DYN_CTLN1_CLEARPBA_SHIFT 1
-#define I40E_VFINT_DYN_CTLN1_CLEARPBA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_CLEARPBA_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_SWINT_TRIG_SHIFT 2
 #define I40E_VFINT_DYN_CTLN1_SWINT_TRIG_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_SWINT_TRIG_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_ITR_INDX_SHIFT 3
 #define I40E_VFINT_DYN_CTLN1_ITR_INDX_MASK I40E_MASK(0x3, 
I40E_VFINT_DYN_CTLN1_ITR_INDX_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_INTERVAL_SHIFT 5
-#define I40E_VFINT_DYN_CTLN1_INTERVAL_MASK I40E_MASK(0xFFF, 
I40E_VFINT_DYN_CTLN1_INTERVAL_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_ENA_SHIFT 24
 #define I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_ENA_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_ENA_SHIFT)
-#define I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_SHIFT 25
-#define I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_MASK I40E_MASK(0x3, 
I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_SHIFT)
-#define I40E_VFINT_DYN_CTLN1_INTENA_MSK_SHIFT 31
-#define I40E_VFINT_DYN_CTLN1_INTENA_MSK_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_INTENA_MSK_SHIFT)
 #define I40E_VFINT_ICR0_ENA1 0x00005000 /* Reset: CORER */
-#define I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_SHIFT 25
-#define I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_SHIFT)
 #define I40E_VFINT_ICR0_ENA1_ADMINQ_SHIFT 30
 #define I40E_VFINT_ICR0_ENA1_ADMINQ_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR0_ENA1_ADMINQ_SHIFT)
 #define I40E_VFINT_ICR0_ENA1_RSVD_SHIFT 31
-#define I40E_VFINT_ICR0_ENA1_RSVD_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR0_ENA1_RSVD_SHIFT)
 #define I40E_VFINT_ICR01 0x00004800 /* Reset: CORER */
-#define I40E_VFINT_ICR01_INTEVENT_SHIFT 0
-#define I40E_VFINT_ICR01_INTEVENT_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_INTEVENT_SHIFT)
-#define I40E_VFINT_ICR01_QUEUE_0_SHIFT 1
-#define I40E_VFINT_ICR01_QUEUE_0_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_QUEUE_0_SHIFT)
-#define I40E_VFINT_ICR01_QUEUE_1_SHIFT 2
-#define I40E_VFINT_ICR01_QUEUE_1_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_QUEUE_1_SHIFT)
-#define I40E_VFINT_ICR01_QUEUE_2_SHIFT 3
-#define I40E_VFINT_ICR01_QUEUE_2_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_QUEUE_2_SHIFT)
-#define I40E_VFINT_ICR01_QUEUE_3_SHIFT 4
-#define I40E_VFINT_ICR01_QUEUE_3_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_QUEUE_3_SHIFT)
-#define I40E_VFINT_ICR01_LINK_STAT_CHANGE_SHIFT 25
-#define I40E_VFINT_ICR01_LINK_STAT_CHANGE_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_LINK_STAT_CHANGE_SHIFT)
-#define I40E_VFINT_ICR01_ADMINQ_SHIFT 30
-#define I40E_VFINT_ICR01_ADMINQ_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_ADMINQ_SHIFT)
-#define I40E_VFINT_ICR01_SWINT_SHIFT 31
-#define I40E_VFINT_ICR01_SWINT_MASK I40E_MASK(0x1, 
I40E_VFINT_ICR01_SWINT_SHIFT)
-#define I40E_VFINT_ITR01(_i) (0x00004C00 + ((_i) * 4)) /* _i=0...2 */ /* 
Reset: VFR */
-#define I40E_VFINT_ITR01_MAX_INDEX 2
-#define I40E_VFINT_ITR01_INTERVAL_SHIFT 0
-#define I40E_VFINT_ITR01_INTERVAL_MASK I40E_MASK(0xFFF, 
I40E_VFINT_ITR01_INTERVAL_SHIFT)
 #define I40E_VFINT_ITRN1(_i, _INTVF) (0x00002800 + ((_i) * 64 + (_INTVF) * 4)) 
/* _i=0...2, _INTVF=0...15 */ /* Reset: VFR */
-#define I40E_VFINT_ITRN1_MAX_INDEX 2
-#define I40E_VFINT_ITRN1_INTERVAL_SHIFT 0
-#define I40E_VFINT_ITRN1_INTERVAL_MASK I40E_MASK(0xFFF, 
I40E_VFINT_ITRN1_INTERVAL_SHIFT)
-#define I40E_VFINT_STAT_CTL01 0x00005400 /* Reset: CORER */
-#define I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_SHIFT 2
-#define I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_MASK I40E_MASK(0x3, 
I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_SHIFT)
 #define I40E_QRX_TAIL1(_Q) (0x00002000 + ((_Q) * 4)) /* _i=0...15 */ /* Reset: 
CORER */
-#define I40E_QRX_TAIL1_MAX_INDEX 15
-#define I40E_QRX_TAIL1_TAIL_SHIFT 0
-#define I40E_QRX_TAIL1_TAIL_MASK I40E_MASK(0x1FFF, I40E_QRX_TAIL1_TAIL_SHIFT)
 #define I40E_QTX_TAIL1(_Q) (0x00000000 + ((_Q) * 4)) /* _i=0...15 */ /* Reset: 
PFR */
-#define I40E_QTX_TAIL1_MAX_INDEX 15
-#define I40E_QTX_TAIL1_TAIL_SHIFT 0
-#define I40E_QTX_TAIL1_TAIL_MASK I40E_MASK(0x1FFF, I40E_QTX_TAIL1_TAIL_SHIFT)
-#define I40E_VFMSIX_PBA 0x00002000 /* Reset: VFLR */
-#define I40E_VFMSIX_PBA_PENBIT_SHIFT 0
-#define I40E_VFMSIX_PBA_PENBIT_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_PBA_PENBIT_SHIFT)
-#define I40E_VFMSIX_TADD(_i) (0x00000000 + ((_i) * 16)) /* _i=0...16 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TADD_MAX_INDEX 16
-#define I40E_VFMSIX_TADD_MSIXTADD10_SHIFT 0
-#define I40E_VFMSIX_TADD_MSIXTADD10_MASK I40E_MASK(0x3, 
I40E_VFMSIX_TADD_MSIXTADD10_SHIFT)
-#define I40E_VFMSIX_TADD_MSIXTADD_SHIFT 2
-#define I40E_VFMSIX_TADD_MSIXTADD_MASK I40E_MASK(0x3FFFFFFF, 
I40E_VFMSIX_TADD_MSIXTADD_SHIFT)
-#define I40E_VFMSIX_TMSG(_i) (0x00000008 + ((_i) * 16)) /* _i=0...16 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TMSG_MAX_INDEX 16
-#define I40E_VFMSIX_TMSG_MSIXTMSG_SHIFT 0
-#define I40E_VFMSIX_TMSG_MSIXTMSG_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_TMSG_MSIXTMSG_SHIFT)
-#define I40E_VFMSIX_TUADD(_i) (0x00000004 + ((_i) * 16)) /* _i=0...16 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TUADD_MAX_INDEX 16
-#define I40E_VFMSIX_TUADD_MSIXTUADD_SHIFT 0
-#define I40E_VFMSIX_TUADD_MSIXTUADD_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFMSIX_TUADD_MSIXTUADD_SHIFT)
-#define I40E_VFMSIX_TVCTRL(_i) (0x0000000C + ((_i) * 16)) /* _i=0...16 */ /* 
Reset: VFLR */
-#define I40E_VFMSIX_TVCTRL_MAX_INDEX 16
-#define I40E_VFMSIX_TVCTRL_MASK_SHIFT 0
-#define I40E_VFMSIX_TVCTRL_MASK_MASK I40E_MASK(0x1, 
I40E_VFMSIX_TVCTRL_MASK_SHIFT)
-#define I40E_VFCM_PE_ERRDATA 0x0000DC00 /* Reset: VFR */
-#define I40E_VFCM_PE_ERRDATA_ERROR_CODE_SHIFT 0
-#define I40E_VFCM_PE_ERRDATA_ERROR_CODE_MASK I40E_MASK(0xF, 
I40E_VFCM_PE_ERRDATA_ERROR_CODE_SHIFT)
-#define I40E_VFCM_PE_ERRDATA_Q_TYPE_SHIFT 4
-#define I40E_VFCM_PE_ERRDATA_Q_TYPE_MASK I40E_MASK(0x7, 
I40E_VFCM_PE_ERRDATA_Q_TYPE_SHIFT)
-#define I40E_VFCM_PE_ERRDATA_Q_NUM_SHIFT 8
-#define I40E_VFCM_PE_ERRDATA_Q_NUM_MASK I40E_MASK(0x3FFFF, 
I40E_VFCM_PE_ERRDATA_Q_NUM_SHIFT)
-#define I40E_VFCM_PE_ERRINFO 0x0000D800 /* Reset: VFR */
-#define I40E_VFCM_PE_ERRINFO_ERROR_VALID_SHIFT 0
-#define I40E_VFCM_PE_ERRINFO_ERROR_VALID_MASK I40E_MASK(0x1, 
I40E_VFCM_PE_ERRINFO_ERROR_VALID_SHIFT)
-#define I40E_VFCM_PE_ERRINFO_ERROR_INST_SHIFT 4
-#define I40E_VFCM_PE_ERRINFO_ERROR_INST_MASK I40E_MASK(0x7, 
I40E_VFCM_PE_ERRINFO_ERROR_INST_SHIFT)
-#define I40E_VFCM_PE_ERRINFO_DBL_ERROR_CNT_SHIFT 8
-#define I40E_VFCM_PE_ERRINFO_DBL_ERROR_CNT_MASK I40E_MASK(0xFF, 
I40E_VFCM_PE_ERRINFO_DBL_ERROR_CNT_SHIFT)
-#define I40E_VFCM_PE_ERRINFO_RLU_ERROR_CNT_SHIFT 16
-#define I40E_VFCM_PE_ERRINFO_RLU_ERROR_CNT_MASK I40E_MASK(0xFF, 
I40E_VFCM_PE_ERRINFO_RLU_ERROR_CNT_SHIFT)
-#define I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_SHIFT 24
-#define I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_MASK I40E_MASK(0xFF, 
I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_SHIFT)
 #define I40E_VFQF_HENA(_i) (0x0000C400 + ((_i) * 4)) /* _i=0...1 */ /* Reset: 
CORER */
-#define I40E_VFQF_HENA_MAX_INDEX 1
-#define I40E_VFQF_HENA_PTYPE_ENA_SHIFT 0
-#define I40E_VFQF_HENA_PTYPE_ENA_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFQF_HENA_PTYPE_ENA_SHIFT)
 #define I40E_VFQF_HKEY(_i) (0x0000CC00 + ((_i) * 4)) /* _i=0...12 */ /* Reset: 
CORER */
 #define I40E_VFQF_HKEY_MAX_INDEX 12
-#define I40E_VFQF_HKEY_KEY_0_SHIFT 0
-#define I40E_VFQF_HKEY_KEY_0_MASK I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_0_SHIFT)
-#define I40E_VFQF_HKEY_KEY_1_SHIFT 8
-#define I40E_VFQF_HKEY_KEY_1_MASK I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_1_SHIFT)
-#define I40E_VFQF_HKEY_KEY_2_SHIFT 16
-#define I40E_VFQF_HKEY_KEY_2_MASK I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_2_SHIFT)
-#define I40E_VFQF_HKEY_KEY_3_SHIFT 24
-#define I40E_VFQF_HKEY_KEY_3_MASK I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_3_SHIFT)
 #define I40E_VFQF_HLUT(_i) (0x0000D000 + ((_i) * 4)) /* _i=0...15 */ /* Reset: 
CORER */
 #define I40E_VFQF_HLUT_MAX_INDEX 15
-#define I40E_VFQF_HLUT_LUT0_SHIFT 0
-#define I40E_VFQF_HLUT_LUT0_MASK I40E_MASK(0xF, I40E_VFQF_HLUT_LUT0_SHIFT)
-#define I40E_VFQF_HLUT_LUT1_SHIFT 8
-#define I40E_VFQF_HLUT_LUT1_MASK I40E_MASK(0xF, I40E_VFQF_HLUT_LUT1_SHIFT)
-#define I40E_VFQF_HLUT_LUT2_SHIFT 16
-#define I40E_VFQF_HLUT_LUT2_MASK I40E_MASK(0xF, I40E_VFQF_HLUT_LUT2_SHIFT)
-#define I40E_VFQF_HLUT_LUT3_SHIFT 24
-#define I40E_VFQF_HLUT_LUT3_MASK I40E_MASK(0xF, I40E_VFQF_HLUT_LUT3_SHIFT)
-#define I40E_VFQF_HREGION(_i) (0x0000D400 + ((_i) * 4)) /* _i=0...7 */ /* 
Reset: CORER */
-#define I40E_VFQF_HREGION_MAX_INDEX 7
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_0_SHIFT 0
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_0_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_0_SHIFT)
-#define I40E_VFQF_HREGION_REGION_0_SHIFT 1
-#define I40E_VFQF_HREGION_REGION_0_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_0_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_1_SHIFT 4
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_1_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_1_SHIFT)
-#define I40E_VFQF_HREGION_REGION_1_SHIFT 5
-#define I40E_VFQF_HREGION_REGION_1_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_1_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_2_SHIFT 8
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_2_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_2_SHIFT)
-#define I40E_VFQF_HREGION_REGION_2_SHIFT 9
-#define I40E_VFQF_HREGION_REGION_2_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_2_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_3_SHIFT 12
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_3_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_3_SHIFT)
-#define I40E_VFQF_HREGION_REGION_3_SHIFT 13
-#define I40E_VFQF_HREGION_REGION_3_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_3_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_4_SHIFT 16
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_4_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_4_SHIFT)
-#define I40E_VFQF_HREGION_REGION_4_SHIFT 17
-#define I40E_VFQF_HREGION_REGION_4_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_4_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_5_SHIFT 20
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_5_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_5_SHIFT)
-#define I40E_VFQF_HREGION_REGION_5_SHIFT 21
-#define I40E_VFQF_HREGION_REGION_5_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_5_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_6_SHIFT 24
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_6_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_6_SHIFT)
-#define I40E_VFQF_HREGION_REGION_6_SHIFT 25
-#define I40E_VFQF_HREGION_REGION_6_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_6_SHIFT)
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_7_SHIFT 28
-#define I40E_VFQF_HREGION_OVERRIDE_ENA_7_MASK I40E_MASK(0x1, 
I40E_VFQF_HREGION_OVERRIDE_ENA_7_SHIFT)
-#define I40E_VFQF_HREGION_REGION_7_SHIFT 29
-#define I40E_VFQF_HREGION_REGION_7_MASK I40E_MASK(0x7, 
I40E_VFQF_HREGION_REGION_7_SHIFT)
-#define I40E_VFINT_DYN_CTL01_WB_ON_ITR_SHIFT 30
-#define I40E_VFINT_DYN_CTL01_WB_ON_ITR_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTL01_WB_ON_ITR_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_WB_ON_ITR_SHIFT 30
 #define I40E_VFINT_DYN_CTLN1_WB_ON_ITR_MASK I40E_MASK(0x1, 
I40E_VFINT_DYN_CTLN1_WB_ON_ITR_SHIFT)
-#define I40E_VFPE_AEQALLOC1 0x0000A400 /* Reset: VFR */
-#define I40E_VFPE_AEQALLOC1_AECOUNT_SHIFT 0
-#define I40E_VFPE_AEQALLOC1_AECOUNT_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFPE_AEQALLOC1_AECOUNT_SHIFT)
-#define I40E_VFPE_CCQPHIGH1 0x00009800 /* Reset: VFR */
-#define I40E_VFPE_CCQPHIGH1_PECCQPHIGH_SHIFT 0
-#define I40E_VFPE_CCQPHIGH1_PECCQPHIGH_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFPE_CCQPHIGH1_PECCQPHIGH_SHIFT)
-#define I40E_VFPE_CCQPLOW1 0x0000AC00 /* Reset: VFR */
-#define I40E_VFPE_CCQPLOW1_PECCQPLOW_SHIFT 0
-#define I40E_VFPE_CCQPLOW1_PECCQPLOW_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFPE_CCQPLOW1_PECCQPLOW_SHIFT)
-#define I40E_VFPE_CCQPSTATUS1 0x0000B800 /* Reset: VFR */
-#define I40E_VFPE_CCQPSTATUS1_CCQP_DONE_SHIFT 0
-#define I40E_VFPE_CCQPSTATUS1_CCQP_DONE_MASK I40E_MASK(0x1, 
I40E_VFPE_CCQPSTATUS1_CCQP_DONE_SHIFT)
-#define I40E_VFPE_CCQPSTATUS1_HMC_PROFILE_SHIFT 4
-#define I40E_VFPE_CCQPSTATUS1_HMC_PROFILE_MASK I40E_MASK(0x7, 
I40E_VFPE_CCQPSTATUS1_HMC_PROFILE_SHIFT)
-#define I40E_VFPE_CCQPSTATUS1_RDMA_EN_VFS_SHIFT 16
-#define I40E_VFPE_CCQPSTATUS1_RDMA_EN_VFS_MASK I40E_MASK(0x3F, 
I40E_VFPE_CCQPSTATUS1_RDMA_EN_VFS_SHIFT)
-#define I40E_VFPE_CCQPSTATUS1_CCQP_ERR_SHIFT 31
-#define I40E_VFPE_CCQPSTATUS1_CCQP_ERR_MASK I40E_MASK(0x1, 
I40E_VFPE_CCQPSTATUS1_CCQP_ERR_SHIFT)
-#define I40E_VFPE_CQACK1 0x0000B000 /* Reset: VFR */
-#define I40E_VFPE_CQACK1_PECQID_SHIFT 0
-#define I40E_VFPE_CQACK1_PECQID_MASK I40E_MASK(0x1FFFF, 
I40E_VFPE_CQACK1_PECQID_SHIFT)
-#define I40E_VFPE_CQARM1 0x0000B400 /* Reset: VFR */
-#define I40E_VFPE_CQARM1_PECQID_SHIFT 0
-#define I40E_VFPE_CQARM1_PECQID_MASK I40E_MASK(0x1FFFF, 
I40E_VFPE_CQARM1_PECQID_SHIFT)
-#define I40E_VFPE_CQPDB1 0x0000BC00 /* Reset: VFR */
-#define I40E_VFPE_CQPDB1_WQHEAD_SHIFT 0
-#define I40E_VFPE_CQPDB1_WQHEAD_MASK I40E_MASK(0x7FF, 
I40E_VFPE_CQPDB1_WQHEAD_SHIFT)
-#define I40E_VFPE_CQPERRCODES1 0x00009C00 /* Reset: VFR */
-#define I40E_VFPE_CQPERRCODES1_CQP_MINOR_CODE_SHIFT 0
-#define I40E_VFPE_CQPERRCODES1_CQP_MINOR_CODE_MASK I40E_MASK(0xFFFF, 
I40E_VFPE_CQPERRCODES1_CQP_MINOR_CODE_SHIFT)
-#define I40E_VFPE_CQPERRCODES1_CQP_MAJOR_CODE_SHIFT 16
-#define I40E_VFPE_CQPERRCODES1_CQP_MAJOR_CODE_MASK I40E_MASK(0xFFFF, 
I40E_VFPE_CQPERRCODES1_CQP_MAJOR_CODE_SHIFT)
-#define I40E_VFPE_CQPTAIL1 0x0000A000 /* Reset: VFR */
-#define I40E_VFPE_CQPTAIL1_WQTAIL_SHIFT 0
-#define I40E_VFPE_CQPTAIL1_WQTAIL_MASK I40E_MASK(0x7FF, 
I40E_VFPE_CQPTAIL1_WQTAIL_SHIFT)
-#define I40E_VFPE_CQPTAIL1_CQP_OP_ERR_SHIFT 31
-#define I40E_VFPE_CQPTAIL1_CQP_OP_ERR_MASK I40E_MASK(0x1, 
I40E_VFPE_CQPTAIL1_CQP_OP_ERR_SHIFT)
-#define I40E_VFPE_IPCONFIG01 0x00008C00 /* Reset: VFR */
-#define I40E_VFPE_IPCONFIG01_PEIPID_SHIFT 0
-#define I40E_VFPE_IPCONFIG01_PEIPID_MASK I40E_MASK(0xFFFF, 
I40E_VFPE_IPCONFIG01_PEIPID_SHIFT)
-#define I40E_VFPE_IPCONFIG01_USEENTIREIDRANGE_SHIFT 16
-#define I40E_VFPE_IPCONFIG01_USEENTIREIDRANGE_MASK I40E_MASK(0x1, 
I40E_VFPE_IPCONFIG01_USEENTIREIDRANGE_SHIFT)
-#define I40E_VFPE_MRTEIDXMASK1 0x00009000 /* Reset: VFR */
-#define I40E_VFPE_MRTEIDXMASK1_MRTEIDXMASKBITS_SHIFT 0
-#define I40E_VFPE_MRTEIDXMASK1_MRTEIDXMASKBITS_MASK I40E_MASK(0x1F, 
I40E_VFPE_MRTEIDXMASK1_MRTEIDXMASKBITS_SHIFT)
-#define I40E_VFPE_RCVUNEXPECTEDERROR1 0x00009400 /* Reset: VFR */
-#define I40E_VFPE_RCVUNEXPECTEDERROR1_TCP_RX_UNEXP_ERR_SHIFT 0
-#define I40E_VFPE_RCVUNEXPECTEDERROR1_TCP_RX_UNEXP_ERR_MASK 
I40E_MASK(0xFFFFFF, I40E_VFPE_RCVUNEXPECTEDERROR1_TCP_RX_UNEXP_ERR_SHIFT)
-#define I40E_VFPE_TCPNOWTIMER1 0x0000A800 /* Reset: VFR */
-#define I40E_VFPE_TCPNOWTIMER1_TCP_NOW_SHIFT 0
-#define I40E_VFPE_TCPNOWTIMER1_TCP_NOW_MASK I40E_MASK(0xFFFFFFFF, 
I40E_VFPE_TCPNOWTIMER1_TCP_NOW_SHIFT)
-#define I40E_VFPE_WQEALLOC1 0x0000C000 /* Reset: VFR */
-#define I40E_VFPE_WQEALLOC1_PEQPID_SHIFT 0
-#define I40E_VFPE_WQEALLOC1_PEQPID_MASK I40E_MASK(0x3FFFF, 
I40E_VFPE_WQEALLOC1_PEQPID_SHIFT)
-#define I40E_VFPE_WQEALLOC1_WQE_DESC_INDEX_SHIFT 20
-#define I40E_VFPE_WQEALLOC1_WQE_DESC_INDEX_MASK I40E_MASK(0xFFF, 
I40E_VFPE_WQEALLOC1_WQE_DESC_INDEX_SHIFT)
 #endif /* _I40E_REGISTER_H_ */
diff --git a/drivers/net/ethernet/intel/iavf/i40e_type.h 
b/drivers/net/ethernet/intel/iavf/i40e_type.h
index 094387db3c11..8f1344094bc9 100644
--- a/drivers/net/ethernet/intel/iavf/i40e_type.h
+++ b/drivers/net/ethernet/intel/iavf/i40e_type.h
@@ -8,26 +8,16 @@
 #include "i40e_osdep.h"
 #include "i40e_register.h"
 #include "i40e_adminq.h"
-#include "i40e_hmc.h"
-#include "i40e_lan_hmc.h"
 #include "i40e_devids.h"
 
+#define I40E_RXQ_CTX_DBUFF_SHIFT 7
+
 /* I40E_MASK is a macro used on 32 bit registers */
 #define I40E_MASK(mask, shift) ((u32)(mask) << (shift))
 
 #define I40E_MAX_VSI_QP                        16
 #define I40E_MAX_VF_VSI                        3
 #define I40E_MAX_CHAINED_RX_BUFFERS    5
-#define I40E_MAX_PF_UDP_OFFLOAD_PORTS  16
-
-/* Max default timeout in ms, */
-#define I40E_MAX_NVM_TIMEOUT           18000
-
-/* Max timeout in ms for the phy to respond */
-#define I40E_MAX_PHY_TIMEOUT           500
-
-/* Switch from ms to the 1usec global time (this is the GTIME resolution) */
-#define I40E_MS_TO_GTIME(time)         ((time) * 1000)
 
 /* forward declaration */
 struct i40e_hw;
@@ -88,33 +78,6 @@ enum i40e_mac_type {
        I40E_MAC_GENERIC,
 };
 
-enum i40e_media_type {
-       I40E_MEDIA_TYPE_UNKNOWN = 0,
-       I40E_MEDIA_TYPE_FIBER,
-       I40E_MEDIA_TYPE_BASET,
-       I40E_MEDIA_TYPE_BACKPLANE,
-       I40E_MEDIA_TYPE_CX4,
-       I40E_MEDIA_TYPE_DA,
-       I40E_MEDIA_TYPE_VIRTUAL
-};
-
-enum i40e_fc_mode {
-       I40E_FC_NONE = 0,
-       I40E_FC_RX_PAUSE,
-       I40E_FC_TX_PAUSE,
-       I40E_FC_FULL,
-       I40E_FC_PFC,
-       I40E_FC_DEFAULT
-};
-
-enum i40e_set_fc_aq_failures {
-       I40E_SET_FC_AQ_FAIL_NONE = 0,
-       I40E_SET_FC_AQ_FAIL_GET = 1,
-       I40E_SET_FC_AQ_FAIL_SET = 2,
-       I40E_SET_FC_AQ_FAIL_UPDATE = 4,
-       I40E_SET_FC_AQ_FAIL_SET_UPDATE = 6
-};
-
 enum i40e_vsi_type {
        I40E_VSI_MAIN   = 0,
        I40E_VSI_VMDQ1  = 1,
@@ -134,162 +97,16 @@ enum i40e_queue_type {
        I40E_QUEUE_TYPE_UNKNOWN
 };
 
-struct i40e_link_status {
-       enum i40e_aq_phy_type phy_type;
-       enum i40e_aq_link_speed link_speed;
-       u8 link_info;
-       u8 an_info;
-       u8 req_fec_info;
-       u8 fec_info;
-       u8 ext_info;
-       u8 loopback;
-       /* is Link Status Event notification to SW enabled */
-       bool lse_enable;
-       u16 max_frame_size;
-       bool crc_enable;
-       u8 pacing;
-       u8 requested_speeds;
-       u8 module_type[3];
-       /* 1st byte: module identifier */
-#define I40E_MODULE_TYPE_SFP           0x03
-#define I40E_MODULE_TYPE_QSFP          0x0D
-       /* 2nd byte: ethernet compliance codes for 10/40G */
-#define I40E_MODULE_TYPE_40G_ACTIVE    0x01
-#define I40E_MODULE_TYPE_40G_LR4       0x02
-#define I40E_MODULE_TYPE_40G_SR4       0x04
-#define I40E_MODULE_TYPE_40G_CR4       0x08
-#define I40E_MODULE_TYPE_10G_BASE_SR   0x10
-#define I40E_MODULE_TYPE_10G_BASE_LR   0x20
-#define I40E_MODULE_TYPE_10G_BASE_LRM  0x40
-#define I40E_MODULE_TYPE_10G_BASE_ER   0x80
-       /* 3rd byte: ethernet compliance codes for 1G */
-#define I40E_MODULE_TYPE_1000BASE_SX   0x01
-#define I40E_MODULE_TYPE_1000BASE_LX   0x02
-#define I40E_MODULE_TYPE_1000BASE_CX   0x04
-#define I40E_MODULE_TYPE_1000BASE_T    0x08
-};
-
-struct i40e_phy_info {
-       struct i40e_link_status link_info;
-       struct i40e_link_status link_info_old;
-       bool get_link_info;
-       enum i40e_media_type media_type;
-       /* all the phy types the NVM is capable of */
-       u64 phy_types;
-};
-
-#define I40E_CAP_PHY_TYPE_SGMII BIT_ULL(I40E_PHY_TYPE_SGMII)
-#define I40E_CAP_PHY_TYPE_1000BASE_KX BIT_ULL(I40E_PHY_TYPE_1000BASE_KX)
-#define I40E_CAP_PHY_TYPE_10GBASE_KX4 BIT_ULL(I40E_PHY_TYPE_10GBASE_KX4)
-#define I40E_CAP_PHY_TYPE_10GBASE_KR BIT_ULL(I40E_PHY_TYPE_10GBASE_KR)
-#define I40E_CAP_PHY_TYPE_40GBASE_KR4 BIT_ULL(I40E_PHY_TYPE_40GBASE_KR4)
-#define I40E_CAP_PHY_TYPE_XAUI BIT_ULL(I40E_PHY_TYPE_XAUI)
-#define I40E_CAP_PHY_TYPE_XFI BIT_ULL(I40E_PHY_TYPE_XFI)
-#define I40E_CAP_PHY_TYPE_SFI BIT_ULL(I40E_PHY_TYPE_SFI)
-#define I40E_CAP_PHY_TYPE_XLAUI BIT_ULL(I40E_PHY_TYPE_XLAUI)
-#define I40E_CAP_PHY_TYPE_XLPPI BIT_ULL(I40E_PHY_TYPE_XLPPI)
-#define I40E_CAP_PHY_TYPE_40GBASE_CR4_CU BIT_ULL(I40E_PHY_TYPE_40GBASE_CR4_CU)
-#define I40E_CAP_PHY_TYPE_10GBASE_CR1_CU BIT_ULL(I40E_PHY_TYPE_10GBASE_CR1_CU)
-#define I40E_CAP_PHY_TYPE_10GBASE_AOC BIT_ULL(I40E_PHY_TYPE_10GBASE_AOC)
-#define I40E_CAP_PHY_TYPE_40GBASE_AOC BIT_ULL(I40E_PHY_TYPE_40GBASE_AOC)
-#define I40E_CAP_PHY_TYPE_100BASE_TX BIT_ULL(I40E_PHY_TYPE_100BASE_TX)
-#define I40E_CAP_PHY_TYPE_1000BASE_T BIT_ULL(I40E_PHY_TYPE_1000BASE_T)
-#define I40E_CAP_PHY_TYPE_10GBASE_T BIT_ULL(I40E_PHY_TYPE_10GBASE_T)
-#define I40E_CAP_PHY_TYPE_10GBASE_SR BIT_ULL(I40E_PHY_TYPE_10GBASE_SR)
-#define I40E_CAP_PHY_TYPE_10GBASE_LR BIT_ULL(I40E_PHY_TYPE_10GBASE_LR)
-#define I40E_CAP_PHY_TYPE_10GBASE_SFPP_CU 
BIT_ULL(I40E_PHY_TYPE_10GBASE_SFPP_CU)
-#define I40E_CAP_PHY_TYPE_10GBASE_CR1 BIT_ULL(I40E_PHY_TYPE_10GBASE_CR1)
-#define I40E_CAP_PHY_TYPE_40GBASE_CR4 BIT_ULL(I40E_PHY_TYPE_40GBASE_CR4)
-#define I40E_CAP_PHY_TYPE_40GBASE_SR4 BIT_ULL(I40E_PHY_TYPE_40GBASE_SR4)
-#define I40E_CAP_PHY_TYPE_40GBASE_LR4 BIT_ULL(I40E_PHY_TYPE_40GBASE_LR4)
-#define I40E_CAP_PHY_TYPE_1000BASE_SX BIT_ULL(I40E_PHY_TYPE_1000BASE_SX)
-#define I40E_CAP_PHY_TYPE_1000BASE_LX BIT_ULL(I40E_PHY_TYPE_1000BASE_LX)
-#define I40E_CAP_PHY_TYPE_1000BASE_T_OPTICAL \
-                               BIT_ULL(I40E_PHY_TYPE_1000BASE_T_OPTICAL)
-#define I40E_CAP_PHY_TYPE_20GBASE_KR2 BIT_ULL(I40E_PHY_TYPE_20GBASE_KR2)
-/* Defining the macro I40E_TYPE_OFFSET to implement a bit shift for some
- * PHY types. There is an unused bit (31) in the I40E_CAP_PHY_TYPE_* bit
- * fields but no corresponding gap in the i40e_aq_phy_type enumeration. So,
- * a shift is needed to adjust for this with values larger than 31. The
- * only affected values are I40E_PHY_TYPE_25GBASE_*.
- */
-#define I40E_PHY_TYPE_OFFSET 1
-#define I40E_CAP_PHY_TYPE_25GBASE_KR BIT_ULL(I40E_PHY_TYPE_25GBASE_KR + \
-                                            I40E_PHY_TYPE_OFFSET)
-#define I40E_CAP_PHY_TYPE_25GBASE_CR BIT_ULL(I40E_PHY_TYPE_25GBASE_CR + \
-                                            I40E_PHY_TYPE_OFFSET)
-#define I40E_CAP_PHY_TYPE_25GBASE_SR BIT_ULL(I40E_PHY_TYPE_25GBASE_SR + \
-                                            I40E_PHY_TYPE_OFFSET)
-#define I40E_CAP_PHY_TYPE_25GBASE_LR BIT_ULL(I40E_PHY_TYPE_25GBASE_LR + \
-                                            I40E_PHY_TYPE_OFFSET)
-#define I40E_HW_CAP_MAX_GPIO                   30
+#define I40E_HW_CAP_MAX_GPIO           30
 /* Capabilities of a PF or a VF or the whole device */
 struct i40e_hw_capabilities {
-       u32  switch_mode;
-#define I40E_NVM_IMAGE_TYPE_EVB                0x0
-#define I40E_NVM_IMAGE_TYPE_CLOUD      0x2
-#define I40E_NVM_IMAGE_TYPE_UDP_CLOUD  0x3
-
-       u32  management_mode;
-       u32  mng_protocols_over_mctp;
-#define I40E_MNG_PROTOCOL_PLDM         0x2
-#define I40E_MNG_PROTOCOL_OEM_COMMANDS 0x4
-#define I40E_MNG_PROTOCOL_NCSI         0x8
-       u32  npar_enable;
-       u32  os2bmc;
-       u32  valid_functions;
-       bool sr_iov_1_1;
-       bool vmdq;
-       bool evb_802_1_qbg; /* Edge Virtual Bridging */
-       bool evb_802_1_qbh; /* Bridge Port Extension */
        bool dcb;
        bool fcoe;
-       bool iscsi; /* Indicates iSCSI enabled */
-       bool flex10_enable;
-       bool flex10_capable;
-       u32  flex10_mode;
-#define I40E_FLEX10_MODE_UNKNOWN       0x0
-#define I40E_FLEX10_MODE_DCC           0x1
-#define I40E_FLEX10_MODE_DCI           0x2
-
-       u32 flex10_status;
-#define I40E_FLEX10_STATUS_DCC_ERROR   0x1
-#define I40E_FLEX10_STATUS_VC_MODE     0x2
-
-       bool sec_rev_disabled;
-       bool update_disabled;
-#define I40E_NVM_MGMT_SEC_REV_DISABLED 0x1
-#define I40E_NVM_MGMT_UPDATE_DISABLED  0x2
-
-       bool mgmt_cem;
-       bool ieee_1588;
-       bool iwarp;
-       bool fd;
-       u32 fd_filters_guaranteed;
-       u32 fd_filters_best_effort;
-       bool rss;
-       u32 rss_table_size;
-       u32 rss_table_entry_width;
-       bool led[I40E_HW_CAP_MAX_GPIO];
-       bool sdp[I40E_HW_CAP_MAX_GPIO];
-       u32 nvm_image_type;
-       u32 num_flow_director_filters;
-       u32 num_vfs;
-       u32 vf_base_id;
        u32 num_vsis;
        u32 num_rx_qp;
        u32 num_tx_qp;
        u32 base_queue;
-       u32 num_msix_vectors;
        u32 num_msix_vectors_vf;
-       u32 led_pin_num;
-       u32 sdp_pin_num;
-       u32 mdio_port_num;
-       u32 mdio_port_mode;
-       u8 rx_buf_chain_len;
-       u32 enabled_tcmap;
-       u32 maxtc;
-       u64 wr_csr_prot;
 };
 
 struct i40e_mac_info {
@@ -300,106 +117,6 @@ struct i40e_mac_info {
        u16 max_fcoeq;
 };
 
-enum i40e_aq_resources_ids {
-       I40E_NVM_RESOURCE_ID = 1
-};
-
-enum i40e_aq_resource_access_type {
-       I40E_RESOURCE_READ = 1,
-       I40E_RESOURCE_WRITE
-};
-
-struct i40e_nvm_info {
-       u64 hw_semaphore_timeout; /* usec global time (GTIME resolution) */
-       u32 timeout;              /* [ms] */
-       u16 sr_size;              /* Shadow RAM size in words */
-       bool blank_nvm_mode;      /* is NVM empty (no FW present)*/
-       u16 version;              /* NVM package version */
-       u32 eetrack;              /* NVM data version */
-       u32 oem_ver;              /* OEM version info */
-};
-
-/* definitions used in NVM update support */
-
-enum i40e_nvmupd_cmd {
-       I40E_NVMUPD_INVALID,
-       I40E_NVMUPD_READ_CON,
-       I40E_NVMUPD_READ_SNT,
-       I40E_NVMUPD_READ_LCB,
-       I40E_NVMUPD_READ_SA,
-       I40E_NVMUPD_WRITE_ERA,
-       I40E_NVMUPD_WRITE_CON,
-       I40E_NVMUPD_WRITE_SNT,
-       I40E_NVMUPD_WRITE_LCB,
-       I40E_NVMUPD_WRITE_SA,
-       I40E_NVMUPD_CSUM_CON,
-       I40E_NVMUPD_CSUM_SA,
-       I40E_NVMUPD_CSUM_LCB,
-       I40E_NVMUPD_STATUS,
-       I40E_NVMUPD_EXEC_AQ,
-       I40E_NVMUPD_GET_AQ_RESULT,
-       I40E_NVMUPD_GET_AQ_EVENT,
-};
-
-enum i40e_nvmupd_state {
-       I40E_NVMUPD_STATE_INIT,
-       I40E_NVMUPD_STATE_READING,
-       I40E_NVMUPD_STATE_WRITING,
-       I40E_NVMUPD_STATE_INIT_WAIT,
-       I40E_NVMUPD_STATE_WRITE_WAIT,
-       I40E_NVMUPD_STATE_ERROR
-};
-
-/* nvm_access definition and its masks/shifts need to be accessible to
- * application, core driver, and shared code.  Where is the right file?
- */
-#define I40E_NVM_READ  0xB
-#define I40E_NVM_WRITE 0xC
-
-#define I40E_NVM_MOD_PNT_MASK 0xFF
-
-#define I40E_NVM_TRANS_SHIFT                   8
-#define I40E_NVM_TRANS_MASK                    (0xf << I40E_NVM_TRANS_SHIFT)
-#define I40E_NVM_PRESERVATION_FLAGS_SHIFT      12
-#define I40E_NVM_PRESERVATION_FLAGS_MASK \
-                               (0x3 << I40E_NVM_PRESERVATION_FLAGS_SHIFT)
-#define I40E_NVM_PRESERVATION_FLAGS_SELECTED   0x01
-#define I40E_NVM_PRESERVATION_FLAGS_ALL                0x02
-#define I40E_NVM_CON                           0x0
-#define I40E_NVM_SNT                           0x1
-#define I40E_NVM_LCB                           0x2
-#define I40E_NVM_SA                            (I40E_NVM_SNT | I40E_NVM_LCB)
-#define I40E_NVM_ERA                           0x4
-#define I40E_NVM_CSUM                          0x8
-#define I40E_NVM_AQE                           0xe
-#define I40E_NVM_EXEC                          0xf
-
-#define I40E_NVM_ADAPT_SHIFT   16
-#define I40E_NVM_ADAPT_MASK    (0xffff << I40E_NVM_ADAPT_SHIFT)
-
-#define I40E_NVMUPD_MAX_DATA   4096
-#define I40E_NVMUPD_IFACE_TIMEOUT 2 /* seconds */
-
-struct i40e_nvm_access {
-       u32 command;
-       u32 config;
-       u32 offset;     /* in bytes */
-       u32 data_size;  /* in bytes */
-       u8 data[1];
-};
-
-/* (Q)SFP module access definitions */
-#define I40E_I2C_EEPROM_DEV_ADDR       0xA0
-#define I40E_I2C_EEPROM_DEV_ADDR2      0xA2
-#define I40E_MODULE_TYPE_ADDR          0x00
-#define I40E_MODULE_REVISION_ADDR      0x01
-#define I40E_MODULE_SFF_8472_COMP      0x5E
-#define I40E_MODULE_SFF_8472_SWAP      0x5C
-#define I40E_MODULE_SFF_ADDR_MODE      0x04
-#define I40E_MODULE_TYPE_QSFP_PLUS     0x0D
-#define I40E_MODULE_TYPE_QSFP28                0x11
-#define I40E_MODULE_QSFP_MAX_LEN       640
-
 /* PCI bus types */
 enum i40e_bus_type {
        i40e_bus_type_unknown = 0,
@@ -447,69 +164,16 @@ struct i40e_bus_info {
        u16 bus_id;
 };
 
-/* Flow control (FC) parameters */
-struct i40e_fc_info {
-       enum i40e_fc_mode current_mode; /* FC mode in effect */
-       enum i40e_fc_mode requested_mode; /* FC mode requested by caller */
-};
-
 #define I40E_MAX_TRAFFIC_CLASS         8
 #define I40E_MAX_USER_PRIORITY         8
-#define I40E_DCBX_MAX_APPS             32
-#define I40E_LLDPDU_SIZE               1500
-
-/* IEEE 802.1Qaz ETS Configuration data */
-struct i40e_ieee_ets_config {
-       u8 willing;
-       u8 cbs;
-       u8 maxtcs;
-       u8 prioritytable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tcbwtable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tsatable[I40E_MAX_TRAFFIC_CLASS];
-};
-
-/* IEEE 802.1Qaz ETS Recommendation data */
-struct i40e_ieee_ets_recommend {
-       u8 prioritytable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tcbwtable[I40E_MAX_TRAFFIC_CLASS];
-       u8 tsatable[I40E_MAX_TRAFFIC_CLASS];
-};
-
-/* IEEE 802.1Qaz PFC Configuration data */
-struct i40e_ieee_pfc_config {
-       u8 willing;
-       u8 mbc;
-       u8 pfccap;
-       u8 pfcenable;
-};
-
-/* IEEE 802.1Qaz Application Priority data */
-struct i40e_ieee_app_priority_table {
-       u8  priority;
-       u8  selector;
-       u16 protocolid;
-};
-
-struct i40e_dcbx_config {
-       u32 numapps;
-       u32 tlv_status; /* CEE mode TLV status */
-       struct i40e_ieee_ets_config etscfg;
-       struct i40e_ieee_ets_recommend etsrec;
-       struct i40e_ieee_pfc_config pfc;
-       struct i40e_ieee_app_priority_table app[I40E_DCBX_MAX_APPS];
-};
-
 /* Port hardware description */
 struct i40e_hw {
        u8 __iomem *hw_addr;
        void *back;
 
        /* subsystem structs */
-       struct i40e_phy_info phy;
        struct i40e_mac_info mac;
        struct i40e_bus_info bus;
-       struct i40e_nvm_info nvm;
-       struct i40e_fc_info fc;
 
        /* pci info */
        u16 device_id;
@@ -517,58 +181,13 @@ struct i40e_hw {
        u16 subsystem_device_id;
        u16 subsystem_vendor_id;
        u8 revision_id;
-       u8 port;
-       bool adapter_stopped;
 
        /* capabilities for entire device and PCI func */
        struct i40e_hw_capabilities dev_caps;
-       struct i40e_hw_capabilities func_caps;
-
-       /* Flow Director shared filter space */
-       u16 fdir_shared_filter_count;
-
-       /* device profile info */
-       u8  pf_id;
-       u16 main_vsi_seid;
-
-       /* for multi-function MACs */
-       u16 partition_id;
-       u16 num_partitions;
-       u16 num_ports;
-
-       /* Closest numa node to the device */
-       u16 numa_node;
 
        /* Admin Queue info */
        struct i40e_adminq_info aq;
 
-       /* state of nvm update process */
-       enum i40e_nvmupd_state nvmupd_state;
-       struct i40e_aq_desc nvm_wb_desc;
-       struct i40e_aq_desc nvm_aq_event_desc;
-       struct i40e_virt_mem nvm_buff;
-       bool nvm_release_on_done;
-       u16 nvm_wait_opcode;
-
-       /* HMC info */
-       struct i40e_hmc_info hmc; /* HMC info struct */
-
-       /* LLDP/DCBX Status */
-       u16 dcbx_status;
-
-#define I40E_HW_FLAG_802_1AD_CAPABLE        BIT_ULL(1)
-#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE  BIT_ULL(2)
-
-       /* DCBX info */
-       struct i40e_dcbx_config local_dcbx_config; /* Oper/Local Cfg */
-       struct i40e_dcbx_config remote_dcbx_config; /* Peer Cfg */
-       struct i40e_dcbx_config desired_dcbx_config; /* CEE Desired Cfg */
-
-       /* Used in set switch config AQ command */
-       u16 switch_tag;
-       u16 first_tag;
-       u16 second_tag;
-
        /* debug mask */
        u32 debug_mask;
        char err_str[16];
@@ -962,9 +581,6 @@ struct i40e_tx_context_desc {
        __le64 type_cmd_tso_mss;
 };
 
-#define I40E_TXD_CTX_QW1_DTYPE_SHIFT   0
-#define I40E_TXD_CTX_QW1_DTYPE_MASK    (0xFUL << I40E_TXD_CTX_QW1_DTYPE_SHIFT)
-
 #define I40E_TXD_CTX_QW1_CMD_SHIFT     4
 #define I40E_TXD_CTX_QW1_CMD_MASK      (0xFFFFUL << I40E_TXD_CTX_QW1_CMD_SHIFT)
 
@@ -1028,21 +644,6 @@ enum i40e_tx_ctx_desc_eipt_offload {
 
 #define I40E_TXD_CTX_QW0_L4T_CS_SHIFT  23
 #define I40E_TXD_CTX_QW0_L4T_CS_MASK   BIT_ULL(I40E_TXD_CTX_QW0_L4T_CS_SHIFT)
-struct i40e_filter_program_desc {
-       __le32 qindex_flex_ptype_vsi;
-       __le32 rsvd;
-       __le32 dtype_cmd_cntindex;
-       __le32 fd_id;
-};
-#define I40E_TXD_FLTR_QW0_QINDEX_SHIFT 0
-#define I40E_TXD_FLTR_QW0_QINDEX_MASK  (0x7FFUL << \
-                                        I40E_TXD_FLTR_QW0_QINDEX_SHIFT)
-#define I40E_TXD_FLTR_QW0_FLEXOFF_SHIFT        11
-#define I40E_TXD_FLTR_QW0_FLEXOFF_MASK (0x7UL << \
-                                        I40E_TXD_FLTR_QW0_FLEXOFF_SHIFT)
-#define I40E_TXD_FLTR_QW0_PCTYPE_SHIFT 17
-#define I40E_TXD_FLTR_QW0_PCTYPE_MASK  (0x3FUL << \
-                                        I40E_TXD_FLTR_QW0_PCTYPE_SHIFT)
 
 /* Packet Classifier Types for filters */
 enum i40e_filter_pctype {
@@ -1076,58 +677,6 @@ enum i40e_filter_pctype {
        I40E_FILTER_PCTYPE_L2_PAYLOAD                   = 63,
 };
 
-enum i40e_filter_program_desc_dest {
-       I40E_FILTER_PROGRAM_DESC_DEST_DROP_PACKET               = 0x0,
-       I40E_FILTER_PROGRAM_DESC_DEST_DIRECT_PACKET_QINDEX      = 0x1,
-       I40E_FILTER_PROGRAM_DESC_DEST_DIRECT_PACKET_OTHER       = 0x2,
-};
-
-enum i40e_filter_program_desc_fd_status {
-       I40E_FILTER_PROGRAM_DESC_FD_STATUS_NONE                 = 0x0,
-       I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID                = 0x1,
-       I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID_4FLEX_BYTES    = 0x2,
-       I40E_FILTER_PROGRAM_DESC_FD_STATUS_8FLEX_BYTES          = 0x3,
-};
-
-#define I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT       23
-#define I40E_TXD_FLTR_QW0_DEST_VSI_MASK        (0x1FFUL << \
-                                        I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT)
-
-#define I40E_TXD_FLTR_QW1_CMD_SHIFT    4
-#define I40E_TXD_FLTR_QW1_CMD_MASK     (0xFFFFULL << \
-                                        I40E_TXD_FLTR_QW1_CMD_SHIFT)
-
-#define I40E_TXD_FLTR_QW1_PCMD_SHIFT   (0x0ULL + I40E_TXD_FLTR_QW1_CMD_SHIFT)
-#define I40E_TXD_FLTR_QW1_PCMD_MASK    (0x7ULL << I40E_TXD_FLTR_QW1_PCMD_SHIFT)
-
-enum i40e_filter_program_desc_pcmd {
-       I40E_FILTER_PROGRAM_DESC_PCMD_ADD_UPDATE        = 0x1,
-       I40E_FILTER_PROGRAM_DESC_PCMD_REMOVE            = 0x2,
-};
-
-#define I40E_TXD_FLTR_QW1_DEST_SHIFT   (0x3ULL + I40E_TXD_FLTR_QW1_CMD_SHIFT)
-#define I40E_TXD_FLTR_QW1_DEST_MASK    (0x3ULL << I40E_TXD_FLTR_QW1_DEST_SHIFT)
-
-#define I40E_TXD_FLTR_QW1_CNT_ENA_SHIFT        (0x7ULL + 
I40E_TXD_FLTR_QW1_CMD_SHIFT)
-#define I40E_TXD_FLTR_QW1_CNT_ENA_MASK BIT_ULL(I40E_TXD_FLTR_QW1_CNT_ENA_SHIFT)
-
-#define I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT      (0x9ULL + \
-                                                I40E_TXD_FLTR_QW1_CMD_SHIFT)
-#define I40E_TXD_FLTR_QW1_FD_STATUS_MASK (0x3ULL << \
-                                         I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT)
-
-#define I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT 20
-#define I40E_TXD_FLTR_QW1_CNTINDEX_MASK        (0x1FFUL << \
-                                        I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT)
-
-enum i40e_filter_type {
-       I40E_FLOW_DIRECTOR_FLTR = 0,
-       I40E_PE_QUAD_HASH_FLTR = 1,
-       I40E_ETHERTYPE_FLTR,
-       I40E_FCOE_CTX_FLTR,
-       I40E_MAC_VLAN_FLTR,
-       I40E_HASH_FLTR
-};
 
 struct i40e_vsi_context {
        u16 seid;
@@ -1167,330 +716,4 @@ struct i40e_eth_stats {
        u64 tx_discards;                /* tdpc */
        u64 tx_errors;                  /* tepc */
 };
-
-/* Statistics collected per VEB per TC */
-struct i40e_veb_tc_stats {
-       u64 tc_rx_packets[I40E_MAX_TRAFFIC_CLASS];
-       u64 tc_rx_bytes[I40E_MAX_TRAFFIC_CLASS];
-       u64 tc_tx_packets[I40E_MAX_TRAFFIC_CLASS];
-       u64 tc_tx_bytes[I40E_MAX_TRAFFIC_CLASS];
-};
-
-/* Statistics collected by the MAC */
-struct i40e_hw_port_stats {
-       /* eth stats collected by the port */
-       struct i40e_eth_stats eth;
-
-       /* additional port specific stats */
-       u64 tx_dropped_link_down;       /* tdold */
-       u64 crc_errors;                 /* crcerrs */
-       u64 illegal_bytes;              /* illerrc */
-       u64 error_bytes;                /* errbc */
-       u64 mac_local_faults;           /* mlfc */
-       u64 mac_remote_faults;          /* mrfc */
-       u64 rx_length_errors;           /* rlec */
-       u64 link_xon_rx;                /* lxonrxc */
-       u64 link_xoff_rx;               /* lxoffrxc */
-       u64 priority_xon_rx[8];         /* pxonrxc[8] */
-       u64 priority_xoff_rx[8];        /* pxoffrxc[8] */
-       u64 link_xon_tx;                /* lxontxc */
-       u64 link_xoff_tx;               /* lxofftxc */
-       u64 priority_xon_tx[8];         /* pxontxc[8] */
-       u64 priority_xoff_tx[8];        /* pxofftxc[8] */
-       u64 priority_xon_2_xoff[8];     /* pxon2offc[8] */
-       u64 rx_size_64;                 /* prc64 */
-       u64 rx_size_127;                /* prc127 */
-       u64 rx_size_255;                /* prc255 */
-       u64 rx_size_511;                /* prc511 */
-       u64 rx_size_1023;               /* prc1023 */
-       u64 rx_size_1522;               /* prc1522 */
-       u64 rx_size_big;                /* prc9522 */
-       u64 rx_undersize;               /* ruc */
-       u64 rx_fragments;               /* rfc */
-       u64 rx_oversize;                /* roc */
-       u64 rx_jabber;                  /* rjc */
-       u64 tx_size_64;                 /* ptc64 */
-       u64 tx_size_127;                /* ptc127 */
-       u64 tx_size_255;                /* ptc255 */
-       u64 tx_size_511;                /* ptc511 */
-       u64 tx_size_1023;               /* ptc1023 */
-       u64 tx_size_1522;               /* ptc1522 */
-       u64 tx_size_big;                /* ptc9522 */
-       u64 mac_short_packet_dropped;   /* mspdc */
-       u64 checksum_error;             /* xec */
-       /* flow director stats */
-       u64 fd_atr_match;
-       u64 fd_sb_match;
-       u64 fd_atr_tunnel_match;
-       u32 fd_atr_status;
-       u32 fd_sb_status;
-       /* EEE LPI */
-       u32 tx_lpi_status;
-       u32 rx_lpi_status;
-       u64 tx_lpi_count;               /* etlpic */
-       u64 rx_lpi_count;               /* erlpic */
-};
-
-/* Checksum and Shadow RAM pointers */
-#define I40E_SR_NVM_CONTROL_WORD               0x00
-#define I40E_EMP_MODULE_PTR                    0x0F
-#define I40E_SR_EMP_MODULE_PTR                 0x48
-#define I40E_NVM_OEM_VER_OFF                   0x83
-#define I40E_SR_NVM_DEV_STARTER_VERSION                0x18
-#define I40E_SR_NVM_WAKE_ON_LAN                        0x19
-#define I40E_SR_ALTERNATE_SAN_MAC_ADDRESS_PTR  0x27
-#define I40E_SR_NVM_EETRACK_LO                 0x2D
-#define I40E_SR_NVM_EETRACK_HI                 0x2E
-#define I40E_SR_VPD_PTR                                0x2F
-#define I40E_SR_PCIE_ALT_AUTO_LOAD_PTR         0x3E
-#define I40E_SR_SW_CHECKSUM_WORD               0x3F
-
-/* Auxiliary field, mask and shift definition for Shadow RAM and NVM Flash */
-#define I40E_SR_VPD_MODULE_MAX_SIZE            1024
-#define I40E_SR_PCIE_ALT_MODULE_MAX_SIZE       1024
-#define I40E_SR_CONTROL_WORD_1_SHIFT           0x06
-#define I40E_SR_CONTROL_WORD_1_MASK    (0x03 << I40E_SR_CONTROL_WORD_1_SHIFT)
-#define I40E_SR_CONTROL_WORD_1_NVM_BANK_VALID  BIT(5)
-#define I40E_SR_NVM_MAP_STRUCTURE_TYPE         BIT(12)
-#define I40E_PTR_TYPE                          BIT(15)
-
-/* Shadow RAM related */
-#define I40E_SR_SECTOR_SIZE_IN_WORDS   0x800
-#define I40E_SR_WORDS_IN_1KB           512
-/* Checksum should be calculated such that after adding all the words,
- * including the checksum word itself, the sum should be 0xBABA.
- */
-#define I40E_SR_SW_CHECKSUM_BASE       0xBABA
-
-#define I40E_SRRD_SRCTL_ATTEMPTS       100000
-
-enum i40e_switch_element_types {
-       I40E_SWITCH_ELEMENT_TYPE_MAC    = 1,
-       I40E_SWITCH_ELEMENT_TYPE_PF     = 2,
-       I40E_SWITCH_ELEMENT_TYPE_VF     = 3,
-       I40E_SWITCH_ELEMENT_TYPE_EMP    = 4,
-       I40E_SWITCH_ELEMENT_TYPE_BMC    = 6,
-       I40E_SWITCH_ELEMENT_TYPE_PE     = 16,
-       I40E_SWITCH_ELEMENT_TYPE_VEB    = 17,
-       I40E_SWITCH_ELEMENT_TYPE_PA     = 18,
-       I40E_SWITCH_ELEMENT_TYPE_VSI    = 19,
-};
-
-/* Supported EtherType filters */
-enum i40e_ether_type_index {
-       I40E_ETHER_TYPE_1588            = 0,
-       I40E_ETHER_TYPE_FIP             = 1,
-       I40E_ETHER_TYPE_OUI_EXTENDED    = 2,
-       I40E_ETHER_TYPE_MAC_CONTROL     = 3,
-       I40E_ETHER_TYPE_LLDP            = 4,
-       I40E_ETHER_TYPE_EVB_PROTOCOL1   = 5,
-       I40E_ETHER_TYPE_EVB_PROTOCOL2   = 6,
-       I40E_ETHER_TYPE_QCN_CNM         = 7,
-       I40E_ETHER_TYPE_8021X           = 8,
-       I40E_ETHER_TYPE_ARP             = 9,
-       I40E_ETHER_TYPE_RSV1            = 10,
-       I40E_ETHER_TYPE_RSV2            = 11,
-};
-
-/* Filter context base size is 1K */
-#define I40E_HASH_FILTER_BASE_SIZE     1024
-/* Supported Hash filter values */
-enum i40e_hash_filter_size {
-       I40E_HASH_FILTER_SIZE_1K        = 0,
-       I40E_HASH_FILTER_SIZE_2K        = 1,
-       I40E_HASH_FILTER_SIZE_4K        = 2,
-       I40E_HASH_FILTER_SIZE_8K        = 3,
-       I40E_HASH_FILTER_SIZE_16K       = 4,
-       I40E_HASH_FILTER_SIZE_32K       = 5,
-       I40E_HASH_FILTER_SIZE_64K       = 6,
-       I40E_HASH_FILTER_SIZE_128K      = 7,
-       I40E_HASH_FILTER_SIZE_256K      = 8,
-       I40E_HASH_FILTER_SIZE_512K      = 9,
-       I40E_HASH_FILTER_SIZE_1M        = 10,
-};
-
-/* DMA context base size is 0.5K */
-#define I40E_DMA_CNTX_BASE_SIZE                512
-/* Supported DMA context values */
-enum i40e_dma_cntx_size {
-       I40E_DMA_CNTX_SIZE_512          = 0,
-       I40E_DMA_CNTX_SIZE_1K           = 1,
-       I40E_DMA_CNTX_SIZE_2K           = 2,
-       I40E_DMA_CNTX_SIZE_4K           = 3,
-       I40E_DMA_CNTX_SIZE_8K           = 4,
-       I40E_DMA_CNTX_SIZE_16K          = 5,
-       I40E_DMA_CNTX_SIZE_32K          = 6,
-       I40E_DMA_CNTX_SIZE_64K          = 7,
-       I40E_DMA_CNTX_SIZE_128K         = 8,
-       I40E_DMA_CNTX_SIZE_256K         = 9,
-};
-
-/* Supported Hash look up table (LUT) sizes */
-enum i40e_hash_lut_size {
-       I40E_HASH_LUT_SIZE_128          = 0,
-       I40E_HASH_LUT_SIZE_512          = 1,
-};
-
-/* Structure to hold a per PF filter control settings */
-struct i40e_filter_control_settings {
-       /* number of PE Quad Hash filter buckets */
-       enum i40e_hash_filter_size pe_filt_num;
-       /* number of PE Quad Hash contexts */
-       enum i40e_dma_cntx_size pe_cntx_num;
-       /* number of FCoE filter buckets */
-       enum i40e_hash_filter_size fcoe_filt_num;
-       /* number of FCoE DDP contexts */
-       enum i40e_dma_cntx_size fcoe_cntx_num;
-       /* size of the Hash LUT */
-       enum i40e_hash_lut_size hash_lut_size;
-       /* enable FDIR filters for PF and its VFs */
-       bool enable_fdir;
-       /* enable Ethertype filters for PF and its VFs */
-       bool enable_ethtype;
-       /* enable MAC/VLAN filters for PF and its VFs */
-       bool enable_macvlan;
-};
-
-/* Structure to hold device level control filter counts */
-struct i40e_control_filter_stats {
-       u16 mac_etype_used;   /* Used perfect match MAC/EtherType filters */
-       u16 etype_used;       /* Used perfect EtherType filters */
-       u16 mac_etype_free;   /* Un-used perfect match MAC/EtherType filters */
-       u16 etype_free;       /* Un-used perfect EtherType filters */
-};
-
-enum i40e_reset_type {
-       I40E_RESET_POR          = 0,
-       I40E_RESET_CORER        = 1,
-       I40E_RESET_GLOBR        = 2,
-       I40E_RESET_EMPR         = 3,
-};
-
-/* IEEE 802.1AB LLDP Agent Variables from NVM */
-#define I40E_NVM_LLDP_CFG_PTR  0x06
-#define I40E_SR_LLDP_CFG_PTR   0x31
-
-/* RSS Hash Table Size */
-#define I40E_PFQF_CTL_0_HASHLUTSIZE_512        0x00010000
-
-/* INPUT SET MASK for RSS, flow director and flexible payload */
-#define I40E_FD_INSET_L3_SRC_SHIFT             47
-#define I40E_FD_INSET_L3_SRC_WORD_MASK         (0x3ULL << \
-                                                I40E_FD_INSET_L3_SRC_SHIFT)
-#define I40E_FD_INSET_L3_DST_SHIFT             35
-#define I40E_FD_INSET_L3_DST_WORD_MASK         (0x3ULL << \
-                                                I40E_FD_INSET_L3_DST_SHIFT)
-#define I40E_FD_INSET_L4_SRC_SHIFT             34
-#define I40E_FD_INSET_L4_SRC_WORD_MASK         (0x1ULL << \
-                                                I40E_FD_INSET_L4_SRC_SHIFT)
-#define I40E_FD_INSET_L4_DST_SHIFT             33
-#define I40E_FD_INSET_L4_DST_WORD_MASK         (0x1ULL << \
-                                                I40E_FD_INSET_L4_DST_SHIFT)
-#define I40E_FD_INSET_VERIFY_TAG_SHIFT         31
-#define I40E_FD_INSET_VERIFY_TAG_WORD_MASK     (0x3ULL << \
-                                                I40E_FD_INSET_VERIFY_TAG_SHIFT)
-
-#define I40E_FD_INSET_FLEX_WORD50_SHIFT                17
-#define I40E_FD_INSET_FLEX_WORD50_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD50_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD51_SHIFT                16
-#define I40E_FD_INSET_FLEX_WORD51_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD51_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD52_SHIFT                15
-#define I40E_FD_INSET_FLEX_WORD52_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD52_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD53_SHIFT                14
-#define I40E_FD_INSET_FLEX_WORD53_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD53_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD54_SHIFT                13
-#define I40E_FD_INSET_FLEX_WORD54_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD54_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD55_SHIFT                12
-#define I40E_FD_INSET_FLEX_WORD55_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD55_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD56_SHIFT                11
-#define I40E_FD_INSET_FLEX_WORD56_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD56_SHIFT)
-#define I40E_FD_INSET_FLEX_WORD57_SHIFT                10
-#define I40E_FD_INSET_FLEX_WORD57_MASK         (0x1ULL << \
-                                       I40E_FD_INSET_FLEX_WORD57_SHIFT)
-
-/* Version format for Dynamic Device Personalization(DDP) */
-struct i40e_ddp_version {
-       u8 major;
-       u8 minor;
-       u8 update;
-       u8 draft;
-};
-
-#define I40E_DDP_NAME_SIZE     32
-
-/* Package header */
-struct i40e_package_header {
-       struct i40e_ddp_version version;
-       u32 segment_count;
-       u32 segment_offset[1];
-};
-
-/* Generic segment header */
-struct i40e_generic_seg_header {
-#define SEGMENT_TYPE_METADATA  0x00000001
-#define SEGMENT_TYPE_NOTES     0x00000002
-#define SEGMENT_TYPE_I40E      0x00000011
-#define SEGMENT_TYPE_X722      0x00000012
-       u32 type;
-       struct i40e_ddp_version version;
-       u32 size;
-       char name[I40E_DDP_NAME_SIZE];
-};
-
-struct i40e_metadata_segment {
-       struct i40e_generic_seg_header header;
-       struct i40e_ddp_version version;
-       u32 track_id;
-       char name[I40E_DDP_NAME_SIZE];
-};
-
-struct i40e_device_id_entry {
-       u32 vendor_dev_id;
-       u32 sub_vendor_dev_id;
-};
-
-struct i40e_profile_segment {
-       struct i40e_generic_seg_header header;
-       struct i40e_ddp_version version;
-       char name[I40E_DDP_NAME_SIZE];
-       u32 device_table_count;
-       struct i40e_device_id_entry device_table[1];
-};
-
-struct i40e_section_table {
-       u32 section_count;
-       u32 section_offset[1];
-};
-
-struct i40e_profile_section_header {
-       u16 tbl_size;
-       u16 data_end;
-       struct {
-#define SECTION_TYPE_INFO      0x00000010
-#define SECTION_TYPE_MMIO      0x00000800
-#define SECTION_TYPE_AQ                0x00000801
-#define SECTION_TYPE_NOTE      0x80000000
-#define SECTION_TYPE_NAME      0x80000001
-               u32 type;
-               u32 offset;
-               u32 size;
-       } section;
-};
-
-struct i40e_profile_info {
-       u32 track_id;
-       struct i40e_ddp_version version;
-       u8 op;
-#define I40E_DDP_ADD_TRACKID           0x01
-#define I40E_DDP_REMOVE_TRACKID        0x02
-       u8 reserved[7];
-       u8 name[I40E_DDP_NAME_SIZE];
-};
 #endif /* _I40E_TYPE_H_ */
-- 
2.14.4

Reply via email to