From: Luca Coelho <[email protected]>
Hi,
Here's the fourth set of patches intended for v5.18. It's the usual
development, new features, cleanups and bugfixes.
The changes are:
* W=1 warnings clean up continues;
* Some improvements and fixes in scanning;
* More work on the Bz family of devices;
* Some other small fixes, clean-ups and improvements.
As usual, I'm pushing this to a pending branch, for kbuild bot, and
will send a pull-request later.
Please review.
Cheers,
Luca.
Ilan Peer (4):
iwlwifi: mvm: Correctly set fragmented EBS
iwlwifi: scan: Modify return value of a function
iwlwifi: mvm: Passively scan non PSC channels only when requested so
iwlwifi: mvm: Unify the scan iteration functions
Johannes Berg (6):
iwlwifi: pcie: adjust to Bz completion descriptor
iwlwifi: drv: load tlv debug data earlier
iwlwifi: eeprom: clean up macros
iwlwifi: remove unused macros
iwlwifi: debugfs: remove useless double condition
iwlwifi: mei: use C99 initializer for device IDs
Matti Gottlieb (1):
iwlwifi: pcie: Adapt rx queue write pointer for Bz family
Mukesh Sisodiya (1):
iwlwifi: yoyo: Avoid using dram data if allocation failed
.../net/wireless/intel/iwlwifi/cfg/22000.c | 2 -
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 3 -
drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 3 +
.../net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 13 +-
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +-
.../wireless/intel/iwlwifi/iwl-eeprom-read.c | 12 +-
.../net/wireless/intel/iwlwifi/iwl-phy-db.c | 4 +-
drivers/net/wireless/intel/iwlwifi/mei/main.c | 6 +-
.../net/wireless/intel/iwlwifi/mvm/debugfs.c | 5 +-
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 -
drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 2 -
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 129 ++++++++++--------
.../wireless/intel/iwlwifi/pcie/internal.h | 20 ++-
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 65 ++++++---
14 files changed, 154 insertions(+), 116 deletions(-)
--
2.34.1
From: Johannes Berg <[email protected]>
There's no good reason to pick the opmode first and load this
under the mutex, so just load it before continuing. This will
let us load it asynchronously more easily later.
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Luca Coelho <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 5a9e644a791c..ab52136cffb4 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1647,6 +1647,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
/* We have our copies now, allow OS release its copies */
release_firmware(ucode_raw);
+ iwl_dbg_tlv_load_bin(drv->trans->dev, drv->trans);
+
mutex_lock(&iwlwifi_opmode_table_mtx);
switch (fw->type) {
case IWL_FW_DVM:
@@ -1663,8 +1665,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
IWL_INFO(drv, "loaded firmware version %s op_mode %s\n",
drv->fw.fw_version, op->name);
- iwl_dbg_tlv_load_bin(drv->trans->dev, drv->trans);
-
/* add this device to the list of devices using this op_mode */
list_add_tail(&drv->list, &op->drv);
--
2.34.1
From: Ilan Peer <[email protected]>
Currently, fragmented EBS was set for a channel only if the 'hb_type'
was set to fragmented or balanced scan. However, 'hb_type' is set only
in case of CDB, and thus fragmented EBS is never set for a channel for
non-CDB devices. Fix it.
Signed-off-by: Ilan Peer <[email protected]>
Signed-off-by: Luca Coelho <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 0ee766c6cff8..4b78a00243c7 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1887,7 +1887,10 @@ static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,
IWL_SCAN_CHANNEL_FLAG_CACHE_ADD;
/* set fragmented ebs for fragmented scan on HB channels */
- if (iwl_mvm_is_scan_fragmented(params->hb_type))
+ if ((!iwl_mvm_is_cdb_supported(mvm) &&
+ iwl_mvm_is_scan_fragmented(params->type)) ||
+ (iwl_mvm_is_cdb_supported(mvm) &&
+ iwl_mvm_is_scan_fragmented(params->hb_type)))
flags |= IWL_SCAN_CHANNEL_FLAG_EBS_FRAG;
return flags;
--
2.34.1