wifi: iwlwifi: stop checking the firmware's error pointer

It is not very clear what values we put in min_umac_error_event_table.
For Ma (Meteor Lake), this value is wrong and we get the print:
Not valid error log pointer ...

Just remove the check.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251019114304.a64d0803150f.Ie2db385f68e17fb0adcdcb16e5bf0125289e177d@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index ca488931a33c5e62624692d0f26e32aec1b0758c..f0453f3f6ba63a6e156619a0293045b9653438c0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_22000_base = {
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x380,
-       .min_umac_error_event_table = 0x400000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 60 * 1024,
        .mon_smem_regs = {

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
index b56574006ee0f0ab6564c974dee3cb681bb01322..3c844cd419e8913ebe98c598c1d407c2d7fcf1b1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
@@ -50,7 +50,6 @@ static const struct iwl_family_base_params iwl8000_base = {
        .smem_offset = IWL8260_SMEM_OFFSET,
        .smem_len = IWL8260_SMEM_LEN,
        .apmg_not_supported = true,
-       .min_umac_error_event_table = 0x800000,
 };
 
 static const struct iwl_tt_params iwl8000_tt_params = {

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index ac1fa291cf2f0376e28dc3f6c65d40974deb2212..5872fc9b8caf40674703f74efd7896f7ffe06c0d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl9000_base = {
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x380,
-       .min_umac_error_event_table = 0x800000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 92 * 1024,
        .nvm_hw_section_num = 10,

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index ddf3d313da5a60068ebf0ab7219da59b68b87a45..582f61661062e236c6bd8b57969a7e22e43bf028 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -33,7 +33,6 @@ static const struct iwl_family_base_params iwl_ax210_base = {
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x380,
-       .min_umac_error_event_table = 0x400000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 60 * 1024,
        .mon_smem_regs = {

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index 18c9244ee8efd31601c7e6584a0eef11a8def2ac..7babb60463bef110dbcdef0098f0fceb261a6f68 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_bz_base = {
        .smem_len = IWL_BZ_SMEM_LEN,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x30,
-       .min_umac_error_event_table = 0xD0000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 60 * 1024,
        .mon_smem_regs = {

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
index e53a785686c894156e9596b7c85f7a91627dbdb0..ad65951d5643ce5f5bd2d652db1c9cdd7209a830 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
@@ -33,7 +33,6 @@ static const struct iwl_family_base_params iwl_dr_base = {
        .smem_len = IWL_DR_SMEM_LEN,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x30,
-       .min_umac_error_event_table = 0xD0000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 60 * 1024,
        .mon_smem_regs = {

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index e9449b59114acb12556f45dbecb1ef490c94a67f..abb6283dfb8f434f979841ca2008420b7d560bd1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
@@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl_sc_base = {
        .smem_len = IWL_SC_SMEM_LEN,
        .apmg_not_supported = true,
        .mac_addr_from_csr = 0x30,
-       .min_umac_error_event_table = 0xD0000,
        .d3_debug_data_base_addr = 0x401000,
        .d3_debug_data_length = 60 * 1024,
        .mon_smem_regs = {

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 0b34c9f90b3ff548e67c30210b6c9ff74c1f4cc2..e44936204068f99275e2663a3e987e0f7d9250bd 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -170,7 +170,6 @@ struct iwl_fw_mon_regs {
  *     for aggregation
  * @min_txq_size: minimum number of slots required in a TX queue
  * @gp2_reg_addr: GP2 (timer) register address
- * @min_umac_error_event_table: minimum SMEM location of UMAC error table
  * @mon_dbgi_regs: monitor DBGI registers
  * @mon_dram_regs: monitor DRAM registers
  * @mon_smem_regs: monitor SMEM registers
@@ -203,7 +202,6 @@ struct iwl_family_base_params {
        netdev_features_t features;
        u32 smem_offset;
        u32 smem_len;
-       u32 min_umac_error_event_table;
        u32 d3_debug_data_base_addr;
        u32 d3_debug_data_length;
        u32 min_txq_size;

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/fw.c b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
index b3abfa1ec8102e3f8a114ab4e95db566e07643c3..19da521a4babc5385626e48ed8ae978cb9c8e2e6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
@@ -167,11 +167,7 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        umac_error_table = le32_to_cpu(umac->dbg_ptrs.error_info_addr) &
                ~FW_ADDR_CACHE_CONTROL;
 
-       if (umac_error_table >= trans->mac_cfg->base->min_umac_error_event_table)
-               iwl_fw_umac_set_alive_err_table(trans, umac_error_table);
-       else
-               IWL_ERR(mld, "Not valid error log pointer 0x%08X\n",
-                       umac_error_table);
+       iwl_fw_umac_set_alive_err_table(trans, umac_error_table);
 
        alive_data->valid = status == IWL_ALIVE_STATUS_OK;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 6b76ce35443d2040b8bd99fe6f1815de5de1d4d0..edae13755ee61fb08b58e7701515c092a382612e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -214,17 +214,8 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
                                                        ~FW_ADDR_CACHE_CONTROL;
 
        if (umac_error_table) {
-               if (umac_error_table >=
-                   mvm->trans->mac_cfg->base->min_umac_error_event_table) {
-                       iwl_fw_umac_set_alive_err_table(mvm->trans,
-                                                       umac_error_table);
-               } else {
-                       IWL_ERR(mvm,
-                               "Not valid error log pointer 0x%08X for %s uCode\n",
-                               umac_error_table,
-                               (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) ?
-                               "Init" : "RT");
-               }
+               iwl_fw_umac_set_alive_err_table(mvm->trans,
+                                               umac_error_table);
        }
 
        alive_data->valid = status == IWL_ALIVE_STATUS_OK;