mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-15 09:19:57 +00:00
323e249ce8
This updates mac80211 to version 6.1.97-1. This code is based on Linux 6.1.97 and contains all fixes included in the upstream wireless subsystem from that kernel version. This includes many bugfixes and also some security fixes. The removed patches are already integrated in upstream Linux 6.1.97 or in backports. The following patches were integrated in upstream Linux: ath11k/0013-wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_.patch ath11k/0035-wifi-ath11k-Use-platform_get_irq-to-get-the-interrup.patch ath11k/0036-wifi-ath11k-fix-SAC-bug-on-peer-addition-with-sta-ba.patch ath11k/0047-wifi-ath11k-fix-deinitialization-of-firmware-resourc.patch ath11k/0053-wifi-ath11k-fix-writing-to-unintended-memory-region.patch ath11k/0060-wifi-ath11k-Ignore-frags-from-uninitialized-peer-in-.patch ath11k/0065-wifi-ath11k-fix-tx-status-reporting-in-encap-offload.patch ath11k/0067-wifi-ath11k-Fix-SKB-corruption-in-REO-destination-ri.patch ath11k/0069-wifi-ath11k-fix-registration-of-6Ghz-only-phy-withou.patch ath11k/0080-wifi-ath11k-add-support-default-regdb-while-searchin.patch ath11k/0085-wifi-ath11k-fix-memory-leak-in-WMI-firmware-stats.patch ath11k/0086-wifi-ath11k-Add-missing-check-for-ioremap.patch ath11k/0096-wifi-ath11k-fix-boot-failure-with-one-MSI-vector.patch subsys/337-wifi-mac80211-fix-race-condition-on-enabling-fast-xm.patch The following patches were integrated in upstream backports: ath11k/901-wifi-ath11k-pci-fix-compilation-in-5.16-and-older.patch build/080-resv_start_op.patch build/110-backport_napi_build_skb.patch The following files are missing in backports, we do not have to remove them any more. Some were already missing before some were removed in this update: include/linux/cordic.h include/linux/crc8.h include/linux/eeprom_93cx6.h include/linux/wl12xx.h include/net/ieee80211.h backport-include/linux/bcm47xx_nvram.h include/linux/ath9k_platform.h include/net/bluetooth/ backports ships a dummy Mediatek wed header for older kernel versions. We backported the feature in our kernel, remove the dummy header: backport-include/linux/soc/mediatek/mtk_wed.h Remove header files for subsystems used form the mainline kernel: include/trace/events/qrtr.h include/net/rsi_91x.h backport-include/linux/platform_data/brcmnand.h Link: https://github.com/openwrt/openwrt/pull/15827 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
120 lines
4.0 KiB
Diff
120 lines
4.0 KiB
Diff
From a018750a2cceaf4427c4ee3d9ce3e83a171d5bd6 Mon Sep 17 00:00:00 2001
|
|
From: Youghandhar Chintala <quic_youghand@quicinc.com>
|
|
Date: Fri, 4 Nov 2022 14:24:03 +0530
|
|
Subject: [PATCH] wifi: ath11k: Trigger sta disconnect on hardware restart
|
|
|
|
Currently after the hardware restart triggered from the driver, the
|
|
station interface connection remains intact, since a disconnect trigger
|
|
is not sent to userspace. This can lead to a problem in targets where
|
|
the wifi mac sequence is added by the firmware.
|
|
|
|
After the target restart, its wifi mac sequence number gets reset to
|
|
zero. Hence AP to which our device is connected will receive frames with
|
|
a wifi mac sequence number jump to the past, thereby resulting in the
|
|
AP dropping all these frames, until the frame arrives with a wifi mac
|
|
sequence number which AP was expecting.
|
|
|
|
To avoid such frame drops, its better to trigger a station disconnect
|
|
upon target hardware restart which can be done with API
|
|
ieee80211_reconfig_disconnect exposed to mac80211.
|
|
|
|
The other targets are not affected by this change, since the hardware
|
|
params flag is not set.
|
|
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
|
|
Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1
|
|
|
|
Signed-off-by: Youghandhar Chintala <quic_youghand@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20221104085403.11025-1-quic_youghand@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/core.c | 6 ++++++
|
|
drivers/net/wireless/ath/ath11k/hw.h | 1 +
|
|
drivers/net/wireless/ath/ath11k/mac.c | 7 +++++++
|
|
3 files changed, 14 insertions(+)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/core.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/core.c
|
|
@@ -195,6 +195,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
+ .support_fw_mac_sequence = false,
|
|
},
|
|
{
|
|
.name = "qca6390 hw2.0",
|
|
@@ -277,6 +278,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
+ .support_fw_mac_sequence = true,
|
|
},
|
|
{
|
|
.name = "qcn9074 hw1.0",
|
|
@@ -356,6 +358,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
+ .support_fw_mac_sequence = false,
|
|
},
|
|
{
|
|
.name = "wcn6855 hw2.0",
|
|
@@ -438,6 +441,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
+ .support_fw_mac_sequence = true,
|
|
},
|
|
{
|
|
.name = "wcn6855 hw2.1",
|
|
@@ -519,6 +523,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
+ .support_fw_mac_sequence = true,
|
|
},
|
|
{
|
|
.name = "wcn6750 hw1.0",
|
|
@@ -597,6 +602,7 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = false,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750,
|
|
.smp2p_wow_exit = true,
|
|
+ .support_fw_mac_sequence = true,
|
|
},
|
|
};
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/hw.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/hw.h
|
|
@@ -219,6 +219,7 @@ struct ath11k_hw_params {
|
|
bool tcl_ring_retry;
|
|
u32 tx_ring_size;
|
|
bool smp2p_wow_exit;
|
|
+ bool support_fw_mac_sequence;
|
|
};
|
|
|
|
struct ath11k_hw_ops {
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -8007,6 +8007,7 @@ ath11k_mac_op_reconfig_complete(struct i
|
|
struct ath11k *ar = hw->priv;
|
|
struct ath11k_base *ab = ar->ab;
|
|
int recovery_count;
|
|
+ struct ath11k_vif *arvif;
|
|
|
|
if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART)
|
|
return;
|
|
@@ -8042,6 +8043,12 @@ ath11k_mac_op_reconfig_complete(struct i
|
|
ath11k_dbg(ab, ATH11K_DBG_BOOT, "reset success\n");
|
|
}
|
|
}
|
|
+ if (ar->ab->hw_params.support_fw_mac_sequence) {
|
|
+ list_for_each_entry(arvif, &ar->arvifs, list) {
|
|
+ if (arvif->is_up && arvif->vdev_type == WMI_VDEV_TYPE_STA)
|
|
+ ieee80211_hw_restart_disconnect(arvif->vif);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
mutex_unlock(&ar->conf_mutex);
|