blob: b31d52141acb89ec06c1e1e0aa32f6c1653e42dd [file] [log] [blame]
developerdb40e3c2022-08-09 15:36:12 -07001From f815c6befdd5b0185ae476d649e3eff58d6e9b69 Mon Sep 17 00:00:00 2001
2From: TomLiu <tomml.liu@mediatek.com>
3Date: Tue, 9 Aug 2022 10:23:44 -0700
4Subject: [PATCH] [PATCH-920]Add hostapd HEMU SET/GET control
5
6---
7 hostapd/config_file.c | 9 +++
8 hostapd/ctrl_iface.c | 62 +++++++++++++++++
9 hostapd/hostapd_cli.c | 18 +++++
10 src/ap/ap_config.c | 1 +
11 src/ap/ap_config.h | 1 +
12 src/ap/ap_drv_ops.c | 14 ++++
13 src/ap/ap_drv_ops.h | 2 +
14 src/ap/hostapd.c | 2 +
15 src/common/mtk_vendor.h | 15 ++++
16 src/drivers/driver.h | 13 ++++
17 src/drivers/driver_nl80211.c | 110 ++++++++++++++++++++++++++++++
18 src/drivers/driver_nl80211.h | 1 +
19 src/drivers/driver_nl80211_capa.c | 3 +
20 13 files changed, 251 insertions(+)
21
22diff --git a/hostapd/config_file.c b/hostapd/config_file.c
23index 19a2fd5..85d58cd 100644
24--- a/hostapd/config_file.c
25+++ b/hostapd/config_file.c
26@@ -3655,6 +3655,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
27 return 1;
28 }
29 bss->unsol_bcast_probe_resp_interval = val;
30+ } else if (os_strcmp(buf, "hemu_onoff") == 0) {
31+ int val = atoi(pos);
32+ if (val < 0 || val > 15) {
33+ wpa_printf(MSG_ERROR,
34+ "Line %d: invalid hemu_onoff value",
35+ line);
36+ return 1;
37+ }
38+ conf->hemu_onoff = val;
39 #endif /* CONFIG_IEEE80211AX */
40 } else if (os_strcmp(buf, "max_listen_interval") == 0) {
41 bss->max_listen_interval = atoi(pos);
42diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
43index 5e9af7f..5df5c84 100644
44--- a/hostapd/ctrl_iface.c
45+++ b/hostapd/ctrl_iface.c
46@@ -3399,6 +3399,63 @@ hostapd_ctrl_iface_apply_edcca(struct hostapd_data *hapd, char *buf,
47 }
48
49
50+static int
51+hostapd_ctrl_iface_set_hemu(struct hostapd_data *hapd, char *cmd,
52+ char *buf, size_t buflen)
53+{
54+ char *pos, *config, *value;
55+ config = cmd;
56+ pos = os_strchr(config, ' ');
57+ if (pos == NULL)
58+ return -1;
59+ *pos++ = '\0';
60+
61+ if(pos == NULL)
62+ return -1;
63+ value = pos;
64+
65+ if (os_strcmp(config, "onoff") == 0) {
66+ int hemu = atoi(value);
67+ if (hemu < 0 || hemu > 15) {
68+ wpa_printf(MSG_ERROR, "Invalid value for hemu");
69+ return -1;
70+ }
71+ hapd->iconf->hemu_onoff = (u8) hemu;
72+ } else {
73+ wpa_printf(MSG_ERROR,
74+ "Unsupported parameter %s for SET_HEMU", config);
75+ return -1;
76+ }
77+
78+ if(hostapd_drv_hemu_ctrl(hapd) == 0) {
79+ return os_snprintf(buf, buflen, "OK\n");
80+ } else {
81+ return -1;
82+ }
83+}
84+
85+
86+static int
87+hostapd_ctrl_iface_get_hemu(struct hostapd_data *hapd, char *buf,
88+ size_t buflen)
89+{
90+ u8 hemu_onoff;
91+ char *pos, *end;
92+
93+ pos = buf;
94+ end = buf + buflen;
95+
96+ if (hostapd_drv_hemu_dump(hapd, &hemu_onoff) == 0) {
97+ hapd->iconf->hemu_onoff = hemu_onoff;
98+ return os_snprintf(pos, end - pos, "[hostapd_cli] = UL MU-MIMO: %d, DL MU-MIMO: %d, UL OFDMA: %d, DL OFDMA: %d\n",
99+ !!(hemu_onoff&BIT(3)), !!(hemu_onoff&BIT(2)), !!(hemu_onoff&BIT(1)), !!(hemu_onoff&BIT(0)));
100+ } else {
101+ wpa_printf(MSG_INFO, "ctrl iface failed to call");
102+ return -1;
103+ }
104+}
105+
106+
107 static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
108 char *buf, char *reply,
109 int reply_size,
110@@ -3939,6 +3996,11 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd,
111 reply_len = hostapd_ctrl_iface_get_edcca(hapd, reply, reply_size);
112 } else if (os_strncmp(buf, "APPLY_EDCCA", 11) == 0) {
113 reply_len = hostapd_ctrl_iface_apply_edcca(hapd, reply, reply_size);
114+ } else if (os_strncmp(buf, "SET_HEMU ", 9) == 0) {
115+ reply_len = hostapd_ctrl_iface_set_hemu(hapd, buf+9, reply,
116+ reply_size);
117+ } else if (os_strncmp(buf, "GET_HEMU", 8) == 0) {
118+ reply_len = hostapd_ctrl_iface_get_hemu(hapd, reply, reply_size);
119 } else {
120 os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
121 reply_len = 16;
122diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
123index 68133d4..41d244a 100644
124--- a/hostapd/hostapd_cli.c
125+++ b/hostapd/hostapd_cli.c
126@@ -1380,6 +1380,20 @@ static int hostapd_cli_cmd_driver_flags(struct wpa_ctrl *ctrl, int argc,
127 }
128
129
130+static int hostapd_cli_cmd_set_hemu(struct wpa_ctrl *ctrl, int argc,
131+ char *argv[])
132+{
133+ return hostapd_cli_cmd(ctrl, "SET_HEMU", 1, argc, argv);
134+}
135+
136+
137+static int hostapd_cli_cmd_get_hemu(struct wpa_ctrl *ctrl, int argc,
138+ char *argv[])
139+{
140+ return hostapd_cli_cmd(ctrl, "GET_HEMU", 0, NULL, NULL);
141+}
142+
143+
144 #ifdef CONFIG_DPP
145
146 static int hostapd_cli_cmd_dpp_qr_code(struct wpa_ctrl *ctrl, int argc,
147@@ -1696,6 +1710,10 @@ static const struct hostapd_cli_cmd hostapd_cli_commands[] = {
148 " = send FTM range request"},
149 { "driver_flags", hostapd_cli_cmd_driver_flags, NULL,
150 " = show supported driver flags"},
151+ { "set_hemu", hostapd_cli_cmd_set_hemu, NULL,
152+ "<value> [0-15] bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0)"},
153+ { "get_hemu", hostapd_cli_cmd_get_hemu, NULL,
154+ " = show hemu onoff value in 0-15 bitmap"},
155 #ifdef CONFIG_DPP
156 { "dpp_qr_code", hostapd_cli_cmd_dpp_qr_code, NULL,
157 "report a scanned DPP URI from a QR Code" },
158diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
159index 427f16e..79e215f 100644
160--- a/src/ap/ap_config.c
161+++ b/src/ap/ap_config.c
162@@ -280,6 +280,7 @@ struct hostapd_config * hostapd_config_defaults(void)
163 conf->he_6ghz_max_ampdu_len_exp = 7;
164 conf->he_6ghz_rx_ant_pat = 1;
165 conf->he_6ghz_tx_ant_pat = 1;
166+ conf->hemu_onoff = 13;
167 #endif /* CONFIG_IEEE80211AX */
168
169 /* The third octet of the country string uses an ASCII space character
170diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
171index 9bbe7eb..737cc2f 100644
172--- a/src/ap/ap_config.h
173+++ b/src/ap/ap_config.h
174@@ -1111,6 +1111,7 @@ struct hostapd_config {
175 u8 he_6ghz_rx_ant_pat;
176 u8 he_6ghz_tx_ant_pat;
177 u8 he_6ghz_reg_pwr_type;
178+ u8 hemu_onoff;
179 #endif /* CONFIG_IEEE80211AX */
180
181 /* VHT enable/disable config from CHAN_SWITCH */
182diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
183index b8b98e4..3de6748 100644
184--- a/src/ap/ap_drv_ops.c
185+++ b/src/ap/ap_drv_ops.c
186@@ -1021,3 +1021,17 @@ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd)
187 hapd->iconf->edcca_enable,
188 hapd->iconf->edcca_compensation);
189 }
190+
191+int hostapd_drv_hemu_ctrl(struct hostapd_data *hapd)
192+{
193+ if (!hapd->driver || !hapd->driver->hemu_ctrl)
194+ return 0;
195+ return hapd->driver->hemu_ctrl(hapd->drv_priv, hapd->iconf->hemu_onoff);
196+}
197+
198+int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff)
199+{
200+ if (!hapd->driver || !hapd->driver->hemu_dump)
201+ return 0;
202+ return hapd->driver->hemu_dump(hapd->drv_priv, hemu_onoff);
203+}
204diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
205index f8fef19..5bcb225 100644
206--- a/src/ap/ap_drv_ops.h
207+++ b/src/ap/ap_drv_ops.h
208@@ -139,6 +139,8 @@ int hostapd_drv_update_dh_ie(struct hostapd_data *hapd, const u8 *peer,
209 u16 reason_code, const u8 *ie, size_t ielen);
210 int hostapd_drv_dpp_listen(struct hostapd_data *hapd, bool enable);
211 int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd);
212+int hostapd_drv_hemu_ctrl(struct hostapd_data *hapd);
213+int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff);
214
215 #include "drivers/driver.h"
216
217diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
218index c1edaab..3b752fc 100644
219--- a/src/ap/hostapd.c
220+++ b/src/ap/hostapd.c
221@@ -2297,6 +2297,8 @@ dfs_offload:
222
223 if (hostapd_drv_configure_edcca_threshold(hapd) < 0)
224 goto fail;
225+ if (hostapd_drv_hemu_ctrl(hapd) < 0)
226+ goto fail;
227
228 wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
229 iface->bss[0]->conf->iface);
230diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
231index 528387f..5c8f179 100644
232--- a/src/common/mtk_vendor.h
233+++ b/src/common/mtk_vendor.h
234@@ -10,6 +10,8 @@ enum mtk_nl80211_vendor_subcmds {
235 MTK_NL80211_VENDOR_SUBCMD_CSI_CTRL = 0xc2,
236 MTK_NL80211_VENDOR_SUBCMD_RFEATURE_CTRL = 0xc3,
237 MTK_NL80211_VENDOR_SUBCMD_WIRELESS_CTRL = 0xc4,
238+ MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL = 0xc5,
239+ MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
240 MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
241 };
242
243@@ -167,6 +169,19 @@ enum mtk_vendor_attr_rfeature_ctrl {
244 NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL - 1
245 };
246
247+enum mtk_vendor_attr_hemu_ctrl {
248+ MTK_VENDOR_ATTR_HEMU_CTRL_UNSPEC,
249+
250+ MTK_VENDOR_ATTR_HEMU_CTRL_ONOFF,
251+ MTK_VENDOR_ATTR_HEMU_CTRL_DUMP,
252+
253+ /* keep last */
254+ NUM_MTK_VENDOR_ATTRS_HEMU_CTRL,
255+ MTK_VENDOR_ATTR_HEMU_CTRL_MAX =
256+ NUM_MTK_VENDOR_ATTRS_HEMU_CTRL - 1
257+};
258+
259+
260 #define CSI_MAX_COUNT 256
261 #define ETH_ALEN 6
262
263diff --git a/src/drivers/driver.h b/src/drivers/driver.h
264index fc96fef..6cc7e9b 100644
265--- a/src/drivers/driver.h
266+++ b/src/drivers/driver.h
267@@ -1622,6 +1622,11 @@ struct wpa_driver_ap_params {
268 * Unsolicited broadcast Probe Response template length
269 */
270 size_t unsol_bcast_probe_resp_tmpl_len;
271+
272+ /**
273+ * hemu onoff=<val> (bitmap- UL MU-MIMO(bit3), DL MU-MIMO(bit2), UL OFDMA(bit1), DL OFDMA(bit0))
274+ */
275+ u8 hemu_onoff;
276 };
277
278 struct wpa_driver_mesh_bss_params {
279@@ -4675,6 +4680,14 @@ struct wpa_driver_ops {
280 #endif /* CONFIG_TESTING_OPTIONS */
281 int (*configure_edcca_threshold)(void *priv, const u8 edcca_enable,
282 const s8 edcca_compensation);
283+
284+ /**
285+ * hemu_ctrl - ctrl on off for UL/DL MURU
286+ * @priv: Private driver interface data
287+ *
288+ */
289+ int (*hemu_ctrl)(void *priv, u8 hemu_onoff);
290+ int (*hemu_dump)(void *priv, u8 *hemu_onoff);
291 };
292
293 /**
294diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
295index b1e7b16..021a593 100644
296--- a/src/drivers/driver_nl80211.c
297+++ b/src/drivers/driver_nl80211.c
298@@ -12287,6 +12287,114 @@ fail:
299 }
300
301
302+#ifdef CONFIG_IEEE80211AX
303+static int nl80211_hemu_muruonoff(void *priv, u8 hemu_onoff)
304+{
305+ struct i802_bss *bss = priv;
306+ struct wpa_driver_nl80211_data *drv = bss->drv;
307+ struct nl_msg *msg;
308+ struct nlattr *data;
309+ int ret;
310+
311+ if (!drv->mtk_hemu_vendor_cmd_avail) {
312+ wpa_printf(MSG_INFO,
313+ "nl80211: Driver does not support setting hemu control");
314+ return 0;
315+ }
316+
317+ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
318+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
319+ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL) ||
320+ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
321+ nla_put_u8(msg, MTK_VENDOR_ATTR_HEMU_CTRL_ONOFF, hemu_onoff)) {
322+ nlmsg_free(msg);
323+ return -ENOBUFS;
324+ }
325+ nla_nest_end(msg, data);
326+ ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
327+ if(ret){
328+ wpa_printf(MSG_ERROR, "Failed to set hemu_onoff. ret=%d (%s)", ret, strerror(-ret));
329+ }
330+ return ret;
331+}
332+
333+
334+static int hemu_dump_handler(struct nl_msg *msg, void *arg)
335+{
336+ u8 *hemu_onoff = (u8 *) arg;
337+ struct nlattr *tb[NL80211_ATTR_MAX + 1];
338+ struct nlattr *tb_vendor[MTK_VENDOR_ATTR_HEMU_CTRL_MAX + 1];
339+ struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
340+ struct nlattr *nl_vend, *attr;
341+
342+ static const struct nla_policy
343+ hemu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_HEMU_CTRL + 1] = {
344+ [MTK_VENDOR_ATTR_HEMU_CTRL_ONOFF] = {.type = NLA_U8 },
345+ [MTK_VENDOR_ATTR_HEMU_CTRL_DUMP] = {.type = NLA_U8 },
346+ };
347+
348+ nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
349+ genlmsg_attrlen(gnlh, 0), NULL);
350+
351+ nl_vend = tb[NL80211_ATTR_VENDOR_DATA];
352+ if (!nl_vend)
353+ return NL_SKIP;
354+
355+ nla_parse(tb_vendor, MTK_VENDOR_ATTR_HEMU_CTRL_MAX,
356+ nla_data(nl_vend), nla_len(nl_vend), NULL);
357+
358+ attr = tb_vendor[MTK_VENDOR_ATTR_HEMU_CTRL_DUMP];
359+ if (!attr) {
360+ wpa_printf(MSG_ERROR, "nl80211: cannot find MTK_VENDOR_ATTR_HEMU_CTRL_DUMP");
361+ return NL_SKIP;
362+ }
363+
364+ *hemu_onoff = nla_get_u8(attr);
365+ wpa_printf(MSG_DEBUG, "nla_get hemu_onoff: %d\n", *hemu_onoff);
366+
367+ return 0;
368+}
369+
370+static int nl80211_hemu_dump(void *priv, u8 *hemu_onoff)
371+{
372+ struct i802_bss *bss = priv;
373+ struct wpa_driver_nl80211_data *drv = bss->drv;
374+ struct nl_msg *msg;
375+ struct nlattr *attr;
376+ int ret;
377+
378+ if (!drv->mtk_hemu_vendor_cmd_avail) {
379+ wpa_printf(MSG_INFO,
380+ "nl80211: Driver does not support setting hemu control");
381+ return 0;
382+ }
383+
384+ if (!(msg = nl80211_drv_msg(drv, NLM_F_DUMP, NL80211_CMD_VENDOR)) ||
385+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
386+ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL)) {
387+ nlmsg_free(msg);
388+ return -ENOBUFS;
389+ }
390+
391+ attr = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
392+ if (!attr) {
393+ nlmsg_free(msg);
394+ return -1;
395+ }
396+
397+ nla_nest_end(msg, attr);
398+
399+ ret = send_and_recv_msgs(drv, msg, hemu_dump_handler, hemu_onoff, NULL, NULL);
400+
401+ if(ret){
402+ wpa_printf(MSG_ERROR, "Failed to get hemu_onoff. ret=%d (%s)", ret, strerror(-ret));
403+ }
404+
405+ return ret;
406+}
407+#endif /* CONFIG_IEEE80211AX */
408+
409+
410 #ifdef CONFIG_DPP
411 static int nl80211_dpp_listen(void *priv, bool enable)
412 {
413@@ -12531,6 +12639,8 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
414 .update_connect_params = nl80211_update_connection_params,
415 .send_external_auth_status = nl80211_send_external_auth_status,
416 .set_4addr_mode = nl80211_set_4addr_mode,
417+ .hemu_ctrl = nl80211_hemu_muruonoff,
418+ .hemu_dump = nl80211_hemu_dump,
419 #ifdef CONFIG_DPP
420 .dpp_listen = nl80211_dpp_listen,
421 #endif /* CONFIG_DPP */
422diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
423index b677907..62d9696 100644
424--- a/src/drivers/driver_nl80211.h
425+++ b/src/drivers/driver_nl80211.h
426@@ -181,6 +181,7 @@ struct wpa_driver_nl80211_data {
427 unsigned int qca_do_acs:1;
428 unsigned int brcm_do_acs:1;
429 unsigned int mtk_edcca_vendor_cmd_avail:1;
430+ unsigned int mtk_hemu_vendor_cmd_avail:1;
431
432 u64 vendor_scan_cookie;
433 u64 remain_on_chan_cookie;
434diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
435index 6c743bf..b5cd2c5 100644
436--- a/src/drivers/driver_nl80211_capa.c
437+++ b/src/drivers/driver_nl80211_capa.c
438@@ -1050,6 +1050,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
439 case MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL :
440 drv->mtk_edcca_vendor_cmd_avail = 1;
441 break;
442+ case MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL :
443+ drv->mtk_hemu_vendor_cmd_avail = 1;
444+ break;
445 }
446 }
447
448--
4492.32.0
450