iwlwifi: Decrease firmware monitor debug area from 4MB to 512k.
PATCH 1/6 iwlwifi: Decrease firmware monitor debug area from 4MB to 512k.
From: Ben Greear <[email protected]>
It appears the code can handle down to 2^11, so set max in this case to 2^19 to save mem.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +11 -2
@@ -223,8 +223,8 @@ static void iwl_pcie_alloc_fw_monitor_block(struct iwl_trans *trans,continue ;IWL_INFO (trans, -"Allocated 0x%08x bytes for firmware monitor.\n" , - size); +"Allocated 0x%08x bytes for firmware monitor, max_power: %d min_power: %d power: %d.\n" , + size, max_power, min_power, power);break ; }
@@ -244,6 +244,8 @@ static void iwl_pcie_alloc_fw_monitor_block(struct iwl_trans *trans,void iwl_pcie_alloc_fw_monitor (struct iwl_trans *trans,u8 max_power) { +pr_err ("iwl_pcie_alloc_fw_monitor, monitor size max_power requested: %d\n" , + max_power);if (!max_power) {/* default max_power is maximum */ max_power =26 ;
@@ -256,6 +258,13 @@ void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans, u8 max_power) max_power))return ; +/* Try to use less memory, there are other things in the system as well! */ +if (max_power >19 ) { +pr_err ("iwl_pcie_alloc_fw_monitor, decreasing max-power from %d to 19 to save memory.\n" , + max_power); + max_power =19 ; + } +if (trans->dbg.fw_mon.size)return ;
Signature · 1 line
2.20.1
PATCH 2/6 iwlwifi: Enable debug-overrides.
From: Ben Greear <[email protected]>
This is ported from the out-of-kernel backports iwlwifi driver. It provides some options to change the radio's behaviour based on a config file. This is most useful for testing purposes.
--- drivers/net/wireless/intel/iwlwifi/Kconfig | 5 + drivers/net/wireless/intel/iwlwifi/Makefile | 1 + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 + drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 + .../net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 381 ++++++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-dbg-cfg.h | 277 +++++++++++++ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 87 ++++ .../wireless/intel/iwlwifi/iwl-eeprom-parse.c | 7 + .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 203 ++++++++++ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 4 + .../net/wireless/intel/iwlwifi/iwl-trans.h | 10 + .../wireless/intel/iwlwifi/mvm/constants.h | 106 +++++ .../intel/iwlwifi/mvm/ftm-initiator.c | 58 +++ .../intel/iwlwifi/mvm/ftm-responder.c | 11 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 79 +++- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 26 ++ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 53 +++ .../net/wireless/intel/iwlwifi/mvm/power.c | 6 + .../net/wireless/intel/iwlwifi/mvm/rs-fw.c | 15 + .../wireless/intel/iwlwifi/pcie/internal.h | 6 + .../net/wireless/intel/iwlwifi/pcie/trans.c | 37 ++ 21 files changed, 1379 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h
drivers/net/wireless/intel/iwlwifi/Kconfig +5 -0
@@ -143,6 +143,11 @@ config IWLWIFI_DEVICE_TRACING If unsure, say Y so we can help you better when problems occur. + +config IWLWIFI_SUPPORT_DEBUG_OVERRIDES + depends on IWLWIFI + bool "enable default value override (for debugging)" + endmenu endif
drivers/net/wireless/intel/iwlwifi/Makefile +1 -0
@@ -20,6 +20,7 @@ iwlwifi-objs += fw/dbg.o fw/pnvm.o iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o iwlwifi-$(CONFIG_ACPI) += fw/acpi.o iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o +iwlwifi-$(CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES) += iwl-dbg-cfg.o iwlwifi-objs += $(iwlwifi-m)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +7 -0
@@ -2660,6 +2660,13 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx) goto out; } +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (fwrt->trans->dbg_cfg.disable_wrt_dump) { +IWL_DEBUG_FW_INFO (fwrt,"WRT: Data collection disabled\n" ); + goto out; + } +#endif +iwl_fw_dbg_stop_restart_recording (fwrt, ¶ms, true);IWL_DEBUG_FW_INFO (fwrt,"WRT: Data collection start\n" );
drivers/net/wireless/intel/iwlwifi/fw/file.h +1 -0
@@ -171,6 +171,7 @@ struct iwl_ucode_tlv {u8 data[0 ]; }; +#define IWL_TLV_FW_DBG_MAGIC 0xb5221389#define IWL_TLV_UCODE_MAGIC 0x0a4c5749#define FW_VER_HUMAN_READABLE_SZ 64
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c new file +381 -0
381 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h new file +277 -0
277 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +87 -0
153 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +7 -0
@@ -774,6 +774,13 @@ void iwl_init_ht_hw_capab(struct iwl_trans *trans, ht_info->ampdu_factor = cfg->max_ht_ampdu_exponent; ht_info->ampdu_density =IEEE80211_HT_MPDU_DENSITY_4 ; +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (trans->dbg_cfg.ampdu_exponent_p1) { + ht_info->ampdu_factor =min ((u16)(trans->dbg_cfg.ampdu_exponent_p1 -1 ), + (u16)(ht_info->ampdu_factor)); + } +#endif + ht_info->mcs.rx_mask[0 ] =0xFF ;if (rx_chains >=2 ) ht_info->mcs.rx_mask[1 ] =0xFF ;
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +203 -0
253 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-prph.h +4 -0
@@ -417,6 +417,10 @@ enum {/* device family 22000 WPROT register */ #define PREG_PRPH_WPROT_22000 0xA04D00 +#define SB_CFG_OVERRIDE_ADDR 0xA26C78 +#define SB_CFG_OVERRIDE_ENABLE 0x8000 +#define SB_CFG_BASE_OVERRIDE 0xA20000 +#define SB_MODIFY_CFG_FLAG 0xA03088#define SB_CPU_1_STATUS 0xA01E30#define SB_CPU_2_STATUS 0xA01E34#define UMAG_SB_CPU_1_STATUS 0xA038C0
drivers/net/wireless/intel/iwlwifi/iwl-trans.h +10 -0
@@ -74,6 +74,9 @@#include "fw/img.h" #include "iwl-op-mode.h" #include <linux/firmware.h> +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +#include "iwl-dbg-cfg.h" +#endif #include "fw/api/cmdhdr.h" #include "fw/api/txq.h" #include "fw/api/dbg-tlv.h"
@@ -113,7 +116,11 @@* 6) Eventually, the free function will be called. */ +#ifndef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES #define IWL_TRANS_FW_DBG_DOMAIN (trans) IWL_FW_INI_DOMAIN_ALWAYS_ON +#else +#define IWL_TRANS_FW_DBG_DOMAIN (trans) ((trans)->dbg_cfg.FW_DBG_DOMAIN) +#endif #define FH_RSCSR_FRAME_SIZE_MSK 0x00003FFF/* bits 0-13 */ #define FH_RSCSR_FRAME_INVALID 0x55550000
@@ -1027,6 +1034,9 @@ struct iwl_trans {struct lockdep_map sync_cmd_lockdep_map;#endif +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +struct iwl_dbg_cfg dbg_cfg; +#endif struct iwl_trans_debug dbg;struct iwl_self_init_dram init_dram;
drivers/net/wireless/intel/iwlwifi/mvm/constants.h +106 -0
129 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c +58 -0
100 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c +11 -0
@@ -154,6 +154,17 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,lockdep_assert_held (&mvm->mutex); +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES + cmd.cmd_valid_fields |=cpu_to_le32 (IWL_MVM_FTM_RESP_VALID ); + cmd.responder_cfg_flags |=cpu_to_le32 (IWL_MVM_FTM_RESP_FLAGS ); + +if (IWL_MVM_FTM_RESP_TOA_OFFSET ) { + cmd.cmd_valid_fields |= +cpu_to_le32 (IWL_TOF_RESPONDER_FLAGS_TOA_OFFSET_MODE ); + cmd.toa_offset =cpu_to_le16 (IWL_MVM_FTM_RESP_TOA_OFFSET ); + } +#endif +if (cmd_ver ==7 ) err =iwl_mvm_ftm_responder_set_bw_v2 (chandef, &cmd.format_bw, &cmd.ctrl_ch_position);
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +78 -1
93 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +26 -0
@@ -583,6 +583,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) num_mac = (mvm->nvm_data->n_hw_addrs >1 ) ?min (IWL_MVM_MAX_ADDRESSES , mvm->nvm_data->n_hw_addrs) :1 ; +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (mvm->trans->dbg_cfg.hw_address.len) + num_mac =IWL_MVM_MAX_ADDRESSES ; +#endif +for (i =1 ; i < num_mac; i++) {memcpy (mvm->addresses[i].addr, mvm->addresses[i-1 ].addr,ETH_ALEN );
@@ -2250,6 +2255,27 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, (vif->bss_conf.uora_ocw_range >>3 ) &0x7 ; } +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (mvm->trans->dbg_cfg.no_ack_en &0x2 ) + flags &= ~STA_CTXT_HE_ACK_ENABLED ; + +/* MU EDCA override */ +if (mvm->trans->dbg_cfg.mu_edca) { +u32 mu_edca = mvm->trans->dbg_cfg.mu_edca; + +for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { + sta_ctxt_cmd.trig_based_txf[i].aifsn = +cpu_to_le16 (mu_edca &0xf ); + sta_ctxt_cmd.trig_based_txf[i].cwmin = +cpu_to_le16 ((mu_edca >>4 ) &0xf ); + sta_ctxt_cmd.trig_based_txf[i].cwmax = +cpu_to_le16 ((mu_edca >>8 ) &0xf ); + sta_ctxt_cmd.trig_based_txf[i].mu_time = +cpu_to_le16 ((mu_edca >>12 ) &0xff ); + } + } +#endif +if (vif->bss_conf.nontransmitted) { flags |=STA_CTXT_HE_REF_BSSID_VALID ; ether_addr_copy(sta_ctxt_cmd.ref_bssid_addr,
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +53 -0
82 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/mvm/power.c +6 -0
@@ -193,6 +193,12 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm, return; }#endif +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (mvm->trans->dbg_cfg.MVM_USE_PS_POLL) { + cmd->flags |=cpu_to_le16 (POWER_FLAGS_ADVANCE_PM_ENA_MSK ); +return ; + } +#endif for (ac =IEEE80211_AC_VO ; ac <=IEEE80211_AC_BK ; ac++) {if (!mvmvif->queue_params[ac].uapsd)
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +15 -0
@@ -482,6 +482,21 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,#endif rs_fw_set_supp_rates (sta, sband, &cfg_cmd); +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +/* +* if AP disables mimo on 160bw +* (!cfg_cmd.ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_160]) +* and AP enables siso on 160 +* cfg_cmd.ht_rates[IWL_TLC_NSS_1][IWL_TLC_HT_BW_160] +* we disable mimo on 80bw cmd->ht_rates[1][0] +*/ +if (mvm->trans->dbg_cfg.tx_siso_80bw_like_160bw && + cfg_cmd.ht_rates[IWL_TLC_NSS_1 ][IWL_TLC_HT_BW_160 ] && + !cfg_cmd.ht_rates[IWL_TLC_NSS_2 ][IWL_TLC_HT_BW_160 ]) + cfg_cmd.ht_rates[IWL_TLC_NSS_2 ][IWL_TLC_HT_BW_NONE_160 ] =0 ; + +#endif +/* * since TLC offload works with one mode we can assume * that only vht/ht is used and also set it as station max amsdu
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +6 -0
@@ -783,6 +783,12 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans)if (trans_pcie->debug_rfkill ==1 )return true; +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +if (trans_pcie->debug_rfkill ==-1 && + trans->dbg_cfg.STARTUP_RFKILL) +return true; +#endif +return !(iwl_read32 (trans,CSR_GP_CNTRL ) &CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW ); }
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +37 -0
@@ -780,6 +780,39 @@ static int iwl_pcie_load_section(struct iwl_trans *trans, u8 section_num,return ret; } +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +static void iwl_pcie_override_secure_boot_cfg (struct iwl_trans *trans) +{ +u32 val; + +if (!trans->dbg_cfg.secure_boot_cfg) +return ; + +/* Verify AUX address space is not locked */ + val =iwl_read_prph (trans,PREG_AUX_BUS_WPROT_0 ); +if (val &BIT ((SB_CFG_OVERRIDE_ADDR -SB_CFG_BASE_OVERRIDE ) >>10 )) { +IWL_ERR (trans, +"AUX address space is locked for override, (AUX val=0x%x)\n" , + val); +return ; + } + +/* Modify secure boot cfg flags */ +iwl_write_prph (trans,SB_MODIFY_CFG_FLAG , + trans->dbg_cfg.secure_boot_cfg); + +/* take ownership on the AUX IF */ +iwl_set_bits_prph (trans,WFPM_CTRL_REG , +WFPM_AUX_CTL_AUX_IF_MAC_OWNER_MSK ); + +/* indicate secure boot cfg override */ +iwl_set_bits_prph (trans,SB_CFG_OVERRIDE_ADDR , +SB_CFG_OVERRIDE_ENABLE ); + +return ; +} +#endif + static int iwl_pcie_load_cpu_sections_8000(struct iwl_trans *trans, const struct fw_img *image, int cpu,
@@ -1050,6 +1083,10 @@ static int iwl_pcie_load_given_ucode_8000(struct iwl_trans *trans,if (iwl_pcie_dbg_on (trans))iwl_pcie_apply_destination (trans); +#ifdef CONFIG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES +iwl_pcie_override_secure_boot_cfg (trans); +#endif +IWL_DEBUG_POWER (trans,"Original WFPM value = 0x%08X\n" ,iwl_read_prph (trans,WFPM_GP2 ));
Signature · 1 line
2.20.1
PATCH 3/6 iwlwifi: Allow per-device fwcfg files.
In reply to [email protected]From: Ben Greear <[email protected]>
This allows one to set the NSS and some
other low-level features for ax200 radios.
--- drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +6 -2
@@ -246,12 +246,16 @@ void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg)const struct firmware *fw;char *data, *end, *pos;int err; +char fname[128 ];if (dbgcfg->loaded)return ; -/* TODO: maybe add a per-device file? */ - err =firmware_request_nowarn (&fw,"iwl-dbg-cfg.ini" , dev); +snprintf (fname,127 ,"iwl-dbg-cfg-%s.ini" ,dev_name (dev)); + fname[127 ] =0 ; + +/* TODO: maybe add a per-device file? Yes, did that. --Ben */ + err =firmware_request_nowarn (&fw, fname, dev);if (err)return ;
Signature · 1 line
2.20.1
PATCH 4/6 iwlwifi: Add BusName to debugfs
In reply to [email protected]From: Ben Greear <[email protected]>
This gives us an easier way to know the fwcfg
file that may be loaded per device.
--- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +2 -0
@@ -760,6 +760,8 @@ static ssize_t iwl_dbgfs_fw_ver_read(struct file *file, char __user *user_buf, mvm->fwrt.trans->name); pos +=scnprintf (pos, endpos - pos,"Bus: %s\n" , mvm->fwrt.dev->bus->name); + pos +=scnprintf (pos, endpos - pos,"BusName: %s\n" , +dev_name (mvm->fwrt.dev)); ret =simple_read_from_buffer (user_buf, count, ppos, buff, pos - buff);kfree (buff);
Signature · 1 line
2.20.1
PATCH 5/6 iwlwifi: Make warnings unique to aid debugging.
In reply to [email protected]From: Ben Greear <[email protected]>
So we can be certain what code is generating kernel error messages.
--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +2 -2
@@ -491,7 +491,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)/* Will also start the device */ ret =iwl_mvm_load_ucode_wait_alive (mvm,IWL_UCODE_REGULAR );if (ret) { -IWL_ERR (mvm,"Failed to start RT ucode: %d\n" , ret); +IWL_ERR (mvm,"run-mvm-ucode: Failed to start RT ucode: %d\n" , ret); goto error; } iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,
@@ -1455,7 +1455,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) ret =iwl_mvm_load_rt_fw (mvm);if (ret) { -IWL_ERR (mvm,"Failed to start RT ucode: %d\n" , ret); +IWL_ERR (mvm,"mvm-up: Failed to start RT ucode: %d\n" , ret);if (ret != -ERFKILL )iwl_fw_dbg_error_collect (&mvm->fwrt,FW_DBG_TRIGGER_DRIVER );
drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +1 -1
@@ -355,7 +355,7 @@ static int iwl_pcie_gen2_send_hcmd_sync(struct iwl_trans *trans, }if (test_bit (STATUS_FW_ERROR , &trans->status)) { -IWL_ERR (trans,"FW error in SYNC CMD %s\n" , cmd_str); +IWL_ERR (trans,"gen2: FW error in SYNC CMD %s\n" , cmd_str);dump_stack (); ret = -EIO ; goto cancel;
Signature · 1 line
2.20.1
PATCH 6/6 iwlwifi: Support configuring tx-agg limit.
In reply to [email protected]From: Ben Greear <[email protected]>
This should affect ampdu, I think...not sure it works as hoped.
--- drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +1 -1
@@ -86,7 +86,7 @@ enum iwl_amsdu_size {IWL_AMSDU_8K =2 ,IWL_AMSDU_12K =3 ,/* Add 2K at the end to avoid breaking current API */ - IWL_AMSDU_2K = 4, + IWL_AMSDU_2K = 4, /* ax200 blows up if you set it to this */ }; enum iwl_uapsd_disable {
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +5 -0
@@ -791,6 +791,11 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,case IWL_AMSDU_DEF : trans_cfg.rx_buf_size = rb_size_default;break ; +case IWL_AMSDU_2K : +/* ax200 blows up with this setting. */ +if (mvm->trans->trans_cfg->device_family >=IWL_DEVICE_FAMILY_AX210 ) + trans_cfg.rx_buf_size =IWL_AMSDU_2K ; +break ;case IWL_AMSDU_4K : trans_cfg.rx_buf_size =IWL_AMSDU_4K ;break ;
Signature · 1 line
2.20.1
Re: [PATCH 3/6] iwlwifi: Allow per-device fwcfg files.
In reply to [email protected]Hi Ben,
Quoted 20 lines · On Thu, Dec 31, 2020 at 11:17 AM <[email protected]> wrote:
From: Ben Greear <[email protected]>
This allows one to set the NSS and some
other low-level features for ax200 radios.Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +1
-0@@ -246,12 +246,16 @@ void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg)const struct firmware *fw;char *data, *end, *pos;int err; +char fname[128 ];
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg) · line 257
Quoted 10 lines
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +4
-2if (dbgcfg->loaded)return ; -/* TODO: maybe add a per-device file? */ - err =firmware_request_nowarn (&fw,"iwl-dbg-cfg.ini" , dev); +snprintf (fname,127 ,"iwl-dbg-cfg-%s.ini" ,dev_name (dev)); + fname[127 ] =0 ; + +/* TODO: maybe add a per-device file? Yes, did that. --Ben */
You probably don't need the comment anymore =)
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg) · line 258
Quoted 1 line
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +1
-0+ err =firmware_request_nowarn (&fw, fname, dev);
Would it make sense to fall back to "iwl-dbg-cfg.ini" if the per-device one isn't available?
Thanks,
Signature · 4 lines
Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/
Re: [PATCH 3/6] iwlwifi: Allow per-device fwcfg files.
Quoted 36 lines · Julian Calaby
Hi Ben,
Quoted 20 lines · On Thu, Dec 31, 2020 at 11:17 AM <[email protected]> wrote:
From: Ben Greear <[email protected]>
This allows one to set the NSS and some
other low-level features for ax200 radios.Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +1
-0@@ -246,12 +246,16 @@ void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg)const struct firmware *fw;char *data, *end, *pos;int err; +char fname[128 ];drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg) · line 257
Quoted 10 lines
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +4
-2if (dbgcfg->loaded)return ; -/* TODO: maybe add a per-device file? */ - err =firmware_request_nowarn (&fw,"iwl-dbg-cfg.ini" , dev); +snprintf (fname,127 ,"iwl-dbg-cfg-%s.ini" ,dev_name (dev)); + fname[127 ] =0 ; + +/* TODO: maybe add a per-device file? Yes, did that. --Ben */ You probably don't need the comment anymore =)
Quoted 4 lines
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg) · line 258
Quoted 1 line
drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +1
-0+ err =firmware_request_nowarn (&fw, fname, dev);Would it make sense to fall back to "iwl-dbg-cfg.ini" if the per-device one isn't available?
It would be fine with me, lets see if Luca has any interest in the patches in general before I go tweaking on them...
Thanks,
Ben
Quoted 3 lines
Thanks,
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com
kernel test robot
build botRe: [PATCH 2/6] iwlwifi: Enable debug-overrides.
In reply to [email protected]Thank you for the patch! Yet something to improve:
Hi,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on v5.10]
[cannot apply to wireless-drivers-next/master wireless-drivers/master v5.11-rc1 next-20201223] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/greearb-candelatech-com/iwlwifi-Decrease-firmware-monitor-debug-area-from-4MB-to-512k/20201231-081117 base: 2c85ebc57b3e1817b6ce1a6b703928e113a90442 config: arm-allyesconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/c911badaf96fd735aa4f190e495bb7e92a6a4950
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review greearb-candelatech-com/iwlwifi-Decrease-firmware-monitor-debug-area-from-4MB-to-512k/20201231-081117 git checkout c911badaf96fd735aa4f190e495bb7e92a6a4950
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
arm-linux-gnueabi-ld: drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.o: in function `iwl_mvm_ftm_range_resp':
>> ftm-initiator.c:(.text+0x3458): undefined reference to `__aeabi_ldivmod'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org