mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-25 05:47:00 +00:00
e94052bfee
Synchronize the ath11k backports with upstream linux.
Most of them are changes in kernel 6.5, the rest are
fixes for the ath11k_pci. The most important one is
"Revert 'wifi: ath11k: Enable threaded NAPI'", which
fixes the problem that QCN9074 cannot be used after
restarting on the x86 platform.
[ 23.462718] ath11k_pci 0000:02:00.0: failed to vdev 0 create peer for AP: -110
[ 28.503020] ath11k_pci 0000:02:00.0: Timeout in receiving vdev delete response
Changes to ipq8074 coldboot part pick from commit
b33bfcf ("mac80211: ath11k: sync with ath-next").
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 04178918e7f6b5f34dde81ec79ee8a1ccace3be3 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Mon, 17 Oct 2022 11:45:03 +0200
|
|
Subject: [PATCH] wifi: ath11k: pci: fix compilation in 5.16 and older
|
|
|
|
Commit ("genirq/msi, treewide: Use a named struct for PCI/MSI attributes")
|
|
changed the msi_desc structure a bit, however that is only available in
|
|
kernels 5.17 and newer, so check for kernel version to allow compilation
|
|
in 5.16 and older.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
drivers/net/wireless/ath/ath11k/pci.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/pci.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/pci.c
|
|
@@ -459,7 +459,11 @@ static int ath11k_pci_alloc_msi(struct a
|
|
pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_LO,
|
|
&ab->pci.msi.addr_lo);
|
|
|
|
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 17, 0))
|
|
if (msi_desc->pci.msi_attrib.is_64) {
|
|
+#else
|
|
+ if (msi_desc->msi_attrib.is_64) {
|
|
+#endif
|
|
pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_HI,
|
|
&ab->pci.msi.addr_hi);
|
|
} else {
|