1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
From bc511f8d6a30bf9a348ed49462d95477d613e59d Mon Sep 17 00:00:00 2001
From: GloriousEggroll <gloriouseggroll@gmail.com>
Date: Thu, 4 Apr 2024 12:43:12 -0600
Subject: [PATCH] steamdeck-wifi
---
drivers/net/wireless/ath/ath11k/hw.c | 1 +
drivers/net/wireless/ath/ath11k/hw.h | 1 +
drivers/net/wireless/ath/ath11k/mac.c | 86 +++++++++++++++++++------
drivers/net/wireless/ath/ath11k/mhi.c | 1 +
drivers/net/wireless/ath/ath11k/pci.c | 50 ++++++++++++---
drivers/net/wireless/ath/ath11k/pcic.c | 11 ++++
drivers/net/wireless/ath/ath11k/wmi.c | 27 ++++++++
drivers/net/wireless/ath/ath11k/wmi.h | 87 +++++++++++++++++++++++++
10 files changed, 322 insertions(+), 31 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/hw.c b/drivers/net/wireless/ath/ath11k/hw.c
index 77d8f9237..409eb565d 100644
--- a/drivers/net/wireless/ath/ath11k/hw.c
+++ b/drivers/net/wireless/ath/ath11k/hw.c
@@ -100,6 +100,7 @@ static void ath11k_init_wmi_config_qca6390(struct ath11k_base *ab,
config->num_wow_filters = 0x16;
config->num_keep_alive_pattern = 0;
config->flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64;
+ config->host_service_flags |= WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT;
}
static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab)
diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index 1b070747a..20fb19e3d 100644
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -206,6 +206,7 @@ struct ath11k_hw_params {
bool fw_wmi_diag_event;
bool current_cc_support;
bool dbr_debug_support;
+ bool coex_isolation;
bool global_reset;
const struct cfg80211_sar_capa *bios_sar_capa;
bool m3_fw_support;
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index cc8031008..c8409c00a 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2464,7 +2464,7 @@
he_mcs_mask[i])
max_nss = i + 1;
}
- arg->peer_nss = min(sta->deflink.rx_nss, max_nss);
+ arg->peer_nss = min(arg->peer_nss, (u32)max_nss);
if (arg->peer_phymode == MODE_11AX_HE160 ||
arg->peer_phymode == MODE_11AX_HE80_80) {
@@ -4714,6 +4714,7 @@
nss = max_t(u32, 1, nss);
nss = min(nss, ath11k_mac_max_nss(ht_mcs_mask, vht_mcs_mask, he_mcs_mask));
+ nss = min(nss, (u32)ar->num_tx_chains);
if (changed & IEEE80211_RC_BW_CHANGED) {
/* Get the peer phymode */
diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index 09e65c5e5..88f11f6e4 100644
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -108,7 +110,12 @@ static u32 ath11k_pci_window_read32(struct ath11k_base *ab, u32 offset)
struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);
u32 window_start, val;
- window_start = ath11k_pci_get_window_start(ab, offset);
+ if (ab->hw_params.static_window_map)
+ window_start = ath11k_pci_get_window_start(ab, offset);
+ else
+ window_start = ATH11K_PCI_WINDOW_START;
+
+ //window_start = ath11k_pci_get_window_start(ab, offset);
if (window_start == ATH11K_PCI_WINDOW_START) {
spin_lock_bh(&ab_pci->window_lock);
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 442afda7e..2abf307a7 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -4069,6 +4069,7 @@ ath11k_wmi_copy_resource_config(struct wmi_resource_config *wmi_cfg,
wmi_cfg->sched_params = tg_cfg->sched_params;
wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count;
wmi_cfg->twt_ap_sta_count = tg_cfg->twt_ap_sta_count;
+ wmi_cfg->host_service_flags = tg_cfg->host_service_flags;
wmi_cfg->host_service_flags &=
~(1 << WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT);
wmi_cfg->host_service_flags |= (tg_cfg->is_reg_cc_ext_event_supported <<
@@ -9758,3 +9759,29 @@
return test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,
ar->ab->wmi_ab.svc_map) && ar->supports_6ghz;
}
+
+int ath11k_wmi_send_coex_config(struct ath11k *ar,
+ struct wmi_coex_config_params *param)
+{
+ struct ath11k_pdev_wmi *wmi = ar->wmi;
+ struct wmi_coex_config_cmd *cmd;
+ struct sk_buff *skb;
+
+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd));
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_coex_config_cmd *)skb->data;
+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_COEX_CONFIG_CMD) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+ cmd->vdev_id = param->vdev_id;
+ cmd->config_type = param->config_type;
+ cmd->config_arg1 = param->config_arg1;
+ cmd->config_arg2 = param->config_arg2;
+ cmd->config_arg3 = param->config_arg3;
+ cmd->config_arg4 = param->config_arg4;
+ cmd->config_arg5 = param->config_arg5;
+ cmd->config_arg6 = param->config_arg6;
+
+ return ath11k_wmi_cmd_send(wmi, skb, WMI_COEX_CONFIG_CMDID);
+}
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index cd2098d78..7cfe0c0f5 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2332,6 +2332,7 @@ struct wmi_init_cmd {
#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5)
#define WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET BIT(9)
#define WMI_RSRC_CFG_FLAG1_ACK_RSSI BIT(18)
+#define WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_IFACE_SUPPORT BIT(0)
#define WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT 4
@@ -5677,6 +5678,15 @@ struct target_resource_config {
u8 is_reg_cc_ext_event_supported;
u32 ema_max_vap_cnt;
u32 ema_max_profile_period;
+ u32 max_nlo_ssids;
+ u32 num_packet_filters;
+ u32 num_max_sta_vdevs;
+ u32 max_bssid_indicator;
+ u32 ul_resp_config;
+ u32 msdu_flow_override_config0;
+ u32 msdu_flow_override_config1;
+ u32 flags2;
+ u32 host_service_flags;
};
enum wmi_debug_log_param {
@@ -6344,6 +6344,82 @@
const void **ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab,
struct sk_buff *skb, gfp_t gfp);
+enum wmi_coex_config_type {
+ WMI_COEX_CONFIG_PAGE_P2P_TDM = 1,
+ WMI_COEX_CONFIG_PAGE_STA_TDM = 2,
+ WMI_COEX_CONFIG_PAGE_SAP_TDM = 3,
+ WMI_COEX_CONFIG_DURING_WLAN_CONN = 4,
+ WMI_COEX_CONFIG_BTC_ENABLE = 5,
+ WMI_COEX_CONFIG_COEX_DBG = 6,
+ WMI_COEX_CONFIG_PAGE_P2P_STA_TDM = 7,
+ WMI_COEX_CONFIG_INQUIRY_P2P_TDM = 8,
+ WMI_COEX_CONFIG_INQUIRY_STA_TDM = 9,
+ WMI_COEX_CONFIG_INQUIRY_SAP_TDM = 10,
+ WMI_COEX_CONFIG_INQUIRY_P2P_STA_TDM = 11,
+ WMI_COEX_CONFIG_TX_POWER = 12,
+ WMI_COEX_CONFIG_PTA_CONFIG = 13,
+ WMI_COEX_CONFIG_AP_TDM = 14,
+ WMI_COEX_CONFIG_WLAN_SCAN_PRIORITY = 15,
+ WMI_COEX_CONFIG_WLAN_PKT_PRIORITY = 16,
+ WMI_COEX_CONFIG_PTA_INTERFACE = 17,
+ WMI_COEX_CONFIG_BTC_DUTYCYCLE = 18,
+ WMI_COEX_CONFIG_HANDOVER_RSSI = 19,
+ WMI_COEX_CONFIG_PTA_BT_INFO = 20,
+ WMI_COEX_CONFIG_SINK_WLAN_TDM = 21,
+ WMI_COEX_CONFIG_COEX_ENABLE_MCC_TDM = 22,
+ WMI_COEX_CONFIG_LOWRSSI_A2DPOPP_TDM = 23,
+ WMI_COEX_CONFIG_BTC_MODE = 24,
+ WMI_COEX_CONFIG_ANTENNA_ISOLATION = 25,
+ WMI_COEX_CONFIG_BT_LOW_RSSI_THRESHOLD = 26,
+ WMI_COEX_CONFIG_BT_INTERFERENCE_LEVEL = 27,
+ WMI_COEX_CONFIG_WLAN_OVER_ZBLOW = 28,
+ WMI_COEX_CONFIG_WLAN_MGMT_OVER_BT_A2DP = 29,
+ WMI_COEX_CONFIG_WLAN_CONN_OVER_LE = 30,
+ WMI_COEX_CONFIG_LE_OVER_WLAN_TRAFFIC = 31,
+ WMI_COEX_CONFIG_THREE_WAY_COEX_RESET = 32,
+ WMI_COEX_CONFIG_THREE_WAY_DELAY_PARA = 33,
+ WMI_COEX_CONFIG_THREE_WAY_COEX_START = 34,
+ WMI_COEX_CONFIG_MPTA_HELPER_ENABLE = 35,
+ WMI_COEX_CONFIG_MPTA_HELPER_ZIGBEE_STATE = 36,
+ WMI_COEX_CONFIG_MPTA_HELPER_INT_OCS_PARAMS = 37,
+ WMI_COEX_CONFIG_MPTA_HELPER_MON_OCS_PARAMS = 38,
+ WMI_COEX_CONFIG_MPTA_HELPER_INT_MON_DURATION = 39,
+ WMI_COEX_CONFIG_MPTA_HELPER_ZIGBEE_CHANNEL = 40,
+ WMI_COEX_CONFIG_MPTA_HELPER_WLAN_MUTE_DURATION = 41,
+ WMI_COEX_CONFIG_BT_SCO_ALLOW_WLAN_2G_SCAN = 42,
+ WMI_COEX_CONFIG_ENABLE_2ND_HARMONIC_WAR = 43,
+ WMI_COEX_CONFIG_BTCOEX_SEPARATE_CHAIN_MODE = 44,
+ WMI_COEX_CONFIG_ENABLE_TPUT_SHAPING = 45,
+ WMI_COEX_CONFIG_ENABLE_TXBF = 46,
+ WMI_COEX_CONFIG_FORCED_ALGO = 47,
+ WMI_COEX_CONFIG_LE_SCAN_POLICY = 48,
+};
+
+struct wmi_coex_config_params {
+ u32 vdev_id;
+ u32 config_type;
+ u32 config_arg1;
+ u32 config_arg2;
+ u32 config_arg3;
+ u32 config_arg4;
+ u32 config_arg5;
+ u32 config_arg6;
+};
+
+struct wmi_coex_config_cmd {
+ u32 tlv_header;
+ u32 vdev_id;
+ u32 config_type;
+ u32 config_arg1;
+ u32 config_arg2;
+ u32 config_arg3;
+ u32 config_arg4;
+ u32 config_arg5;
+ u32 config_arg6;
+} __packed;
+
+#define WMI_COEX_ISOLATION_ARG1_DEFAUT 30
+
int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb,
u32 cmd_id);
struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len);
@@ -6505,6 +6581,7 @@
const u8 mac_addr[ETH_ALEN]);
int ath11k_wmi_fw_dbglog_cfg(struct ath11k *ar, u32 *module_id_bitmap,
struct ath11k_fw_dbglog *dbglog);
+int ath11k_wmi_send_coex_config(struct ath11k *ar, struct wmi_coex_config_params *param);
int ath11k_wmi_wow_config_pno(struct ath11k *ar, u32 vdev_id,
struct wmi_pno_scan_req *pno_scan);
int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id);
--
2.44.0
|
