mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-04 04:54:18 +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>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 7c15430822e71e90203d87e6d0cfe83fa058b0dc Mon Sep 17 00:00:00 2001
|
|
From: Len Brown <len.brown@intel.com>
|
|
Date: Wed, 1 Feb 2023 12:32:01 -0600
|
|
Subject: [PATCH] wifi: ath11k: allow system suspend to survive ath11k
|
|
|
|
When ath11k runs into internal errors upon suspend,
|
|
it returns an error code to pci_pm_suspend, which
|
|
aborts the entire system suspend.
|
|
|
|
The driver should not abort system suspend, but should
|
|
keep its internal errors to itself, and allow the system
|
|
to suspend. Otherwise, a user can suspend a laptop
|
|
by closing the lid and sealing it into a case, assuming
|
|
that is will suspend, rather than heating up and draining
|
|
the battery when in transit.
|
|
|
|
In practice, the ath11k device seems to have plenty of transient
|
|
errors, and subsequent suspend cycles after this failure
|
|
often succeed.
|
|
|
|
https://bugzilla.kernel.org/show_bug.cgi?id=216968
|
|
|
|
Fixes: d1b0c33850d29 ("ath11k: implement suspend for QCA6390 PCI devices")
|
|
|
|
Signed-off-by: Len Brown <len.brown@intel.com>
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230201183201.14431-1-len.brown@intel.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/pci.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/pci.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/pci.c
|
|
@@ -1004,7 +1004,7 @@ static __maybe_unused int ath11k_pci_pm_
|
|
if (ret)
|
|
ath11k_warn(ab, "failed to resume core: %d\n", ret);
|
|
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
static SIMPLE_DEV_PM_OPS(ath11k_pci_pm_ops,
|