Merge tag 'wireless-drivers-next-for-davem-2019-04-18' of git://git.kernel.org/pub...

[linux.git] / drivers / net / wireless / intel / iwlwifi / cfg / 22000.c

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index eb6defb6d0cd9b1e61e74c2d3e173c8a9d916da8..fc915ecfb06ebfefb4e4c24f0d5e3cbd157b06b7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -89,6 +89,7 @@
 #define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"
 #define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"
 #define IWL_22000_TY_A_GF_A_FW_PRE      "iwlwifi-ty-a0-gf-a0-"
+#define IWL_22000_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"
 
 #define IWL_22000_HR_MODULE_FIRMWARE(api) \
        IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -180,7 +181,11 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
        .dbgc_supported = true,                                         \
        .min_umac_error_event_table = 0x400000,                         \
        .d3_debug_data_base_addr = 0x401000,                            \
-       .d3_debug_data_length = 60 * 1024
+       .d3_debug_data_length = 60 * 1024,                              \
+       .fw_mon_smem_write_ptr_addr = 0xa0c16c,                         \
+       .fw_mon_smem_write_ptr_msk = 0xfffff,                           \
+       .fw_mon_smem_cycle_cnt_ptr_addr = 0xa0c174,                     \
+       .fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff
 
 #define IWL_DEVICE_AX200_COMMON                                                \
        IWL_DEVICE_22000_COMMON,                                        \
@@ -190,7 +195,8 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
        IWL_DEVICE_22000_COMMON,                                        \
        .device_family = IWL_DEVICE_FAMILY_22000,                       \
        .base_params = &iwl_22000_base_params,                          \
-       .csr = &iwl_csr_v1
+       .csr = &iwl_csr_v1,                                             \
+       .gp2_reg_addr = 0xa02c68
 
 #define IWL_DEVICE_22560                                               \
        IWL_DEVICE_22000_COMMON,                                        \
@@ -203,7 +209,9 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
        .device_family = IWL_DEVICE_FAMILY_AX210,                       \
        .base_params = &iwl_22000_base_params,                          \
        .csr = &iwl_csr_v1,                                             \
-       .min_txq_size = 128
+       .min_txq_size = 128,                                            \
+       .gp2_reg_addr = 0xd02c68,                                       \
+       .min_256_ba_txq_size = 512
 
 const struct iwl_cfg iwl22000_2ac_cfg_hr = {
        .name = "Intel(R) Dual Band Wireless AC 22000",
@@ -440,12 +448,20 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {
 const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = {
        .name = "Intel(R) Wi-Fi 7 AX211 160MHz",
        .fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,
+       .uhb_supported = true,
        IWL_DEVICE_AX210,
 };
 
 const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
        .name = "Intel(R) Wi-Fi 7 AX210 160MHz",
        .fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,
+       .uhb_supported = true,
+       IWL_DEVICE_AX210,
+};
+
+const struct iwl_cfg iwlax210_2ax_cfg_so_gf4_a0 = {
+       .name = "Intel(R) Wi-Fi 7 AX210 160MHz",
+       .fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,
        IWL_DEVICE_AX210,
 };