iwlwifi: updates intended for v5.18 2022-05-17
cover iwlwifi: updates intended for v5.18 2022-05-17
From: Gregory Greenman <[email protected]>
Hello,
Here's a set of patches intended for v5.18 if time permits. It's the usual developement, bugfixes and small cleanups. Nothing major in this series.
Thanks,
Gregory
Avraham Stern (1):
iwlwifi: mei: clear the sap data header before sending
Emmanuel Grumbach (2):
iwlwifi: mvm: fix assert 1F04 upon reconfig
iwlwifi: mvm: always tell the firmware to accept MCAST frames in BSS
Haim Dreyfuss (1):
iwlwifi: mvm: use NULL instead of ERR_PTR when parsing wowlan status
Johannes Berg (4):
iwlwifi: pcie: simplify MSI-X cause mapping
iwlwifi: mvm: clean up authorized condition
iwlwifi: fw: init SAR GEO table only if data is present
iwlwifi: mei: fix potential NULL-ptr deref
Miri Korenblit (1):
iwlwifi: mvm: remove vif_count
Mordechay Goodstein (1):
iwlwifi: mvm: add OTP info in case of init failure
drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 ++ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 + drivers/net/wireless/intel/iwlwifi/mei/main.c | 3 ++ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 ++++----- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 +++--- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 32 +++---------- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 17 ++----- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 - .../net/wireless/intel/iwlwifi/mvm/power.c | 3 ++ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 44 ++++++++++++----- .../net/wireless/intel/iwlwifi/pcie/trans.c | 48 +++++++++++-------- 11 files changed, 102 insertions(+), 88 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/10 iwlwifi: pcie: simplify MSI-X cause mapping
From: Johannes Berg <[email protected]>
We're currently manually encoding a calculation here since the HW just maps all the bits of specific registers to specific offsets, which led to the bug fixed here previously with the Bz SW_ERROR interrupt.
Clean up the code to only know about the mapping offset (-16 or 16 depending on the register) to avoid such issues in the future.
--- .../net/wireless/intel/iwlwifi/pcie/trans.c | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +29 -19
@@ -1085,34 +1085,44 @@ bool iwl_pcie_check_hw_rf_kill(struct iwl_trans *trans) }struct iwl_causes_list { -u32 cause_num; -u32 mask_reg; +u16 mask_reg; +u8 bit;u8 addr; }; +#define CAUSE (reg, mask) \ + { \ + .mask_reg = reg, \ + .bit = ilog2(mask), \ + .addr = ilog2(mask) + \ + ((reg) == CSR_MSIX_FH_INT_MASK_AD ? -16 : \ + (reg) == CSR_MSIX_HW_INT_MASK_AD ? 16 : \ + 0xffff),/* causes overflow warning */ \ + } +static const struct iwl_causes_list causes_list_common[] = { - {MSIX_FH_INT_CAUSES_D2S_CH0_NUM ,CSR_MSIX_FH_INT_MASK_AD ,0 }, - {MSIX_FH_INT_CAUSES_D2S_CH1_NUM ,CSR_MSIX_FH_INT_MASK_AD ,0x1 }, - {MSIX_FH_INT_CAUSES_S2D ,CSR_MSIX_FH_INT_MASK_AD ,0x3 }, - {MSIX_FH_INT_CAUSES_FH_ERR ,CSR_MSIX_FH_INT_MASK_AD ,0x5 }, - {MSIX_HW_INT_CAUSES_REG_ALIVE ,CSR_MSIX_HW_INT_MASK_AD ,0x10 }, - {MSIX_HW_INT_CAUSES_REG_WAKEUP ,CSR_MSIX_HW_INT_MASK_AD ,0x11 }, - {MSIX_HW_INT_CAUSES_REG_RESET_DONE ,CSR_MSIX_HW_INT_MASK_AD ,0x12 }, - {MSIX_HW_INT_CAUSES_REG_CT_KILL ,CSR_MSIX_HW_INT_MASK_AD ,0x16 }, - {MSIX_HW_INT_CAUSES_REG_RF_KILL ,CSR_MSIX_HW_INT_MASK_AD ,0x17 }, - {MSIX_HW_INT_CAUSES_REG_PERIODIC ,CSR_MSIX_HW_INT_MASK_AD ,0x18 }, - {MSIX_HW_INT_CAUSES_REG_SCD ,CSR_MSIX_HW_INT_MASK_AD ,0x2A }, - {MSIX_HW_INT_CAUSES_REG_FH_TX ,CSR_MSIX_HW_INT_MASK_AD ,0x2B }, - {MSIX_HW_INT_CAUSES_REG_HW_ERR ,CSR_MSIX_HW_INT_MASK_AD ,0x2D }, - {MSIX_HW_INT_CAUSES_REG_HAP ,CSR_MSIX_HW_INT_MASK_AD ,0x2E }, +CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH0_NUM ), +CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_D2S_CH1_NUM ), +CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_S2D ), +CAUSE (CSR_MSIX_FH_INT_MASK_AD ,MSIX_FH_INT_CAUSES_FH_ERR ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_ALIVE ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_WAKEUP ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RESET_DONE ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_CT_KILL ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_RF_KILL ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_PERIODIC ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SCD ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_FH_TX ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HW_ERR ), +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_HAP ), };static const struct iwl_causes_list causes_list_pre_bz[] = { - {MSIX_HW_INT_CAUSES_REG_SW_ERR ,CSR_MSIX_HW_INT_MASK_AD ,0x29 }, +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR ), };static const struct iwl_causes_list causes_list_bz[] = { - {MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ,CSR_MSIX_HW_INT_MASK_AD ,0x15 }, +CAUSE (CSR_MSIX_HW_INT_MASK_AD ,MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ ), }; static void iwl_pcie_map_list(struct iwl_trans *trans,
@@ -1124,7 +1134,7 @@ static void iwl_pcie_map_list(struct iwl_trans *trans,for (i =0 ; i < arr_size; i++) {iwl_write8 (trans,CSR_MSIX_IVAR (causes[i].addr), val);iwl_clear_bit (trans, causes[i].mask_reg, - causes[i].cause_num); +BIT (causes[i].bit)); } }
Signature · 1 line
2.35.1
PATCH 2/10 iwlwifi: mvm: use NULL instead of ERR_PTR when parsing wowlan status
In reply to [email protected]From: Haim Dreyfuss <[email protected]>
We anyway don't differentiate between the errors so it is pointless, returning NULL will be simpler in this case.
--- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +11 -11
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2021 Intel Corporation +* Copyright (C) 2012-2014, 2018-2022 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */
@@ -1956,18 +1956,18 @@ iwl_mvm_parse_wowlan_status_common_ ## _ver(struct iwl_mvm *mvm, \ \if (len <sizeof (*data)) { \IWL_ERR (mvm,"Invalid WoWLAN status response!\n" ); \ -return ERR_PTR (-EIO ); \ +return NULL ; \ } \ \ data_size =ALIGN (le32_to_cpu (data->wake_packet_bufsize),4 ); \if (len !=sizeof (*data) + data_size) { \IWL_ERR (mvm,"Invalid WoWLAN status response!\n" ); \ -return ERR_PTR (-EIO ); \ +return NULL ; \ } \ \ status =kzalloc (sizeof (*status) + data_size,GFP_KERNEL ); \if (!status) \ -return ERR_PTR (-ENOMEM ); \ +return NULL ; \ \/* copy all the common fields */ \ status->replay_ctr =le64_to_cpu (data->replay_ctr); \
@@ -2097,7 +2097,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)struct iwl_wowlan_status_v6 *v6 = (void *)cmd.resp_pkt->data; status =iwl_mvm_parse_wowlan_status_common_v6 (mvm, v6, len); -if (IS_ERR (status)) +if (!status) goto out_free_resp; BUILD_BUG_ON(sizeof(v6->gtk.decrypt_key) >
@@ -2128,7 +2128,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)struct iwl_wowlan_status_v7 *v7 = (void *)cmd.resp_pkt->data; status =iwl_mvm_parse_wowlan_status_common_v7 (mvm, v7, len); -if (IS_ERR (status)) +if (!status) goto out_free_resp;iwl_mvm_convert_key_counters (status, &v7->gtk[0 ].rsc.all_tsc_rsc);
@@ -2141,7 +2141,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)* difference is only in a few not used (reserved) fields. */ status =iwl_mvm_parse_wowlan_status_common_v9 (mvm, v9, len); -if (IS_ERR (status)) +if (!status) goto out_free_resp;iwl_mvm_convert_key_counters (status, &v9->gtk[0 ].rsc.all_tsc_rsc);
@@ -2153,7 +2153,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)struct iwl_wowlan_status_v12 *v12 = (void *)cmd.resp_pkt->data; status =iwl_mvm_parse_wowlan_status_common_v12 (mvm, v12, len); -if (IS_ERR (status)) +if (!status) goto out_free_resp;iwl_mvm_convert_key_counters_v5 (status, &v12->gtk[0 ].sc);
@@ -2165,7 +2165,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)IWL_ERR (mvm,"Firmware advertises unknown WoWLAN status response %d!\n" , notif_ver); - status =ERR_PTR (-EIO ); + status =NULL ; } out_free_resp:
@@ -2203,7 +2203,7 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,struct iwl_mvm_sta *mvm_ap_sta; status =iwl_mvm_get_wakeup_status (mvm, mvmvif->ap_sta_id); -if (IS_ERR (status)) +if (!status) goto out_unlock; IWL_DEBUG_WOWLAN(mvm, "wakeup reason 0x%x\n",
@@ -2370,7 +2370,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,int i, n_matches, ret; status =iwl_mvm_get_wakeup_status (mvm,IWL_MVM_INVALID_STA ); -if (!IS_ERR (status)) { +if (status) { reasons = status->wakeup_reasons;kfree (status); }
Signature · 1 line
2.35.1
PATCH 3/10 iwlwifi: mvm: clean up authorized condition
In reply to [email protected]From: Johannes Berg <[email protected]>
We track in mvmvif->authorized when the AP STA becomes authorized and no longer authorized, so we don't need the complex condition with station lookup. Simplify the code.
--- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +3 -20
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2021 Intel Corporation +* Copyright (C) 2012-2014, 2018-2022 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */
@@ -567,7 +567,6 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,if (vif->bss_conf.assoc && vif->bss_conf.dtim_period && !force_assoc_off) {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif); -u8 ap_sta_id = mvmvif->ap_sta_id;u32 dtim_offs;/*
@@ -614,24 +613,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,* allow multicast data frames only as long as the station is * authorized, i.e., GTK keys are already installed (if needed) */ -if (ap_sta_id < mvm->fw->ucode_capa.num_stations) { -struct ieee80211_sta *sta; - -rcu_read_lock (); - - sta =rcu_dereference (mvm->fw_id_to_mac_id[ap_sta_id]); -if (!IS_ERR_OR_NULL (sta)) { -struct iwl_mvm_sta *mvmsta = -iwl_mvm_sta_from_mac80211 (sta); - -if (mvmsta->sta_state == -IEEE80211_STA_AUTHORIZED ) - cmd.filter_flags |= -cpu_to_le32 (MAC_FILTER_ACCEPT_GRP ); - } - -rcu_read_unlock (); - } +if (mvmvif->authorized) + cmd.filter_flags |=cpu_to_le32 (MAC_FILTER_ACCEPT_GRP ); }else { ctxt_sta->is_assoc =cpu_to_le32 (0 );
Signature · 1 line
2.35.1
PATCH 4/10 iwlwifi: fw: init SAR GEO table only if data is present
In reply to [email protected]From: Johannes Berg <[email protected]>
When no table data was read from ACPI, then filling the data and returning success here will fill zero values, which means transmit power will be limited to 0 dBm. This is clearly not intended.
Return an error from iwl_sar_geo_init() if there's no data to fill into the command structure.
--- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/fw/acpi.c +3 -0
@@ -937,6 +937,9 @@ int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt, {int i, j; +if (!fwrt->geo_enabled) +return -ENODATA ; +if (!iwl_sar_geo_support (fwrt))return -EOPNOTSUPP ;
Signature · 1 line
2.35.1
PATCH 5/10 iwlwifi: mvm: fix assert 1F04 upon reconfig
In reply to [email protected]From: Emmanuel Grumbach <[email protected]>
When we reconfig we must not send the MAC_POWER command that relates to a MAC that was not yet added to the firmware.
Ignore those in the iterator.
--- drivers/net/wireless/intel/iwlwifi/mvm/power.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/power.c +3 -0
@@ -563,6 +563,9 @@ static void iwl_mvm_power_get_vifs_iterator(void *_data, u8 *mac,struct iwl_power_vifs *power_iterator = _data;bool active = mvmvif->phy_ctxt && mvmvif->phy_ctxt->id <NUM_PHY_CTX ; +if (!mvmvif->uploaded) +return ; +switch (ieee80211_vif_type_p2p (vif)) {case NL80211_IFTYPE_P2P_DEVICE :break ;
Signature · 1 line
2.35.1
PATCH 6/10 iwlwifi: mvm: add OTP info in case of init failure
In reply to [email protected]From: Mordechay Goodstein <[email protected]>
This helps to understand HW issues that can happen while initializing the nic.
--- drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 ++ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-prph.h +2 -0
@@ -389,6 +389,8 @@ enum {#define WFPM_LMAC1_PD_NOTIFICATION 0xa0338c#define WFPM_ARC1_PD_NOTIFICATION 0xa03044#define HPM_SECONDARY_DEVICE_STATE 0xa03404 +#define WFPM_MAC_OTP_CFG7_ADDR 0xa03338 +#define WFPM_MAC_OTP_CFG7_DATA 0xa0333c/* For UMAG_GEN_HW_STATUS reg check */
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +9 -6
@@ -287,6 +287,9 @@ static bool iwl_wait_phy_db_entry(struct iwl_notif_wait_data *notif_wait,static void iwl_mvm_print_pd_notification (struct iwl_mvm *mvm) { +#define IWL_FW_PRINT_REG_INFO (reg_name) \ + IWL_ERR(mvm, #reg_name ": 0x%x\n", iwl_read_umac_prph(trans, reg_name)) +struct iwl_trans *trans = mvm->trans;enum iwl_device_family device_family = trans->trans_cfg->device_family;
@@ -294,15 +297,15 @@ static void iwl_mvm_print_pd_notification(struct iwl_mvm *mvm)return ;if (device_family <=IWL_DEVICE_FAMILY_9000 ) -IWL_ERR (mvm,"WFPM_ARC1_PD_NOTIFICATION: 0x%x\n" , -iwl_read_umac_prph (trans,WFPM_ARC1_PD_NOTIFICATION )); +IWL_FW_PRINT_REG_INFO (WFPM_ARC1_PD_NOTIFICATION );else -IWL_ERR (mvm,"WFPM_LMAC1_PD_NOTIFICATION: 0x%x\n" , -iwl_read_umac_prph (trans,WFPM_LMAC1_PD_NOTIFICATION )); +IWL_FW_PRINT_REG_INFO (WFPM_LMAC1_PD_NOTIFICATION ); -IWL_ERR (mvm,"HPM_SECONDARY_DEVICE_STATE: 0x%x\n" , -iwl_read_umac_prph (trans,HPM_SECONDARY_DEVICE_STATE )); +IWL_FW_PRINT_REG_INFO (HPM_SECONDARY_DEVICE_STATE ); +/* print OPT info */ +IWL_FW_PRINT_REG_INFO (WFPM_MAC_OTP_CFG7_ADDR ); +IWL_FW_PRINT_REG_INFO (WFPM_MAC_OTP_CFG7_DATA ); } static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
Signature · 1 line
2.35.1
PATCH 7/10 iwlwifi: mvm: always tell the firmware to accept MCAST frames in BSS
In reply to [email protected]From: Emmanuel Grumbach <[email protected]>
Make the firmware's life easier and always accept MCAST frames. If needed, drop them in the driver. We need to filter out MCAST frames in order not to have false positives in the decryption check. If we accept MCAST frames before we have the GKT installed, we'll end up complaining that we can't decrypt the frame.
Implement the same filtering, but in the driver.
--- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 13 +++--- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 44 ++++++++++++++----- 2 files changed, 38 insertions(+), 19 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +6 -7
@@ -552,6 +552,12 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,/* Fill the common data for all mac context types */ iwl_mvm_mac_ctxt_cmd_common (mvm, vif, &cmd, bssid_override, action); +/* +* We always want to hear MCAST frames, if we're not authorized yet, +* we'll drop them. +*/ + cmd.filter_flags |=cpu_to_le32 (MAC_FILTER_ACCEPT_GRP ); +if (vif->p2p) {struct ieee80211_p2p_noa_attr *noa = &vif->bss_conf.p2p_noa_attr;
@@ -608,13 +614,6 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm, IWL_UCODE_TLV_CAPA_COEX_HIGH_PRIO)) ctxt_sta->data_policy |=cpu_to_le32 (COEX_HIGH_PRIORITY_ENABLE ); - -/* -* allow multicast data frames only as long as the station is -* authorized, i.e., GTK keys are already installed (if needed) -*/ -if (mvmvif->authorized) - cmd.filter_flags |=cpu_to_le32 (MAC_FILTER_ACCEPT_GRP ); }else { ctxt_sta->is_assoc =cpu_to_le32 (0 );
drivers/net/wireless/intel/iwlwifi/mvm/rx.c +32 -12
61 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH 8/10 iwlwifi: mvm: remove vif_count
In reply to [email protected]From: Miri Korenblit <[email protected]>
We used to count the number of ieee80211_vifs in mvm. This was needed for the legacy PM API, which is no longer supported. Remove it.
--- .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 17 +++-------------- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 - 2 files changed, 3 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +3 -14
@@ -976,7 +976,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)ieee80211_wake_queues (mvm->hw); - mvm->vif_count =0 ; mvm->rx_ba_sessions =0 ; mvm->fwrt.dump.conf =FW_DBG_INVALID ; mvm->monitor_on = false;
@@ -1380,10 +1379,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,rcu_assign_pointer (mvm->vif_id_to_mac[mvmvif->id], vif); -/* Counting number of interfaces is needed for legacy PM */ -if (vif->type !=NL80211_IFTYPE_P2P_DEVICE ) - mvm->vif_count++; -/* * The AP binding flow can be done only after the beacon * template is configured (which happens only in the mac80211
@@ -1400,7 +1395,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, ret =iwl_mvm_alloc_bcast_sta (mvm, vif);if (ret) {IWL_ERR (mvm,"Failed to allocate bcast sta\n" ); - goto out_release; + goto out_unlock; }/*
@@ -1411,7 +1406,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,0 , vif->type, IWL_STA_MULTICAST);if (ret) - goto out_release; + goto out_unlock;iwl_mvm_vif_dbgfs_register (mvm, vif); goto out_unlock;
@@ -1421,7 +1416,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, ret =iwl_mvm_mac_ctxt_add (mvm, vif);if (ret) - goto out_release; + goto out_unlock; ret =iwl_mvm_power_update_mac (mvm);if (ret)
@@ -1498,9 +1493,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, out_remove_mac: mvmvif->phy_ctxt =NULL ;iwl_mvm_mac_ctxt_remove (mvm, vif); - out_release: -if (vif->type !=NL80211_IFTYPE_P2P_DEVICE ) - mvm->vif_count--; out_unlock:mutex_unlock (&mvm->mutex);
@@ -1582,9 +1574,6 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, mvmvif->phy_ctxt =NULL ; } -if (mvm->vif_count && vif->type !=NL80211_IFTYPE_P2P_DEVICE ) - mvm->vif_count--; -iwl_mvm_power_update_mac (mvm);iwl_mvm_mac_ctxt_remove (mvm, vif);
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +0 -1
@@ -934,7 +934,6 @@ struct iwl_mvm {unsigned long fw_key_table[BITS_TO_LONGS (STA_KEY_MAX_NUM )];u8 fw_key_deleted[STA_KEY_MAX_NUM ]; -u8 vif_count;struct ieee80211_vif __rcu *vif_id_to_mac[NUM_MAC_INDEX_DRIVER ];/* -1 for always, 0 for never, >0 for that many times */
Signature · 1 line
2.35.1
PATCH 9/10 iwlwifi: mei: clear the sap data header before sending
In reply to [email protected]From: Avraham Stern <[email protected]>
The SAP data header has some fields that are marked as reserved but are actually in use by CSME. Clear those fields before sending the data to avoid having random values in those fields.
--- drivers/net/wireless/intel/iwlwifi/mei/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/mei/main.c +1 -0
@@ -493,6 +493,7 @@ void iwl_mei_add_data_to_ring(struct sk_buff *skb, bool cb_tx)if (cb_tx) {struct iwl_sap_cb_data *cb_hdr =skb_push (skb,sizeof (*cb_hdr)); +memset (cb_hdr,0 ,sizeof (*cb_hdr)); cb_hdr->hdr.type =cpu_to_le16 (SAP_MSG_CB_DATA_PACKET ); cb_hdr->hdr.len =cpu_to_le16 (skb->len -sizeof (cb_hdr->hdr)); cb_hdr->hdr.seq_num =cpu_to_le32 (atomic_inc_return (&mei->sap_seq_no));
Signature · 1 line
2.35.1
PATCH 10/10 iwlwifi: mei: fix potential NULL-ptr deref
In reply to [email protected]From: Johannes Berg <[email protected]>
If SKB allocation fails, continue rather than using the NULL pointer.
Coverity CID: 1497650
--- drivers/net/wireless/intel/iwlwifi/mei/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/intel/iwlwifi/mei/main.c +2 -0
@@ -1020,6 +1020,8 @@ static void iwl_mei_handle_sap_data(struct mei_cl_device *cldev,/* We need enough room for the WiFi header + SNAP + IV */ skb =netdev_alloc_skb (netdev, len +QOS_HDR_IV_SNAP_LEN ); +if (!skb) +continue ;skb_reserve (skb,QOS_HDR_IV_SNAP_LEN ); ethhdr =skb_push (skb,sizeof (*ethhdr));
Signature · 1 line
2.35.1
Quoted 48 lines · On Tue, 2022-05-17 at 12:05 +0300, [email protected] wrote:
From: Gregory Greenman <[email protected]>
Hello,
Here's a set of patches intended for v5.18 if time permits. It's the usual developement, bugfixes and small cleanups. Nothing major in this
series.Thanks,
GregoryAvraham Stern (1):
iwlwifi: mei: clear the sap data header before sendingEmmanuel Grumbach (2):
iwlwifi: mvm: fix assert 1F04 upon reconfig
iwlwifi: mvm: always tell the firmware to accept MCAST frames in BSSHaim Dreyfuss (1):
iwlwifi: mvm: use NULL instead ofERR_PTRwhen parsing wowlan statusJohannes Berg (4):
iwlwifi: pcie: simplify MSI-X cause mapping
iwlwifi: mvm: clean up authorized condition
iwlwifi: fw: init SAR GEO table only if data is present
iwlwifi: mei: fix potential NULL-ptr derefMiri Korenblit (1):
iwlwifi: mvm: removevif_countMordechay Goodstein (1):
iwlwifi: mvm: add OTP info in case of init failuredrivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 ++
drivers/net/wireless/intel/iwlwifi/iwl-prph.h| 2 +drivers/net/wireless/intel/iwlwifi/mei/main.c| 3 ++ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 ++++----- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 15 +++---.../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c| 32 +++----------.../net/wireless/intel/iwlwifi/mvm/mac80211.c| 17 ++----- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 - .../net/wireless/intel/iwlwifi/mvm/power.c | 3 ++ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 44 ++++++++++++----- .../net/wireless/intel/iwlwifi/pcie/trans.c | 48 +++++++++++------ --
Quoted 2 lines
11 files changed, 102 insertions(+), 88 deletions(-)
Considering the timeline, v5.19 seems like a more feasible option. So, let's use it for v5.19.
Thanks!
Gregory