iwlwifi: define minimum valid address for umac_error_event_table in cfg

We now have two different minimum valid values for
umac_error_event_table.  To avoid hardcoding the minimum value in the
driver, add a value to cfg where it can be read from.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
index c2a5936ccede26dbbd10512a21ef5da162e4b2d7..1dce74afcd752bd9b3d9b67d1bc6fdacffa7555e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
@@ -165,7 +165,8 @@ static const struct iwl_tt_params iwl8000_tt_params = {
        .thermal_params = &iwl8000_tt_params,                           \
        .apmg_not_supported = true,                                     \
        .nvm_type = IWL_NVM_EXT,                                        \
-       .dbgc_supported = true
+       .dbgc_supported = true,                                         \
+       .min_umac_error_event_table = 0x800000
 
 #define IWL_DEVICE_8000                                                        \
        IWL_DEVICE_8000_COMMON,                                         \

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index e8b5ff42f5a8f3711d0d27bcf64790d895384368..af7c4f36b66f9fcd133105d4430009b3e97d8aa0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -149,7 +149,8 @@ static const struct iwl_tt_params iwl9000_tt_params = {
        .mac_addr_from_csr = true,                                      \
        .rf_id = true,                                                  \
        .nvm_type = IWL_NVM_EXT,                                        \
-       .dbgc_supported = true
+       .dbgc_supported = true,                                         \
+       .min_umac_error_event_table = 0x800000
 
 const struct iwl_cfg iwl9160_2ac_cfg = {
        .name = "Intel(R) Dual Band Wireless AC 9160",

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index c911d55fde490fd5c770e20086378b170443e456..ea82065151716ed5bc60ecc29208481f378e4ff9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@ -135,7 +135,8 @@ static const struct iwl_ht_params iwl_a000_ht_params = {
        .gen2 = true,                                                   \
        .nvm_type = IWL_NVM_EXT,                                        \
        .dbgc_supported = true,                                         \
-       .tx_cmd_queue_size = 32
+       .tx_cmd_queue_size = 32,                                        \
+       .min_umac_error_event_table = 0x400000
 
 const struct iwl_cfg iwla000_2ac_cfg_hr = {
        .name = "Intel(R) Dual Band Wireless AC a000",

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 0347a03b6f1b932ba1808d4e9360d2d4d47810bc..86a7960257503b1cf4c3d0dfa37b5ddb2f88a4dd 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -396,6 +396,7 @@ struct iwl_cfg {
        u8 max_vht_ampdu_exponent;
        u8 ucode_api_max;
        u8 ucode_api_min;
+       u32 min_umac_error_event_table;
 };
 
 /*

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 70d0505a176ee2d9bebc04d969d652b667cf15b2..0296df625cd56efc9f2929631089a2a2acbdda2c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -176,6 +176,7 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        struct iwl_lmac_alive *lmac1;
        struct iwl_lmac_alive *lmac2 = NULL;
        u16 status;
+       u32 umac_error_event_table;
 
        if (iwl_rx_packet_payload_len(pkt) == sizeof(*palive)) {
                palive = (void *)pkt->data;
@@ -198,18 +199,22 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        mvm->sf_space.addr = le32_to_cpu(lmac1->st_fwrd_addr);
        mvm->sf_space.size = le32_to_cpu(lmac1->st_fwrd_size);
 
-       mvm->umac_error_event_table = le32_to_cpu(umac->error_info_addr);
+       umac_error_event_table = le32_to_cpu(umac->error_info_addr);
 
-       if (mvm->umac_error_event_table <
-           (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_A000 ?
-            0x400000 : 0x800000))
+       if (!umac_error_event_table) {
+               mvm->support_umac_log = false;
+       } else if (umac_error_event_table >=
+                  mvm->trans->cfg->min_umac_error_event_table) {
+               mvm->support_umac_log = true;
+               mvm->umac_error_event_table = umac_error_event_table;
+       } else {
                IWL_ERR(mvm,
                        "Not valid error log pointer 0x%08X for %s uCode\n",
                        mvm->umac_error_event_table,
                        (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) ?
                        "Init" : "RT");
-       else
-               mvm->support_umac_log = true;
+               mvm->support_umac_log = false;
+       }
 
        alive_data->scd_base_addr = le32_to_cpu(lmac1->scd_base_ptr);
        alive_data->valid = status == IWL_ALIVE_STATUS_OK;