Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / 8f0138ae0ddc7f6470c1bf77bbe1320b5216a7f8 / . / autobuild_mac80211_release / package / network / services / hostapd / patches / 921-Add-three-wire-PTA-ctrl-hostapd-vendor-command.patch
blob: 52578984706f32ab8fc322de1b535bb3eeda7166 [file] [log] [blame]
developer8f0138a2022-09-01 21:20:56 +0800[diff] [blame^]1From fc638478a8a2eb45e023557bee5c0aefdf0bba6d Mon Sep 17 00:00:00 2001
2From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
3Date: Fri, 2 Sep 2022 01:03:23 +0800
4Subject: [PATCH] Add three wire PTA ctrl hostapd vendor command
5
6Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
7---
8 hostapd/config_file.c | 4 ++++
9 src/ap/ap_config.c | 1 +
10 src/ap/ap_config.h | 13 ++++++++++++
11 src/ap/ap_drv_ops.c | 11 +++++++++++
12 src/ap/ap_drv_ops.h | 1 +
13 src/ap/hostapd.c | 2 ++
14 src/common/mtk_vendor.h | 16 +++++++++++++++
15 src/drivers/driver.h | 1 +
16 src/drivers/driver_nl80211.c | 33 +++++++++++++++++++++++++++++++
17 src/drivers/driver_nl80211.h | 1 +
18 src/drivers/driver_nl80211_capa.c | 3 +++
19 11 files changed, 86 insertions(+)
20
21diff --git a/hostapd/config_file.c b/hostapd/config_file.c
22index 85d58cd..ee5decb 100644
23--- a/hostapd/config_file.c
24+++ b/hostapd/config_file.c
25@@ -4770,6 +4770,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
26 return 1;
27 }
28 conf->edcca_compensation = (s8) val;
29+ } else if (os_strcmp(buf, "three_wire_enable") == 0) {
30+ u8 en = atoi(pos);
31+
32+ conf->three_wire_enable = en;
33 } else {
34 wpa_printf(MSG_ERROR,
35 "Line %d: unknown configuration item '%s'",
36diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
37index 79e215f..34e4fb1 100644
38--- a/src/ap/ap_config.c
39+++ b/src/ap/ap_config.c
40@@ -297,6 +297,7 @@ struct hostapd_config * hostapd_config_defaults(void)
41
42 conf->edcca_enable = EDCCA_MODE_AUTO;
43 conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
44+ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
45
46 return conf;
47 }
48diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
49index 737cc2f..1402891 100644
50--- a/src/ap/ap_config.h
51+++ b/src/ap/ap_config.h
52@@ -1153,6 +1153,7 @@ struct hostapd_config {
53 unsigned int ch_switch_eht_config;
54 u8 edcca_enable;
55 s8 edcca_compensation;
56+ u8 three_wire_enable;
57 };
58
59 enum edcca_mode {
60@@ -1164,6 +1165,18 @@ enum edcca_mode {
61 #define EDCCA_MIN_COMPENSATION -126
62 #define EDCCA_MAX_COMPENSATION 126
63
64+enum three_wire_mode {
65+ THREE_WIRE_MODE_DISABLE,
66+ THREE_WIRE_MODE_EXT0_ENABLE,
67+ THREE_WIRE_MODE_EXT1_ENABLE,
68+ THREE_WIRE_MODE_ALL_ENABLE,
69+
70+ /* keep last */
71+ NUM_THREE_WIRE_MODE,
72+ THREE_WIRE_MODE_MAX =
73+ NUM_THREE_WIRE_MODE - 1
74+};
75+
76 static inline u8 hostapd_get_oper_chwidth(struct hostapd_config *conf)
77 {
78 #ifdef CONFIG_IEEE80211BE
79diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
80index 3de6748..a48c22e 100644
81--- a/src/ap/ap_drv_ops.c
82+++ b/src/ap/ap_drv_ops.c
83@@ -1035,3 +1035,14 @@ int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff)
84 return 0;
85 return hapd->driver->hemu_dump(hapd->drv_priv, hemu_onoff);
86 }
87+
88+int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd)
89+{
90+ if (!hapd->driver || !hapd->driver->three_wire_ctrl)
91+ return 0;
92+ if (hapd->iconf->three_wire_enable > THREE_WIRE_MODE_MAX) {
93+ wpa_printf(MSG_INFO, "Invalid value for three wire enable\n");
94+ return 0;
95+ }
96+ return hapd->driver->three_wire_ctrl(hapd->drv_priv, hapd->iconf->three_wire_enable);
97+}
98diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
99index 5bcb225..0a8bf0c 100644
100--- a/src/ap/ap_drv_ops.h
101+++ b/src/ap/ap_drv_ops.h
102@@ -141,6 +141,7 @@ int hostapd_drv_dpp_listen(struct hostapd_data *hapd, bool enable);
103 int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd);
104 int hostapd_drv_hemu_ctrl(struct hostapd_data *hapd);
105 int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff);
106+int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
107
108 #include "drivers/driver.h"
109
110diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
111index 3b752fc..0c02171 100644
112--- a/src/ap/hostapd.c
113+++ b/src/ap/hostapd.c
114@@ -2299,6 +2299,8 @@ dfs_offload:
115 goto fail;
116 if (hostapd_drv_hemu_ctrl(hapd) < 0)
117 goto fail;
118+ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
119+ goto fail;
120
121 wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
122 iface->bss[0]->conf->iface);
123diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
124index 5c8f179..99a4d7f 100644
125--- a/src/common/mtk_vendor.h
126+++ b/src/common/mtk_vendor.h
127@@ -13,6 +13,7 @@ enum mtk_nl80211_vendor_subcmds {
128 MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL = 0xc5,
129 MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
130 MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
131+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8
132 };
133
134 enum mtk_vendor_attr_edcca_ctrl {
135@@ -48,6 +49,21 @@ static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
136 [MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE] = { .type = NLA_U8 },
137 };
138
139+enum mtk_vendor_attr_3wire_ctrl {
140+ MTK_VENDOR_ATTR_3WIRE_CTRL_UNSPEC,
141+
142+ MTK_VENDOR_ATTR_3WIRE_CTRL_MODE,
143+
144+ /* keep last */
145+ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL,
146+ MTK_VENDOR_ATTR_3WIRE_CTRL_MAX =
147+ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL - 1
148+};
149+
150+static struct nla_policy three_wire_ctrl_policy[NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL] = {
151+ [MTK_VENDOR_ATTR_3WIRE_CTRL_MODE] = {.type = NLA_U8 },
152+};
153+
154 enum mtk_vendor_attr_csi_ctrl {
155 MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
156
157diff --git a/src/drivers/driver.h b/src/drivers/driver.h
158index 6cc7e9b..0048120 100644
159--- a/src/drivers/driver.h
160+++ b/src/drivers/driver.h
161@@ -4688,6 +4688,7 @@ struct wpa_driver_ops {
162 */
163 int (*hemu_ctrl)(void *priv, u8 hemu_onoff);
164 int (*hemu_dump)(void *priv, u8 *hemu_onoff);
165+ int (*three_wire_ctrl)(void *priv, u8 three_wire_enable);
166 };
167
168 /**
169diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
170index 0009fb4..5834720 100644
171--- a/src/drivers/driver_nl80211.c
172+++ b/src/drivers/driver_nl80211.c
173@@ -12500,6 +12500,38 @@ static int nl80211_configure_edcca_threshold(void *priv,
174 return ret;
175 }
176
177+static int nl80211_enable_three_wire(void *priv, const u8 three_wire_enable)
178+{
179+ struct i802_bss *bss = priv;
180+ struct wpa_driver_nl80211_data *drv = bss->drv;
181+ /* Prepare nl80211 cmd */
182+ struct nl_msg *msg;
183+ struct nlattr *data;
184+ int ret;
185+
186+ if (!drv->mtk_3wire_vendor_cmd_avail) {
187+ wpa_printf(MSG_INFO,
188+ "nl80211: Driver does not support setting three wire control");
189+ return 0;
190+ }
191+
192+ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
193+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
194+ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
195+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL) ||
196+ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
197+ nla_put_u8(msg, MTK_VENDOR_ATTR_3WIRE_CTRL_MODE, three_wire_enable)) {
198+ nlmsg_free(msg);
199+ return -ENOBUFS;
200+ }
201+ nla_nest_end(msg, data);
202+ ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
203+ if (ret) {
204+ wpa_printf(MSG_ERROR, "Failed to enable three wire. ret=%d (%s) ",
205+ ret, strerror(-ret));
206+ }
207+ return ret;
208+}
209
210 const struct wpa_driver_ops wpa_driver_nl80211_ops = {
211 .name = "nl80211",
212@@ -12650,4 +12682,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
213 #endif /* CONFIG_TESTING_OPTIONS */
214 /* Need ifdef CONFIG_DRIVER_NL80211_MTK */
215 .configure_edcca_threshold = nl80211_configure_edcca_threshold,
216+ .three_wire_ctrl = nl80211_enable_three_wire,
217 };
218diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
219index 62d9696..196d24f 100644
220--- a/src/drivers/driver_nl80211.h
221+++ b/src/drivers/driver_nl80211.h
222@@ -182,6 +182,7 @@ struct wpa_driver_nl80211_data {
223 unsigned int brcm_do_acs:1;
224 unsigned int mtk_edcca_vendor_cmd_avail:1;
225 unsigned int mtk_hemu_vendor_cmd_avail:1;
226+ unsigned int mtk_3wire_vendor_cmd_avail:1;
227
228 u64 vendor_scan_cookie;
229 u64 remain_on_chan_cookie;
230diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
231index b5cd2c5..f0397f5 100644
232--- a/src/drivers/driver_nl80211_capa.c
233+++ b/src/drivers/driver_nl80211_capa.c
234@@ -1053,6 +1053,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
235 case MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL :
236 drv->mtk_hemu_vendor_cmd_avail = 1;
237 break;
238+ case MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL :
239+ drv->mtk_3wire_vendor_cmd_avail = 1;
240+ break;
241 }
242 }
243
244--
2452.18.0
246