[PATCH 1/1][SRU][oem-5.14/jammy] UBUNTU: SAUCE: ath11k: shrink TCSR read mask for WCN6855 hw2.1

You-Sheng Yang vicamo.yang at canonical.com
Fri Jan 28 09:44:58 UTC 2022


BugLink: https://bugs.launchpad.net/bugs/1954938

Full WCN6855 hw2.1 support has landed to kernel as commit d1147a316b53
("ath11k: add support for WCN6855 hw2.1"), and it was based on several
new features and fixes that involves additions & removals of members in
ath11k_hw_params, which in turn pulls in numerous prerequisite commits.

While additional features of hw2.1, e.g. WiFi 6G, are still not planned
for Focal oem-5.14 and Jammy 5.15 kernels, this patch brings in the
minimum change to enable basic functions.

The high bits of TCSR are reserved for other use, and the actual major
version mask occupies 4 bits only.

Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/net/wireless/ath/ath11k/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index 23df380432ea..177c7ac9cb4d 100644
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -25,7 +25,7 @@
 #define WINDOW_RANGE_MASK		GENMASK(18, 0)
 
 #define TCSR_SOC_HW_VERSION		0x0224
-#define TCSR_SOC_HW_VERSION_MAJOR_MASK	GENMASK(16, 8)
+#define TCSR_SOC_HW_VERSION_MAJOR_MASK	GENMASK(11, 8)
 #define TCSR_SOC_HW_VERSION_MINOR_MASK	GENMASK(7, 0)
 
 /* BAR0 + 4k is always accessible, and no
-- 
2.33.1




More information about the kernel-team mailing list