net/qede/base: fix to support OVLAN mode
[dpdk.git] / drivers / net / qede / base / nvm_cfg.h
index 8d99880..c99e805 100644 (file)
  * Description: NVM config file - Generated file from nvm cfg excel.
  *              DO NOT MODIFY !!!
  *
- * Created:     1/14/2016
+ * Created:     5/8/2017
  *
  ****************************************************************************/
 
 #ifndef NVM_CFG_H
 #define NVM_CFG_H
 
+#define NVM_CFG_version 0x83000
+
+#define NVM_CFG_new_option_seq 23
+
+#define NVM_CFG_removed_option_seq 1
+
+#define NVM_CFG_updated_value_seq 4
+
 struct nvm_cfg_mac_address {
        u32 mac_addr_hi;
                #define NVM_CFG_MAC_ADDRESS_HI_MASK 0x0000FFFF
@@ -64,10 +72,12 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_ENABLE_ATC_OFFSET 30
                #define NVM_CFG1_GLOB_ENABLE_ATC_DISABLED 0x0
                #define NVM_CFG1_GLOB_ENABLE_ATC_ENABLED 0x1
-               #define NVM_CFG1_GLOB_CLOCK_SLOWDOWN_MASK 0x80000000
-               #define NVM_CFG1_GLOB_CLOCK_SLOWDOWN_OFFSET 31
-               #define NVM_CFG1_GLOB_CLOCK_SLOWDOWN_DISABLED 0x0
-               #define NVM_CFG1_GLOB_CLOCK_SLOWDOWN_ENABLED 0x1
+               #define NVM_CFG1_GLOB_RESERVED__M_WAS_CLOCK_SLOWDOWN_MASK \
+                                                               0x80000000
+               #define NVM_CFG1_GLOB_RESERVED__M_WAS_CLOCK_SLOWDOWN_OFFSET 31
+               #define NVM_CFG1_GLOB_RESERVED__M_WAS_CLOCK_SLOWDOWN_DISABLED \
+                                                               0x0
+               #define NVM_CFG1_GLOB_RESERVED__M_WAS_CLOCK_SLOWDOWN_ENABLED 0x1
        u32 engineering_change[3]; /* 0x4 */
        u32 manufacturing_id; /* 0x10 */
        u32 serial_number[4]; /* 0x14 */
@@ -84,8 +94,11 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_ASPM_SUPPORT_MASK 0x00000018
                #define NVM_CFG1_GLOB_ASPM_SUPPORT_OFFSET 3
                #define NVM_CFG1_GLOB_ASPM_SUPPORT_L0S_L1_ENABLED 0x0
+               #define NVM_CFG1_GLOB_ASPM_SUPPORT_L0S_DISABLED 0x1
                #define NVM_CFG1_GLOB_ASPM_SUPPORT_L1_DISABLED 0x2
-#define NVM_CFG1_GLOB_RESERVED_MPREVENT_PCIE_L1_MENTRY_MASK     0x00000020
+               #define NVM_CFG1_GLOB_ASPM_SUPPORT_L0S_L1_DISABLED 0x3
+               #define NVM_CFG1_GLOB_RESERVED_MPREVENT_PCIE_L1_MENTRY_MASK \
+                       0x00000020
                #define NVM_CFG1_GLOB_RESERVED_MPREVENT_PCIE_L1_MENTRY_OFFSET 5
                #define NVM_CFG1_GLOB_PCIE_G2_TX_AMPLITUDE_MASK 0x000003C0
                #define NVM_CFG1_GLOB_PCIE_G2_TX_AMPLITUDE_OFFSET 6
@@ -101,10 +114,9 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_WWN_NODE_PREFIX1_OFFSET 21
                #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_MASK 0x60000000
                #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_OFFSET 29
-       /* Set the duration, in seconds, fan failure signal should be
-        * sampled
-        */
-#define NVM_CFG1_GLOB_RESERVED_FAN_FAILURE_DURATION_MASK        0x80000000
+       /*  Set the duration, in sec, fan failure signal should be sampled */
+               #define NVM_CFG1_GLOB_RESERVED_FAN_FAILURE_DURATION_MASK \
+                       0x80000000
                #define NVM_CFG1_GLOB_RESERVED_FAN_FAILURE_DURATION_OFFSET 31
        u32 mgmt_traffic; /* 0x28 */
                #define NVM_CFG1_GLOB_RESERVED60_MASK 0x00000001
@@ -132,27 +144,29 @@ struct nvm_cfg1_glob {
        u32 core_cfg; /* 0x2C */
                #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_MASK 0x000000FF
                #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_OFFSET 0
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_2X40G                0x0
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_2X50G                0x1
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_1X100G               0x2
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_4X10G_F              0x3
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_4X10G_E              0x4
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_4X20G                0x5
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_1X40G                0xB
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_2X25G                0xC
-#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_DE_1X25G                0xD
-#define NVM_CFG1_GLOB_EAGLE_ENFORCE_TX_FIR_CFG_MASK             0x00000100
-#define NVM_CFG1_GLOB_EAGLE_ENFORCE_TX_FIR_CFG_OFFSET           8
-#define NVM_CFG1_GLOB_EAGLE_ENFORCE_TX_FIR_CFG_DISABLED         0x0
-#define NVM_CFG1_GLOB_EAGLE_ENFORCE_TX_FIR_CFG_ENABLED          0x1
-#define NVM_CFG1_GLOB_FALCON_ENFORCE_TX_FIR_CFG_MASK            0x00000200
-#define NVM_CFG1_GLOB_FALCON_ENFORCE_TX_FIR_CFG_OFFSET          9
-#define NVM_CFG1_GLOB_FALCON_ENFORCE_TX_FIR_CFG_DISABLED        0x0
-#define NVM_CFG1_GLOB_FALCON_ENFORCE_TX_FIR_CFG_ENABLED         0x1
-#define NVM_CFG1_GLOB_EAGLE_CORE_ADDR_MASK                      0x0003FC00
-#define NVM_CFG1_GLOB_EAGLE_CORE_ADDR_OFFSET                    10
-#define NVM_CFG1_GLOB_FALCON_CORE_ADDR_MASK                     0x03FC0000
-#define NVM_CFG1_GLOB_FALCON_CORE_ADDR_OFFSET                   18
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_2X40G 0x0
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X50G 0x1
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_1X100G 0x2
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X10G_F 0x3
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X10G_E 0x4
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X20G 0x5
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X40G 0xB
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G 0xC
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G 0xD
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G 0xE
+               #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G 0xF
+               #define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_MASK 0x00000100
+               #define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_OFFSET 8
+               #define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_DISABLED 0x0
+               #define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_ENABLED 0x1
+               #define NVM_CFG1_GLOB_MPS25_ENFORCE_TX_FIR_CFG_MASK 0x00000200
+               #define NVM_CFG1_GLOB_MPS25_ENFORCE_TX_FIR_CFG_OFFSET 9
+               #define NVM_CFG1_GLOB_MPS25_ENFORCE_TX_FIR_CFG_DISABLED 0x0
+               #define NVM_CFG1_GLOB_MPS25_ENFORCE_TX_FIR_CFG_ENABLED 0x1
+               #define NVM_CFG1_GLOB_MPS10_CORE_ADDR_MASK 0x0003FC00
+               #define NVM_CFG1_GLOB_MPS10_CORE_ADDR_OFFSET 10
+               #define NVM_CFG1_GLOB_MPS25_CORE_ADDR_MASK 0x03FC0000
+               #define NVM_CFG1_GLOB_MPS25_CORE_ADDR_OFFSET 18
                #define NVM_CFG1_GLOB_AVS_MODE_MASK 0x1C000000
                #define NVM_CFG1_GLOB_AVS_MODE_OFFSET 26
                #define NVM_CFG1_GLOB_AVS_MODE_CLOSE_LOOP 0x0
@@ -209,7 +223,7 @@ struct nvm_cfg1_glob {
        /*  Maximum advertised pcie link width */
                #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_MASK 0x000F0000
                #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_OFFSET 16
-#define NVM_CFG1_GLOB_MAX_LINK_WIDTH_16_LANES                   0x0
+               #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_BB_16_LANES 0x0
                #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_1_LANE 0x1
                #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_2_LANES 0x2
                #define NVM_CFG1_GLOB_MAX_LINK_WIDTH_4_LANES 0x3
@@ -225,7 +239,8 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_ON_CHIP_SENSOR_MODE_INT_EXT_I2C 0x1
                #define NVM_CFG1_GLOB_ON_CHIP_SENSOR_MODE_INT_ONLY 0x2
                #define NVM_CFG1_GLOB_ON_CHIP_SENSOR_MODE_INT_EXT_SMBUS 0x3
-#define NVM_CFG1_GLOB_TEMPERATURE_MONITORING_MODE_MASK          0x06000000
+               #define NVM_CFG1_GLOB_TEMPERATURE_MONITORING_MODE_MASK \
+                       0x06000000
                #define NVM_CFG1_GLOB_TEMPERATURE_MONITORING_MODE_OFFSET 25
                #define NVM_CFG1_GLOB_TEMPERATURE_MONITORING_MODE_DISABLE 0x0
                #define NVM_CFG1_GLOB_TEMPERATURE_MONITORING_MODE_INTERNAL 0x1
@@ -237,6 +252,11 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_PLDM_SENSOR_MODE_INTERNAL 0x0
                #define NVM_CFG1_GLOB_PLDM_SENSOR_MODE_EXTERNAL 0x1
                #define NVM_CFG1_GLOB_PLDM_SENSOR_MODE_BOTH 0x2
+       /*  ROL enable */
+               #define NVM_CFG1_GLOB_RESET_ON_LAN_MASK 0x80000000
+               #define NVM_CFG1_GLOB_RESET_ON_LAN_OFFSET 31
+               #define NVM_CFG1_GLOB_RESET_ON_LAN_DISABLED 0x0
+               #define NVM_CFG1_GLOB_RESET_ON_LAN_ENABLED 0x1
        u32 f_lane_cfg1; /* 0x38 */
                #define NVM_CFG1_GLOB_RX_LANE0_SWAP_MASK 0x0000000F
                #define NVM_CFG1_GLOB_RX_LANE0_SWAP_OFFSET 0
@@ -272,15 +292,17 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_TX_LANE3_POL_FLIP_MASK 0x00000080
                #define NVM_CFG1_GLOB_TX_LANE3_POL_FLIP_OFFSET 7
        /*  Control the period between two successive checks */
-#define NVM_CFG1_GLOB_TEMPERATURE_PERIOD_BETWEEN_CHECKS_MASK    0x0000FF00
+               #define NVM_CFG1_GLOB_TEMPERATURE_PERIOD_BETWEEN_CHECKS_MASK \
+                       0x0000FF00
                #define NVM_CFG1_GLOB_TEMPERATURE_PERIOD_BETWEEN_CHECKS_OFFSET 8
        /*  Set shutdown temperature */
-#define NVM_CFG1_GLOB_SHUTDOWN_THRESHOLD_TEMPERATURE_MASK       0x00FF0000
+               #define NVM_CFG1_GLOB_SHUTDOWN_THRESHOLD_TEMPERATURE_MASK \
+                       0x00FF0000
                #define NVM_CFG1_GLOB_SHUTDOWN_THRESHOLD_TEMPERATURE_OFFSET 16
        /*  Set max. count for over operational temperature */
                #define NVM_CFG1_GLOB_MAX_COUNT_OPER_THRESHOLD_MASK 0xFF000000
                #define NVM_CFG1_GLOB_MAX_COUNT_OPER_THRESHOLD_OFFSET 24
-       u32 eagle_preemphasis;  /* 0x40 */
+       u32 mps10_preemphasis; /* 0x40 */
                #define NVM_CFG1_GLOB_LANE0_PREEMP_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_PREEMP_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_PREEMP_MASK 0x0000FF00
@@ -289,7 +311,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_PREEMP_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_PREEMP_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_PREEMP_OFFSET 24
-       u32 eagle_driver_current;       /* 0x44 */
+       u32 mps10_driver_current; /* 0x44 */
                #define NVM_CFG1_GLOB_LANE0_AMP_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_AMP_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_AMP_MASK 0x0000FF00
@@ -298,7 +320,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_AMP_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_AMP_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_AMP_OFFSET 24
-       u32 falcon_preemphasis; /* 0x48 */
+       u32 mps25_preemphasis; /* 0x48 */
                #define NVM_CFG1_GLOB_LANE0_PREEMP_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_PREEMP_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_PREEMP_MASK 0x0000FF00
@@ -307,7 +329,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_PREEMP_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_PREEMP_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_PREEMP_OFFSET 24
-       u32 falcon_driver_current;      /* 0x4C */
+       u32 mps25_driver_current; /* 0x4C */
                #define NVM_CFG1_GLOB_LANE0_AMP_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_AMP_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_AMP_MASK 0x0000FF00
@@ -320,10 +342,11 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_VENDOR_ID_MASK 0x0000FFFF
                #define NVM_CFG1_GLOB_VENDOR_ID_OFFSET 0
        /*  Set caution temperature */
-#define NVM_CFG1_GLOB_CAUTION_THRESHOLD_TEMPERATURE_MASK        0x00FF0000
-               #define NVM_CFG1_GLOB_CAUTION_THRESHOLD_TEMPERATURE_OFFSET 16
+               #define NVM_CFG1_GLOB_DEAD_TEMP_TH_TEMPERATURE_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_DEAD_TEMP_TH_TEMPERATURE_OFFSET 16
        /*  Set external thermal sensor I2C address */
-#define NVM_CFG1_GLOB_EXTERNAL_THERMAL_SENSOR_ADDRESS_MASK      0xFF000000
+               #define NVM_CFG1_GLOB_EXTERNAL_THERMAL_SENSOR_ADDRESS_MASK \
+                       0xFF000000
                #define NVM_CFG1_GLOB_EXTERNAL_THERMAL_SENSOR_ADDRESS_OFFSET 24
        u32 pci_subsys_id; /* 0x54 */
                #define NVM_CFG1_GLOB_SUBSYSTEM_VENDOR_ID_MASK 0x0000FFFF
@@ -349,6 +372,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_EXPANSION_ROM_SIZE_8M 0xD
                #define NVM_CFG1_GLOB_EXPANSION_ROM_SIZE_16M 0xE
                #define NVM_CFG1_GLOB_EXPANSION_ROM_SIZE_32M 0xF
+       /*  BB VF BAR2 size */
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_MASK 0x000000F0
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_OFFSET 4
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_DISABLED 0x0
@@ -367,6 +391,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_16M 0xD
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_32M 0xE
                #define NVM_CFG1_GLOB_VF_PCI_BAR2_SIZE_64M 0xF
+       /*  BB BAR2 size (global) */
                #define NVM_CFG1_GLOB_BAR2_SIZE_MASK 0x00000F00
                #define NVM_CFG1_GLOB_BAR2_SIZE_OFFSET 8
                #define NVM_CFG1_GLOB_BAR2_SIZE_DISABLED 0x0
@@ -385,12 +410,34 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_BAR2_SIZE_256M 0xD
                #define NVM_CFG1_GLOB_BAR2_SIZE_512M 0xE
                #define NVM_CFG1_GLOB_BAR2_SIZE_1G 0xF
-       /* Set the duration, in seconds, fan failure signal should be
-        * sampled
-        */
+       /*  Set the duration, in secs, fan failure signal should be sampled */
                #define NVM_CFG1_GLOB_FAN_FAILURE_DURATION_MASK 0x0000F000
                #define NVM_CFG1_GLOB_FAN_FAILURE_DURATION_OFFSET 12
-       u32 eagle_txfir_main;   /* 0x5C */
+       /*  This field defines the board total budget  for bar2 when disabled
+        * the regular bar size is used.
+        */
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_OFFSET 16
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_DISABLED 0x0
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_64K 0x1
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_128K 0x2
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_256K 0x3
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_512K 0x4
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_1M 0x5
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_2M 0x6
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_4M 0x7
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_8M 0x8
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_16M 0x9
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_32M 0xA
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_64M 0xB
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_128M 0xC
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_256M 0xD
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_512M 0xE
+               #define NVM_CFG1_GLOB_BAR2_TOTAL_BUDGET_1G 0xF
+       /*  Enable/Disable Crash dump triggers */
+               #define NVM_CFG1_GLOB_CRASH_DUMP_TRIGGER_ENABLE_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_CRASH_DUMP_TRIGGER_ENABLE_OFFSET 24
+       u32 mps10_txfir_main; /* 0x5C */
                #define NVM_CFG1_GLOB_LANE0_TXFIR_MAIN_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_TXFIR_MAIN_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_TXFIR_MAIN_MASK 0x0000FF00
@@ -399,7 +446,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_TXFIR_MAIN_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_TXFIR_MAIN_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_TXFIR_MAIN_OFFSET 24
-       u32 eagle_txfir_post;   /* 0x60 */
+       u32 mps10_txfir_post; /* 0x60 */
                #define NVM_CFG1_GLOB_LANE0_TXFIR_POST_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_TXFIR_POST_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_TXFIR_POST_MASK 0x0000FF00
@@ -408,7 +455,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_TXFIR_POST_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_TXFIR_POST_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_TXFIR_POST_OFFSET 24
-       u32 falcon_txfir_main;  /* 0x64 */
+       u32 mps25_txfir_main; /* 0x64 */
                #define NVM_CFG1_GLOB_LANE0_TXFIR_MAIN_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_TXFIR_MAIN_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_TXFIR_MAIN_MASK 0x0000FF00
@@ -417,7 +464,7 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LANE2_TXFIR_MAIN_OFFSET 16
                #define NVM_CFG1_GLOB_LANE3_TXFIR_MAIN_MASK 0xFF000000
                #define NVM_CFG1_GLOB_LANE3_TXFIR_MAIN_OFFSET 24
-       u32 falcon_txfir_post;  /* 0x68 */
+       u32 mps25_txfir_post; /* 0x68 */
                #define NVM_CFG1_GLOB_LANE0_TXFIR_POST_MASK 0x000000FF
                #define NVM_CFG1_GLOB_LANE0_TXFIR_POST_OFFSET 0
                #define NVM_CFG1_GLOB_LANE1_TXFIR_POST_MASK 0x0000FF00
@@ -437,6 +484,15 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_MANUF3_VER_OFFSET 18
                #define NVM_CFG1_GLOB_MANUF4_VER_MASK 0x3F000000
                #define NVM_CFG1_GLOB_MANUF4_VER_OFFSET 24
+       /*  Select package id method */
+               #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_IO_MASK 0x40000000
+               #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_IO_OFFSET 30
+               #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_IO_NVRAM 0x0
+               #define NVM_CFG1_GLOB_NCSI_PACKAGE_ID_IO_IO_PINS 0x1
+               #define NVM_CFG1_GLOB_RECOVERY_MODE_MASK 0x80000000
+               #define NVM_CFG1_GLOB_RECOVERY_MODE_OFFSET 31
+               #define NVM_CFG1_GLOB_RECOVERY_MODE_DISABLED 0x0
+               #define NVM_CFG1_GLOB_RECOVERY_MODE_ENABLED 0x1
        u32 manufacture_time; /* 0x70 */
                #define NVM_CFG1_GLOB_MANUF0_TIME_MASK 0x0000003F
                #define NVM_CFG1_GLOB_MANUF0_TIME_OFFSET 0
@@ -444,6 +500,18 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_MANUF1_TIME_OFFSET 6
                #define NVM_CFG1_GLOB_MANUF2_TIME_MASK 0x0003F000
                #define NVM_CFG1_GLOB_MANUF2_TIME_OFFSET 12
+       /*  Max MSIX for Ethernet in default mode */
+               #define NVM_CFG1_GLOB_MAX_MSIX_MASK 0x03FC0000
+               #define NVM_CFG1_GLOB_MAX_MSIX_OFFSET 18
+       /*  PF Mapping */
+               #define NVM_CFG1_GLOB_PF_MAPPING_MASK 0x0C000000
+               #define NVM_CFG1_GLOB_PF_MAPPING_OFFSET 26
+               #define NVM_CFG1_GLOB_PF_MAPPING_CONTINUOUS 0x0
+               #define NVM_CFG1_GLOB_PF_MAPPING_FIXED 0x1
+               #define NVM_CFG1_GLOB_VOLTAGE_REGULATOR_TYPE_MASK 0x30000000
+               #define NVM_CFG1_GLOB_VOLTAGE_REGULATOR_TYPE_OFFSET 28
+               #define NVM_CFG1_GLOB_VOLTAGE_REGULATOR_TYPE_DISABLED 0x0
+               #define NVM_CFG1_GLOB_VOLTAGE_REGULATOR_TYPE_TI 0x1
        u32 led_global_settings; /* 0x74 */
                #define NVM_CFG1_GLOB_LED_SWAP_0_MASK 0x0000000F
                #define NVM_CFG1_GLOB_LED_SWAP_0_OFFSET 0
@@ -453,9 +521,77 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_LED_SWAP_2_OFFSET 8
                #define NVM_CFG1_GLOB_LED_SWAP_3_MASK 0x0000F000
                #define NVM_CFG1_GLOB_LED_SWAP_3_OFFSET 12
+       /*  Max. continues operating temperature */
+               #define NVM_CFG1_GLOB_MAX_CONT_OPERATING_TEMP_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_MAX_CONT_OPERATING_TEMP_OFFSET 16
+       /*  GPIO which triggers run-time port swap according to the map
+        *  specified in option 205
+        */
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_OFFSET 24
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_RUNTIME_PORT_SWAP_GPIO_GPIO31 0x20
        u32 generic_cont1; /* 0x78 */
                #define NVM_CFG1_GLOB_AVS_DAC_CODE_MASK 0x000003FF
                #define NVM_CFG1_GLOB_AVS_DAC_CODE_OFFSET 0
+               #define NVM_CFG1_GLOB_LANE0_SWAP_MASK 0x00000C00
+               #define NVM_CFG1_GLOB_LANE0_SWAP_OFFSET 10
+               #define NVM_CFG1_GLOB_LANE1_SWAP_MASK 0x00003000
+               #define NVM_CFG1_GLOB_LANE1_SWAP_OFFSET 12
+               #define NVM_CFG1_GLOB_LANE2_SWAP_MASK 0x0000C000
+               #define NVM_CFG1_GLOB_LANE2_SWAP_OFFSET 14
+               #define NVM_CFG1_GLOB_LANE3_SWAP_MASK 0x00030000
+               #define NVM_CFG1_GLOB_LANE3_SWAP_OFFSET 16
+       /*  Enable option 195 - Overriding the PCIe Preset value */
+               #define NVM_CFG1_GLOB_OVERRIDE_PCIE_PRESET_EQUAL_MASK 0x00040000
+               #define NVM_CFG1_GLOB_OVERRIDE_PCIE_PRESET_EQUAL_OFFSET 18
+               #define NVM_CFG1_GLOB_OVERRIDE_PCIE_PRESET_EQUAL_DISABLED 0x0
+               #define NVM_CFG1_GLOB_OVERRIDE_PCIE_PRESET_EQUAL_ENABLED 0x1
+       /*  PCIe Preset value - applies only if option 194 is enabled */
+               #define NVM_CFG1_GLOB_PCIE_PRESET_VALUE_MASK 0x00780000
+               #define NVM_CFG1_GLOB_PCIE_PRESET_VALUE_OFFSET 19
+       /*  Port mapping to be used when the run-time GPIO for port-swap is
+        *  defined and set.
+        */
+               #define NVM_CFG1_GLOB_RUNTIME_PORT0_SWAP_MAP_MASK 0x01800000
+               #define NVM_CFG1_GLOB_RUNTIME_PORT0_SWAP_MAP_OFFSET 23
+               #define NVM_CFG1_GLOB_RUNTIME_PORT1_SWAP_MAP_MASK 0x06000000
+               #define NVM_CFG1_GLOB_RUNTIME_PORT1_SWAP_MAP_OFFSET 25
+               #define NVM_CFG1_GLOB_RUNTIME_PORT2_SWAP_MAP_MASK 0x18000000
+               #define NVM_CFG1_GLOB_RUNTIME_PORT2_SWAP_MAP_OFFSET 27
+               #define NVM_CFG1_GLOB_RUNTIME_PORT3_SWAP_MAP_MASK 0x60000000
+               #define NVM_CFG1_GLOB_RUNTIME_PORT3_SWAP_MAP_OFFSET 29
        u32 mbi_version; /* 0x7C */
                #define NVM_CFG1_GLOB_MBI_VERSION_0_MASK 0x000000FF
                #define NVM_CFG1_GLOB_MBI_VERSION_0_OFFSET 0
@@ -463,6 +599,44 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_MBI_VERSION_1_OFFSET 8
                #define NVM_CFG1_GLOB_MBI_VERSION_2_MASK 0x00FF0000
                #define NVM_CFG1_GLOB_MBI_VERSION_2_OFFSET 16
+       /*  If set to other than NA, 0 - Normal operation, 1 - Thermal event
+        *  occurred
+        */
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_OFFSET 24
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_THERMAL_EVENT_GPIO_GPIO31 0x20
        u32 mbi_date; /* 0x80 */
        u32 misc_sig; /* 0x84 */
        /*  Define the GPIO mapping to switch i2c mux */
@@ -503,8 +677,87 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_I2C_MUX_SEL_GPIO__GPIO29 0x1E
                #define NVM_CFG1_GLOB_I2C_MUX_SEL_GPIO__GPIO30 0x1F
                #define NVM_CFG1_GLOB_I2C_MUX_SEL_GPIO__GPIO31 0x20
+       /*  Interrupt signal used for SMBus/I2C management interface
+        *  0 = Interrupt event occurred
+        *  1 = Normal
+        */
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_OFFSET 16
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_I2C_INTERRUPT_GPIO_GPIO31 0x20
+       /*  Set aLOM FAN on GPIO */
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_OFFSET 24
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_GPIO_GPIO31 0x20
        u32 device_capabilities; /* 0x88 */
                #define NVM_CFG1_GLOB_DEVICE_CAPABILITIES_ETHERNET 0x1
+               #define NVM_CFG1_GLOB_DEVICE_CAPABILITIES_FCOE 0x2
+               #define NVM_CFG1_GLOB_DEVICE_CAPABILITIES_ISCSI 0x4
+               #define NVM_CFG1_GLOB_DEVICE_CAPABILITIES_ROCE 0x8
+               #define NVM_CFG1_GLOB_DEVICE_CAPABILITIES_IWARP 0x10
        u32 power_dissipated; /* 0x8C */
                #define NVM_CFG1_GLOB_POWER_DIS_D0_MASK 0x000000FF
                #define NVM_CFG1_GLOB_POWER_DIS_D0_OFFSET 0
@@ -524,11 +777,279 @@ struct nvm_cfg1_glob {
                #define NVM_CFG1_GLOB_POWER_CONS_D3_MASK 0xFF000000
                #define NVM_CFG1_GLOB_POWER_CONS_D3_OFFSET 24
        u32 efi_version; /* 0x94 */
-       u32 reserved[42];       /* 0x98 */
+       u32 multi_network_modes_capability; /* 0x98 */
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_4X10G 0x1
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_1X25G 0x2
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X25G 0x4
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_4X25G 0x8
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_1X40G 0x10
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X40G 0x20
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X50G 0x40
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_BB_1X100G \
+                       0x80
+               #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X10G 0x100
+       /* @DPDK */
+       u32 reserved1[12]; /* 0x9C */
+       u32 oem1_number[8]; /* 0xCC */
+       u32 oem2_number[8]; /* 0xEC */
+       u32 mps25_active_txfir_pre; /* 0x10C */
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_PRE_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_PRE_OFFSET 0
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_PRE_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_PRE_OFFSET 8
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_PRE_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_PRE_OFFSET 16
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_PRE_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_PRE_OFFSET 24
+       u32 mps25_active_txfir_main; /* 0x110 */
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_MAIN_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_MAIN_OFFSET 0
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_MAIN_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_MAIN_OFFSET 8
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_MAIN_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_MAIN_OFFSET 16
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_MAIN_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_MAIN_OFFSET 24
+       u32 mps25_active_txfir_post; /* 0x114 */
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_POST_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_LANE0_ACT_TXFIR_POST_OFFSET 0
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_POST_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_LANE1_ACT_TXFIR_POST_OFFSET 8
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_POST_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_LANE2_ACT_TXFIR_POST_OFFSET 16
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_POST_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_LANE3_ACT_TXFIR_POST_OFFSET 24
+       u32 features; /* 0x118 */
+       /*  Set the Aux Fan on temperature  */
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_VALUE_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_ALOM_FAN_ON_AUX_VALUE_OFFSET 0
+       /*  Set NC-SI package ID */
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_OFFSET 8
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_SLOT_ID_GPIO_GPIO31 0x20
+       /*  PMBUS Clock GPIO */
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_OFFSET 16
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_PMBUS_SCL_GPIO_GPIO31 0x20
+       /*  PMBUS Data GPIO */
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_OFFSET 24
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_PMBUS_SDA_GPIO_GPIO31 0x20
+       u32 tx_rx_eq_25g_hlpc; /* 0x11C */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_HLPC_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_HLPC_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_HLPC_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_HLPC_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_HLPC_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_HLPC_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_HLPC_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_HLPC_OFFSET 24
+       u32 tx_rx_eq_25g_llpc; /* 0x120 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_LLPC_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_LLPC_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_LLPC_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_LLPC_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_LLPC_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_LLPC_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_LLPC_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_LLPC_OFFSET 24
+       u32 tx_rx_eq_25g_ac; /* 0x124 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_AC_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_AC_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_AC_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_AC_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_AC_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_AC_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_AC_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_AC_OFFSET 24
+       u32 tx_rx_eq_10g_pc; /* 0x128 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_PC_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_PC_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_PC_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_PC_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_PC_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_PC_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_PC_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_PC_OFFSET 24
+       u32 tx_rx_eq_10g_ac; /* 0x12C */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_AC_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_AC_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_AC_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_AC_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_AC_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_AC_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_AC_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_AC_OFFSET 24
+       u32 tx_rx_eq_1g; /* 0x130 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_1G_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_1G_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_1G_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_1G_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_1G_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_1G_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_1G_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_1G_OFFSET 24
+       u32 tx_rx_eq_25g_bt; /* 0x134 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_BT_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_25G_BT_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_BT_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_25G_BT_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_BT_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_25G_BT_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_BT_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_25G_BT_OFFSET 24
+       u32 tx_rx_eq_10g_bt; /* 0x138 */
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_BT_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_INDEX0_RX_TX_EQ_10G_BT_OFFSET 0
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_BT_MASK 0x0000FF00
+               #define NVM_CFG1_GLOB_INDEX1_RX_TX_EQ_10G_BT_OFFSET 8
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_BT_MASK 0x00FF0000
+               #define NVM_CFG1_GLOB_INDEX2_RX_TX_EQ_10G_BT_OFFSET 16
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_BT_MASK 0xFF000000
+               #define NVM_CFG1_GLOB_INDEX3_RX_TX_EQ_10G_BT_OFFSET 24
+       u32 generic_cont4; /* 0x13C */
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_MASK 0x000000FF
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_OFFSET 0
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_NA 0x0
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO0 0x1
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO1 0x2
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO2 0x3
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO3 0x4
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO4 0x5
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO5 0x6
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO6 0x7
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO7 0x8
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO8 0x9
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO9 0xA
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO10 0xB
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO11 0xC
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO12 0xD
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO13 0xE
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO14 0xF
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO15 0x10
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO16 0x11
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO17 0x12
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO18 0x13
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO19 0x14
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO20 0x15
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO21 0x16
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO22 0x17
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO23 0x18
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO24 0x19
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO25 0x1A
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO26 0x1B
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO27 0x1C
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO28 0x1D
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO29 0x1E
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO30 0x1F
+               #define NVM_CFG1_GLOB_THERMAL_ALARM_GPIO_GPIO31 0x20
+       u32 preboot_debug_mode_std; /* 0x140 */
+       u32 preboot_debug_mode_ext; /* 0x144 */
+       u32 ext_phy_cfg1; /* 0x148 */
+       /*  Ext PHY MDI pair swap value */
+               #define NVM_CFG1_GLOB_EXT_PHY_MDI_PAIR_SWAP_MASK 0x0000FFFF
+               #define NVM_CFG1_GLOB_EXT_PHY_MDI_PAIR_SWAP_OFFSET 0
+       u32 reserved[55]; /* 0x14C */
 };
 
 struct nvm_cfg1_path {
-       u32 reserved[30]; /* 0x0 */
+       u32 reserved[1]; /* 0x0 */
 };
 
 struct nvm_cfg1_port {
@@ -553,6 +1074,9 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_LED_MODE_PHY10 0xD
                #define NVM_CFG1_PORT_LED_MODE_PHY11 0xE
                #define NVM_CFG1_PORT_LED_MODE_PHY12 0xF
+               #define NVM_CFG1_PORT_LED_MODE_BREAKOUT 0x10
+               #define NVM_CFG1_PORT_ROCE_PRIORITY_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_ROCE_PRIORITY_OFFSET 8
                #define NVM_CFG1_PORT_DCBX_MODE_MASK 0x000F0000
                #define NVM_CFG1_PORT_DCBX_MODE_OFFSET 16
                #define NVM_CFG1_PORT_DCBX_MODE_DISABLED 0x0
@@ -562,6 +1086,46 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_MASK 0x00F00000
                #define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_OFFSET 20
                #define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_ETHERNET 0x1
+               #define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_FCOE 0x2
+               #define NVM_CFG1_PORT_DEFAULT_ENABLED_PROTOCOLS_ISCSI 0x4
+       /* GPIO for HW reset the PHY. In case it is the same for all ports,
+        * need to set same value for all ports
+        */
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_MASK 0xFF000000
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_OFFSET 24
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_NA 0x0
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO0 0x1
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO1 0x2
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO2 0x3
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO3 0x4
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO4 0x5
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO5 0x6
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO6 0x7
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO7 0x8
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO8 0x9
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO9 0xA
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO10 0xB
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO11 0xC
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO12 0xD
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO13 0xE
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO14 0xF
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO15 0x10
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO16 0x11
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO17 0x12
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO18 0x13
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO19 0x14
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO20 0x15
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO21 0x16
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO22 0x17
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO23 0x18
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO24 0x19
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO25 0x1A
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO26 0x1B
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO27 0x1C
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO28 0x1D
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO29 0x1E
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO30 0x1F
+               #define NVM_CFG1_PORT_EXT_PHY_RESET_GPIO31 0x20
        u32 pcie_cfg; /* 0xC */
                #define NVM_CFG1_PORT_RESERVED15_MASK 0x00000007
                #define NVM_CFG1_PORT_RESERVED15_OFFSET 0
@@ -579,29 +1143,31 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_OFFSET 0
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G 0x1
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_20G 0x4
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_25G 0x8
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_40G 0x10
                #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_50G 0x20
-#define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_100G            0x40
+               #define NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_BB_100G 0x40
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_MASK 0xFFFF0000
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_OFFSET 16
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_1G 0x1
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_20G 0x4
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_25G 0x8
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_40G 0x10
                #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_50G 0x20
-#define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_100G            0x40
+               #define NVM_CFG1_PORT_MFW_SPEED_CAPABILITY_MASK_BB_100G 0x40
        u32 link_settings; /* 0x18 */
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_MASK 0x0000000F
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_OFFSET 0
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_AUTONEG 0x0
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_1G 0x1
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_DRV_LINK_SPEED_20G 0x3
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_25G 0x4
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_40G 0x5
                #define NVM_CFG1_PORT_DRV_LINK_SPEED_50G 0x6
-#define NVM_CFG1_PORT_DRV_LINK_SPEED_100G                       0x7
-               #define NVM_CFG1_PORT_DRV_LINK_SPEED_SMARTLINQ 0x8
+               #define NVM_CFG1_PORT_DRV_LINK_SPEED_BB_100G 0x7
                #define NVM_CFG1_PORT_DRV_FLOW_CONTROL_MASK 0x00000070
                #define NVM_CFG1_PORT_DRV_FLOW_CONTROL_OFFSET 4
                #define NVM_CFG1_PORT_DRV_FLOW_CONTROL_AUTONEG 0x1
@@ -612,29 +1178,50 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_AUTONEG 0x0
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_1G 0x1
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MFW_LINK_SPEED_20G 0x3
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_25G 0x4
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_40G 0x5
                #define NVM_CFG1_PORT_MFW_LINK_SPEED_50G 0x6
-#define NVM_CFG1_PORT_MFW_LINK_SPEED_100G                       0x7
-               #define NVM_CFG1_PORT_MFW_LINK_SPEED_SMARTLINQ 0x8
+               #define NVM_CFG1_PORT_MFW_LINK_SPEED_BB_100G 0x7
                #define NVM_CFG1_PORT_MFW_FLOW_CONTROL_MASK 0x00003800
                #define NVM_CFG1_PORT_MFW_FLOW_CONTROL_OFFSET 11
                #define NVM_CFG1_PORT_MFW_FLOW_CONTROL_AUTONEG 0x1
                #define NVM_CFG1_PORT_MFW_FLOW_CONTROL_RX 0x2
                #define NVM_CFG1_PORT_MFW_FLOW_CONTROL_TX 0x4
-#define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_MASK      0x00004000
+               #define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_MASK \
+                       0x00004000
                #define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_OFFSET 14
-#define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_DISABLED  0x0
-#define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_ENABLED   0x1
+               #define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_DISABLED \
+                       0x0
+               #define NVM_CFG1_PORT_OPTIC_MODULE_VENDOR_ENFORCEMENT_ENABLED \
+                       0x1
                #define NVM_CFG1_PORT_AN_25G_50G_OUI_MASK 0x00018000
                #define NVM_CFG1_PORT_AN_25G_50G_OUI_OFFSET 15
                #define NVM_CFG1_PORT_AN_25G_50G_OUI_CONSORTIUM 0x0
                #define NVM_CFG1_PORT_AN_25G_50G_OUI_BAM 0x1
                #define NVM_CFG1_PORT_FEC_FORCE_MODE_MASK 0x000E0000
                #define NVM_CFG1_PORT_FEC_FORCE_MODE_OFFSET 17
-#define NVM_CFG1_PORT_FEC_FORCE_MODE_FEC_FORCE_NONE             0x0
-#define NVM_CFG1_PORT_FEC_FORCE_MODE_FEC_FORCE_FIRECODE         0x1
-#define NVM_CFG1_PORT_FEC_FORCE_MODE_FEC_FORCE_RS               0x2
+               #define NVM_CFG1_PORT_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_FEC_FORCE_MODE_AUTO 0x7
+               #define NVM_CFG1_PORT_FEC_AN_MODE_MASK 0x00700000
+               #define NVM_CFG1_PORT_FEC_AN_MODE_OFFSET 20
+               #define NVM_CFG1_PORT_FEC_AN_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_FEC_AN_MODE_10G_FIRECODE 0x1
+               #define NVM_CFG1_PORT_FEC_AN_MODE_25G_FIRECODE 0x2
+               #define NVM_CFG1_PORT_FEC_AN_MODE_10G_AND_25G_FIRECODE 0x3
+               #define NVM_CFG1_PORT_FEC_AN_MODE_25G_RS 0x4
+               #define NVM_CFG1_PORT_FEC_AN_MODE_25G_FIRECODE_AND_RS 0x5
+               #define NVM_CFG1_PORT_FEC_AN_MODE_ALL 0x6
+               #define NVM_CFG1_PORT_SMARTLINQ_MODE_MASK 0x00800000
+               #define NVM_CFG1_PORT_SMARTLINQ_MODE_OFFSET 23
+               #define NVM_CFG1_PORT_SMARTLINQ_MODE_DISABLED 0x0
+               #define NVM_CFG1_PORT_SMARTLINQ_MODE_ENABLED 0x1
+               #define NVM_CFG1_PORT_RESERVED_WAS_MFW_SMARTLINQ_MASK 0x01000000
+               #define NVM_CFG1_PORT_RESERVED_WAS_MFW_SMARTLINQ_OFFSET 24
+               #define NVM_CFG1_PORT_RESERVED_WAS_MFW_SMARTLINQ_DISABLED 0x0
+               #define NVM_CFG1_PORT_RESERVED_WAS_MFW_SMARTLINQ_ENABLED 0x1
        u32 phy_cfg; /* 0x1C */
                #define NVM_CFG1_PORT_OPTIONAL_LINK_MODES_MASK 0x0000FFFF
                #define NVM_CFG1_PORT_OPTIONAL_LINK_MODES_OFFSET 0
@@ -664,9 +1251,9 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_AN_MODE_CL73 0x1
                #define NVM_CFG1_PORT_AN_MODE_CL37 0x2
                #define NVM_CFG1_PORT_AN_MODE_CL73_BAM 0x3
-#define NVM_CFG1_PORT_AN_MODE_CL37_BAM                          0x4
-#define NVM_CFG1_PORT_AN_MODE_HPAM                              0x5
-#define NVM_CFG1_PORT_AN_MODE_SGMII                             0x6
+               #define NVM_CFG1_PORT_AN_MODE_BB_CL37_BAM 0x4
+               #define NVM_CFG1_PORT_AN_MODE_BB_HPAM 0x5
+               #define NVM_CFG1_PORT_AN_MODE_BB_SGMII 0x6
        u32 mgmt_traffic; /* 0x20 */
                #define NVM_CFG1_PORT_RESERVED61_MASK 0x0000000F
                #define NVM_CFG1_PORT_RESERVED61_OFFSET 0
@@ -674,9 +1261,17 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_MASK 0x000000FF
                #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_OFFSET 0
                #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_NONE 0x0
-               #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_BCM84844 0x1
+               #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_BCM8485X 0x1
+               #define NVM_CFG1_PORT_EXTERNAL_PHY_TYPE_BCM5422X 0x2
                #define NVM_CFG1_PORT_EXTERNAL_PHY_ADDRESS_MASK 0x0000FF00
                #define NVM_CFG1_PORT_EXTERNAL_PHY_ADDRESS_OFFSET 8
+       /*  EEE power saving mode */
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_MASK 0x00FF0000
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_OFFSET 16
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_DISABLED 0x0
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_BALANCED 0x1
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_AGGRESSIVE 0x2
+               #define NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_LOW_LATENCY 0x3
        u32 mba_cfg1; /* 0x28 */
                #define NVM_CFG1_PORT_PREBOOT_OPROM_MASK 0x00000001
                #define NVM_CFG1_PORT_PREBOOT_OPROM_OFFSET 0
@@ -701,18 +1296,27 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_AUTONEG 0x0
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_1G 0x1
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_20G 0x3
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_25G 0x4
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_40G 0x5
                #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_50G 0x6
-#define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_100G                   0x7
-               #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_SMARTLINQ 0x8
-#define NVM_CFG1_PORT_RESERVED__M_MBA_BOOT_RETRY_COUNT_MASK     0x00E00000
+               #define NVM_CFG1_PORT_PREBOOT_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_RESERVED__M_MBA_BOOT_RETRY_COUNT_MASK \
+                       0x00E00000
                #define NVM_CFG1_PORT_RESERVED__M_MBA_BOOT_RETRY_COUNT_OFFSET 21
+               #define NVM_CFG1_PORT_RESERVED_WAS_PREBOOT_SMARTLINQ_MASK \
+                       0x01000000
+               #define NVM_CFG1_PORT_RESERVED_WAS_PREBOOT_SMARTLINQ_OFFSET 24
+               #define NVM_CFG1_PORT_RESERVED_WAS_PREBOOT_SMARTLINQ_DISABLED \
+                       0x0
+               #define NVM_CFG1_PORT_RESERVED_WAS_PREBOOT_SMARTLINQ_ENABLED 0x1
        u32 mba_cfg2; /* 0x2C */
                #define NVM_CFG1_PORT_RESERVED65_MASK 0x0000FFFF
                #define NVM_CFG1_PORT_RESERVED65_OFFSET 0
                #define NVM_CFG1_PORT_RESERVED66_MASK 0x00010000
                #define NVM_CFG1_PORT_RESERVED66_OFFSET 16
+               #define NVM_CFG1_PORT_PREBOOT_LINK_UP_DELAY_MASK 0x01FE0000
+               #define NVM_CFG1_PORT_PREBOOT_LINK_UP_DELAY_OFFSET 17
        u32 vf_cfg; /* 0x30 */
                #define NVM_CFG1_PORT_RESERVED8_MASK 0x0000FFFF
                #define NVM_CFG1_PORT_RESERVED8_OFFSET 0
@@ -728,10 +1332,13 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_LANE_LED_SPD_2_SEL_OFFSET 16
                #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_1G 0x1
                #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_10G 0x2
-               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_25G 0x8
-               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_40G 0x10
-               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_50G 0x20
-#define NVM_CFG1_PORT_LANE_LED_SPD__SEL_100G                    0x40
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_AH_25G 0x4
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_BB_25G 0x8
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_AH_40G 0x8
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_BB_40G 0x10
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_AH_50G 0x10
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_BB_50G 0x20
+               #define NVM_CFG1_PORT_LANE_LED_SPD__SEL_BB_100G 0x40
        u32 transceiver_00; /* 0x40 */
        /*  Define for mapping of transceiver signal module absent */
                #define NVM_CFG1_PORT_TRANS_MODULE_ABS_MASK 0x000000FF
@@ -777,6 +1384,10 @@ struct nvm_cfg1_port {
        u32 device_ids; /* 0x44 */
                #define NVM_CFG1_PORT_ETH_DID_SUFFIX_MASK 0x000000FF
                #define NVM_CFG1_PORT_ETH_DID_SUFFIX_OFFSET 0
+               #define NVM_CFG1_PORT_FCOE_DID_SUFFIX_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_FCOE_DID_SUFFIX_OFFSET 8
+               #define NVM_CFG1_PORT_ISCSI_DID_SUFFIX_MASK 0x00FF0000
+               #define NVM_CFG1_PORT_ISCSI_DID_SUFFIX_OFFSET 16
                #define NVM_CFG1_PORT_RESERVED_DID_SUFFIX_MASK 0xFF000000
                #define NVM_CFG1_PORT_RESERVED_DID_SUFFIX_OFFSET 24
        u32 board_cfg; /* 0x48 */
@@ -826,7 +1437,412 @@ struct nvm_cfg1_port {
                #define NVM_CFG1_PORT_TX_DISABLE_GPIO29 0x1E
                #define NVM_CFG1_PORT_TX_DISABLE_GPIO30 0x1F
                #define NVM_CFG1_PORT_TX_DISABLE_GPIO31 0x20
-       u32 reserved[131];      /* 0x4C */
+       u32 mnm_10g_cap; /* 0x4C */
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_MASK \
+                       0x0000FFFF
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_10G_DRV_SPEED_CAPABILITY_MASK_BB_100G 0x40
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_MASK \
+                       0xFFFF0000
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_OFFSET \
+                       16
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_10G_MFW_SPEED_CAPABILITY_MASK_BB_100G 0x40
+       u32 mnm_10g_ctrl; /* 0x50 */
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_MASK 0x0000000F
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_10G_DRV_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_MASK 0x000000F0
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_OFFSET 4
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_10G_MFW_LINK_SPEED_BB_100G 0x7
+       /*  This field defines the board technology
+        * (backpane,transceiver,external PHY)
+       */
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_OFFSET 8
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_UNDEFINED 0x0
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_MODULE 0x1
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_BACKPLANE 0x2
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_EXT_PHY 0x3
+               #define NVM_CFG1_PORT_MNM_10G_PORT_TYPE_MODULE_SLAVE 0x4
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_MASK \
+                       0x00FF0000
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_BYPASS 0x0
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_KR 0x2
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_KR2 0x3
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_KR4 0x4
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_XFI 0x8
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_SFI 0x9
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_1000X 0xB
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_SGMII 0xC
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_XLAUI 0x11
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_XLPPI 0x12
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_CAUI 0x21
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_CPPI 0x22
+               #define NVM_CFG1_PORT_MNM_10G_SERDES_NET_INTERFACE_25GAUI 0x31
+               #define NVM_CFG1_PORT_MNM_10G_ETH_DID_SUFFIX_MASK 0xFF000000
+               #define NVM_CFG1_PORT_MNM_10G_ETH_DID_SUFFIX_OFFSET 24
+       u32 mnm_10g_misc; /* 0x54 */
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_MASK 0x00000007
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_MNM_10G_FEC_FORCE_MODE_AUTO 0x7
+       u32 mnm_25g_cap; /* 0x58 */
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_MASK \
+                       0x0000FFFF
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_25G_DRV_SPEED_CAPABILITY_MASK_BB_100G 0x40
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_MASK \
+                       0xFFFF0000
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_OFFSET \
+                       16
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_25G_MFW_SPEED_CAPABILITY_MASK_BB_100G 0x40
+       u32 mnm_25g_ctrl; /* 0x5C */
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_MASK 0x0000000F
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_25G_DRV_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_MASK 0x000000F0
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_OFFSET 4
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_25G_MFW_LINK_SPEED_BB_100G 0x7
+       /*  This field defines the board technology
+        * (backpane,transceiver,external PHY)
+       */
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_OFFSET 8
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_UNDEFINED 0x0
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_MODULE 0x1
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_BACKPLANE 0x2
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_EXT_PHY 0x3
+               #define NVM_CFG1_PORT_MNM_25G_PORT_TYPE_MODULE_SLAVE 0x4
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_MASK \
+                       0x00FF0000
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_BYPASS 0x0
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_KR 0x2
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_KR2 0x3
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_KR4 0x4
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_XFI 0x8
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_SFI 0x9
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_1000X 0xB
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_SGMII 0xC
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_XLAUI 0x11
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_XLPPI 0x12
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_CAUI 0x21
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_CPPI 0x22
+               #define NVM_CFG1_PORT_MNM_25G_SERDES_NET_INTERFACE_25GAUI 0x31
+               #define NVM_CFG1_PORT_MNM_25G_ETH_DID_SUFFIX_MASK 0xFF000000
+               #define NVM_CFG1_PORT_MNM_25G_ETH_DID_SUFFIX_OFFSET 24
+       u32 mnm_25g_misc; /* 0x60 */
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_MASK 0x00000007
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_MNM_25G_FEC_FORCE_MODE_AUTO 0x7
+       u32 mnm_40g_cap; /* 0x64 */
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_MASK \
+                       0x0000FFFF
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_40G_DRV_SPEED_CAPABILITY_MASK_BB_100G 0x40
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_MASK \
+                       0xFFFF0000
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_OFFSET \
+                       16
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_40G_MFW_SPEED_CAPABILITY_MASK_BB_100G 0x40
+       u32 mnm_40g_ctrl; /* 0x68 */
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_MASK 0x0000000F
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_40G_DRV_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_MASK 0x000000F0
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_OFFSET 4
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_40G_MFW_LINK_SPEED_BB_100G 0x7
+       /*  This field defines the board technology
+        * (backpane,transceiver,external PHY)
+       */
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_OFFSET 8
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_UNDEFINED 0x0
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_MODULE 0x1
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_BACKPLANE 0x2
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_EXT_PHY 0x3
+               #define NVM_CFG1_PORT_MNM_40G_PORT_TYPE_MODULE_SLAVE 0x4
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_MASK \
+                       0x00FF0000
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_BYPASS 0x0
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_KR 0x2
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_KR2 0x3
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_KR4 0x4
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_XFI 0x8
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_SFI 0x9
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_1000X 0xB
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_SGMII 0xC
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_XLAUI 0x11
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_XLPPI 0x12
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_CAUI 0x21
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_CPPI 0x22
+               #define NVM_CFG1_PORT_MNM_40G_SERDES_NET_INTERFACE_25GAUI 0x31
+               #define NVM_CFG1_PORT_MNM_40G_ETH_DID_SUFFIX_MASK 0xFF000000
+               #define NVM_CFG1_PORT_MNM_40G_ETH_DID_SUFFIX_OFFSET 24
+       u32 mnm_40g_misc; /* 0x6C */
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_MASK 0x00000007
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_MNM_40G_FEC_FORCE_MODE_AUTO 0x7
+       u32 mnm_50g_cap; /* 0x70 */
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_MASK \
+                       0x0000FFFF
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_50G_DRV_SPEED_CAPABILITY_MASK_BB_100G \
+                       0x40
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_MASK \
+                       0xFFFF0000
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_OFFSET \
+                       16
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_50G 0x20
+               #define \
+                   NVM_CFG1_PORT_MNM_50G_MFW_SPEED_CAPABILITY_MASK_BB_100G \
+                       0x40
+       u32 mnm_50g_ctrl; /* 0x74 */
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_MASK 0x0000000F
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_50G_DRV_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_MASK 0x000000F0
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_OFFSET 4
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_50G_MFW_LINK_SPEED_BB_100G 0x7
+       /*  This field defines the board technology
+        * (backpane,transceiver,external PHY)
+       */
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_OFFSET 8
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_UNDEFINED 0x0
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_MODULE 0x1
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_BACKPLANE 0x2
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_EXT_PHY 0x3
+               #define NVM_CFG1_PORT_MNM_50G_PORT_TYPE_MODULE_SLAVE 0x4
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_MASK \
+                       0x00FF0000
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_BYPASS 0x0
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_KR 0x2
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_KR2 0x3
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_KR4 0x4
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_XFI 0x8
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_SFI 0x9
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_1000X 0xB
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_SGMII 0xC
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_XLAUI 0x11
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_XLPPI 0x12
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_CAUI 0x21
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_CPPI 0x22
+               #define NVM_CFG1_PORT_MNM_50G_SERDES_NET_INTERFACE_25GAUI 0x31
+               #define NVM_CFG1_PORT_MNM_50G_ETH_DID_SUFFIX_MASK 0xFF000000
+               #define NVM_CFG1_PORT_MNM_50G_ETH_DID_SUFFIX_OFFSET 24
+       u32 mnm_50g_misc; /* 0x78 */
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_MASK 0x00000007
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_MNM_50G_FEC_FORCE_MODE_AUTO 0x7
+       u32 mnm_100g_cap; /* 0x7C */
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_MASK \
+                       0x0000FFFF
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_50G 0x20
+               #define NVM_CFG1_PORT_MNM_100G_DRV_SPEED_CAP_MASK_BB_100G 0x40
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_MASK \
+                       0xFFFF0000
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_1G 0x1
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_10G 0x2
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_20G 0x4
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_25G 0x8
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_40G 0x10
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_50G 0x20
+               #define NVM_CFG1_PORT_MNM_100G_MFW_SPEED_CAP_MASK_BB_100G 0x40
+       u32 mnm_100g_ctrl; /* 0x80 */
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_MASK 0x0000000F
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_100G_DRV_LINK_SPEED_BB_100G 0x7
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_MASK 0x000000F0
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_OFFSET 4
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_AUTONEG 0x0
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_1G 0x1
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_10G 0x2
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_20G 0x3
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_25G 0x4
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_40G 0x5
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_50G 0x6
+               #define NVM_CFG1_PORT_MNM_100G_MFW_LINK_SPEED_BB_100G 0x7
+       /*  This field defines the board technology
+        * (backpane,transceiver,external PHY)
+       */
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_MASK 0x0000FF00
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_OFFSET 8
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_UNDEFINED 0x0
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_MODULE 0x1
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_BACKPLANE 0x2
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_EXT_PHY 0x3
+               #define NVM_CFG1_PORT_MNM_100G_PORT_TYPE_MODULE_SLAVE 0x4
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_MASK \
+                       0x00FF0000
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_OFFSET 16
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_BYPASS 0x0
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_KR 0x2
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_KR2 0x3
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_KR4 0x4
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_XFI 0x8
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_SFI 0x9
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_1000X 0xB
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_SGMII 0xC
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_XLAUI 0x11
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_XLPPI 0x12
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_CAUI 0x21
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_CPPI 0x22
+               #define NVM_CFG1_PORT_MNM_100G_SERDES_NET_INTERFACE_25GAUI 0x31
+               #define NVM_CFG1_PORT_MNM_100G_ETH_DID_SUFFIX_MASK 0xFF000000
+               #define NVM_CFG1_PORT_MNM_100G_ETH_DID_SUFFIX_OFFSET 24
+       u32 mnm_100g_misc; /* 0x84 */
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_MASK 0x00000007
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_OFFSET 0
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_NONE 0x0
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_FIRECODE 0x1
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_RS 0x2
+               #define NVM_CFG1_PORT_MNM_100G_FEC_FORCE_MODE_AUTO 0x7
+       u32 temperature; /* 0x88 */
+               #define NVM_CFG1_PORT_PHY_MODULE_DEAD_TEMP_TH_MASK 0x000000FF
+               #define NVM_CFG1_PORT_PHY_MODULE_DEAD_TEMP_TH_OFFSET 0
+               #define NVM_CFG1_PORT_PHY_MODULE_ALOM_FAN_ON_TEMP_TH_MASK \
+                       0x0000FF00
+               #define NVM_CFG1_PORT_PHY_MODULE_ALOM_FAN_ON_TEMP_TH_OFFSET 8
+       u32 reserved[115]; /* 0x8C */
 };
 
 struct nvm_cfg1_func {
@@ -850,12 +1866,17 @@ struct nvm_cfg1_func {
                #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_MASK 0x00000007
                #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_OFFSET 0
                #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_PXE 0x0
+               #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_ISCSI_BOOT 0x3
+               #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_FCOE_BOOT 0x4
                #define NVM_CFG1_FUNC_PREBOOT_BOOT_PROTOCOL_NONE 0x7
                #define NVM_CFG1_FUNC_VF_PCI_DEVICE_ID_MASK 0x0007FFF8
                #define NVM_CFG1_FUNC_VF_PCI_DEVICE_ID_OFFSET 3
                #define NVM_CFG1_FUNC_PERSONALITY_MASK 0x00780000
                #define NVM_CFG1_FUNC_PERSONALITY_OFFSET 19
                #define NVM_CFG1_FUNC_PERSONALITY_ETHERNET 0x0
+               #define NVM_CFG1_FUNC_PERSONALITY_ISCSI 0x1
+               #define NVM_CFG1_FUNC_PERSONALITY_FCOE 0x2
+               #define NVM_CFG1_FUNC_PERSONALITY_ROCE 0x3
                #define NVM_CFG1_FUNC_BANDWIDTH_WEIGHT_MASK 0x7F800000
                #define NVM_CFG1_FUNC_BANDWIDTH_WEIGHT_OFFSET 23
                #define NVM_CFG1_FUNC_PAUSE_ON_HOST_RING_MASK 0x80000000
@@ -865,8 +1886,25 @@ struct nvm_cfg1_func {
        u32 pci_cfg; /* 0x18 */
                #define NVM_CFG1_FUNC_NUMBER_OF_VFS_PER_PF_MASK 0x0000007F
                #define NVM_CFG1_FUNC_NUMBER_OF_VFS_PER_PF_OFFSET 0
-#define NVM_CFG1_FUNC_RESERVESD12_MASK                          0x00003F80
-#define NVM_CFG1_FUNC_RESERVESD12_OFFSET                        7
+       /*  AH VF BAR2 size */
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_MASK 0x00003F80
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_OFFSET 7
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_DISABLED 0x0
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_4K 0x1
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_8K 0x2
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_16K 0x3
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_32K 0x4
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_64K 0x5
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_128K 0x6
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_256K 0x7
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_512K 0x8
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_1M 0x9
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_2M 0xA
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_4M 0xB
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_8M 0xC
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_16M 0xD
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_32M 0xE
+               #define NVM_CFG1_FUNC_VF_PCI_BAR2_SIZE_64M 0xF
                #define NVM_CFG1_FUNC_BAR1_SIZE_MASK 0x0003C000
                #define NVM_CFG1_FUNC_BAR1_SIZE_OFFSET 14
                #define NVM_CFG1_FUNC_BAR1_SIZE_DISABLED 0x0
@@ -887,17 +1925,45 @@ struct nvm_cfg1_func {
                #define NVM_CFG1_FUNC_BAR1_SIZE_1G 0xF
                #define NVM_CFG1_FUNC_MAX_BANDWIDTH_MASK 0x03FC0000
                #define NVM_CFG1_FUNC_MAX_BANDWIDTH_OFFSET 18
+       /*  Hide function in npar mode */
+               #define NVM_CFG1_FUNC_FUNCTION_HIDE_MASK 0x04000000
+               #define NVM_CFG1_FUNC_FUNCTION_HIDE_OFFSET 26
+               #define NVM_CFG1_FUNC_FUNCTION_HIDE_DISABLED 0x0
+               #define NVM_CFG1_FUNC_FUNCTION_HIDE_ENABLED 0x1
+       /*  AH BAR2 size (per function) */
+               #define NVM_CFG1_FUNC_BAR2_SIZE_MASK 0x78000000
+               #define NVM_CFG1_FUNC_BAR2_SIZE_OFFSET 27
+               #define NVM_CFG1_FUNC_BAR2_SIZE_DISABLED 0x0
+               #define NVM_CFG1_FUNC_BAR2_SIZE_1M 0x5
+               #define NVM_CFG1_FUNC_BAR2_SIZE_2M 0x6
+               #define NVM_CFG1_FUNC_BAR2_SIZE_4M 0x7
+               #define NVM_CFG1_FUNC_BAR2_SIZE_8M 0x8
+               #define NVM_CFG1_FUNC_BAR2_SIZE_16M 0x9
+               #define NVM_CFG1_FUNC_BAR2_SIZE_32M 0xA
+               #define NVM_CFG1_FUNC_BAR2_SIZE_64M 0xB
+               #define NVM_CFG1_FUNC_BAR2_SIZE_128M 0xC
+               #define NVM_CFG1_FUNC_BAR2_SIZE_256M 0xD
+               #define NVM_CFG1_FUNC_BAR2_SIZE_512M 0xE
+               #define NVM_CFG1_FUNC_BAR2_SIZE_1G 0xF
+       struct nvm_cfg_mac_address fcoe_node_wwn_mac_addr; /* 0x1C */
+       struct nvm_cfg_mac_address fcoe_port_wwn_mac_addr; /* 0x24 */
        u32 preboot_generic_cfg; /* 0x2C */
                #define NVM_CFG1_FUNC_PREBOOT_VLAN_VALUE_MASK 0x0000FFFF
                #define NVM_CFG1_FUNC_PREBOOT_VLAN_VALUE_OFFSET 0
                #define NVM_CFG1_FUNC_PREBOOT_VLAN_MASK 0x00010000
                #define NVM_CFG1_FUNC_PREBOOT_VLAN_OFFSET 16
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_MASK 0x001E0000
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_OFFSET 17
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_ETHERNET 0x1
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_FCOE 0x2
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_ISCSI 0x4
+               #define NVM_CFG1_FUNC_NPAR_ENABLED_PROTOCOL_RDMA 0x8
        u32 reserved[8]; /* 0x30 */
 };
 
 struct nvm_cfg1 {
        struct nvm_cfg1_glob glob; /* 0x0 */
-       struct nvm_cfg1_path path[MCP_GLOB_PATH_MAX]; /* 0x140 */
+       struct nvm_cfg1_path path[MCP_GLOB_PATH_MAX]; /* 0x228 */
        struct nvm_cfg1_port port[MCP_GLOB_PORT_MAX]; /* 0x230 */
        struct nvm_cfg1_func func[MCP_GLOB_FUNC_MAX]; /* 0xB90 */
 };