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>
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From f812e2a9f85d6bea78957ccb5197e4491316848b Mon Sep 17 00:00:00 2001
|
|
From: Cai Huoqing <cai.huoqing@linux.dev>
|
|
Date: Thu, 23 Mar 2023 19:26:09 +0800
|
|
Subject: [PATCH] wifi: ath11k: Remove redundant pci_clear_master
|
|
|
|
Remove pci_clear_master to simplify the code,
|
|
the bus-mastering is also cleared in do_pci_disable_device,
|
|
like this:
|
|
./drivers/pci/pci.c:2197
|
|
static void do_pci_disable_device(struct pci_dev *dev)
|
|
{
|
|
u16 pci_command;
|
|
|
|
pci_read_config_word(dev, PCI_COMMAND, &pci_command);
|
|
if (pci_command & PCI_COMMAND_MASTER) {
|
|
pci_command &= ~PCI_COMMAND_MASTER;
|
|
pci_write_config_word(dev, PCI_COMMAND, pci_command);
|
|
}
|
|
|
|
pcibios_disable_device(dev);
|
|
}.
|
|
And dev->is_busmaster is set to 0 in pci_disable_device.
|
|
|
|
Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230323112613.7550-1-cai.huoqing@linux.dev
|
|
---
|
|
drivers/net/wireless/ath/ath11k/pci.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/pci.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/pci.c
|
|
@@ -544,7 +544,7 @@ static int ath11k_pci_claim(struct ath11
|
|
if (!ab->mem) {
|
|
ath11k_err(ab, "failed to map pci bar %d\n", ATH11K_PCI_BAR_NUM);
|
|
ret = -EIO;
|
|
- goto clear_master;
|
|
+ goto release_region;
|
|
}
|
|
|
|
ab->mem_ce = ab->mem;
|
|
@@ -552,8 +552,6 @@ static int ath11k_pci_claim(struct ath11
|
|
ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot pci_mem 0x%pK\n", ab->mem);
|
|
return 0;
|
|
|
|
-clear_master:
|
|
- pci_clear_master(pdev);
|
|
release_region:
|
|
pci_release_region(pdev, ATH11K_PCI_BAR_NUM);
|
|
disable_device:
|
|
@@ -569,7 +567,6 @@ static void ath11k_pci_free_region(struc
|
|
|
|
pci_iounmap(pci_dev, ab->mem);
|
|
ab->mem = NULL;
|
|
- pci_clear_master(pci_dev);
|
|
pci_release_region(pci_dev, ATH11K_PCI_BAR_NUM);
|
|
if (pci_is_enabled(pci_dev))
|
|
pci_disable_device(pci_dev);
|