Gitiles
Code Review Sign In
git01.mediatek.com / filogic / rdk-b / meta-filogic / 092b55c100db5654a2947422962f5f2025e0c6b1 / . / recipes-wifi / hostapd / files / patches-2.10.3 / 99906-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-.patch
blob: 594e476df40f5bd9cd6ba87af7ba578843479056 [file] [log] [blame]
developer092b55c2023-01-18 18:20:58 +0800[diff] [blame^]1From c91612769eba54821da1136d5959a40438c02824 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 99906/99910] hostapd: mtk: Add three wire PTA ctrl hostapd
5 vendor command
6
7Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
8---
9 hostapd/config_file.c | 4 ++++
10 src/ap/ap_config.c | 1 +
11 src/ap/ap_config.h | 13 ++++++++++++
12 src/ap/ap_drv_ops.c | 11 +++++++++++
13 src/ap/ap_drv_ops.h | 1 +
14 src/ap/hostapd.c | 2 ++
15 src/common/mtk_vendor.h | 16 +++++++++++++++
16 src/drivers/driver.h | 8 ++++++++
17 src/drivers/driver_nl80211.c | 33 +++++++++++++++++++++++++++++++
18 src/drivers/driver_nl80211.h | 1 +
19 src/drivers/driver_nl80211_capa.c | 3 +++
20 11 files changed, 93 insertions(+)
21
22diff --git a/hostapd/config_file.c b/hostapd/config_file.c
23index b22d10b..18b372a 100644
24--- a/hostapd/config_file.c
25+++ b/hostapd/config_file.c
26@@ -4794,6 +4794,10 @@ static int hostapd_config_fill(struct hostapd_config *conf,
27 return 1;
28 }
29 conf->edcca_compensation = (s8) val;
30+ } else if (os_strcmp(buf, "three_wire_enable") == 0) {
31+ u8 en = atoi(pos);
32+
33+ conf->three_wire_enable = en;
34 } else {
35 wpa_printf(MSG_ERROR,
36 "Line %d: unknown configuration item '%s'",
37diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
38index 0e1f192..9249a6b 100644
39--- a/src/ap/ap_config.c
40+++ b/src/ap/ap_config.c
41@@ -297,6 +297,7 @@ struct hostapd_config * hostapd_config_defaults(void)
42
43 conf->edcca_enable = EDCCA_MODE_AUTO;
44 conf->edcca_compensation = EDCCA_DEFAULT_COMPENSATION;
45+ conf->three_wire_enable = THREE_WIRE_MODE_DISABLE;
46
47 return conf;
48 }
49diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
50index 41b8c68..71cf515 100644
51--- a/src/ap/ap_config.h
52+++ b/src/ap/ap_config.h
53@@ -1157,6 +1157,19 @@ struct hostapd_config {
54 u8 edcca_enable;
55 s8 edcca_compensation;
56 int *edcca_threshold;
57+ u8 three_wire_enable;
58+};
59+
60+enum three_wire_mode {
61+ THREE_WIRE_MODE_DISABLE,
62+ THREE_WIRE_MODE_EXT0_ENABLE,
63+ THREE_WIRE_MODE_EXT1_ENABLE,
64+ THREE_WIRE_MODE_ALL_ENABLE,
65+
66+ /* keep last */
67+ NUM_THREE_WIRE_MODE,
68+ THREE_WIRE_MODE_MAX =
69+ NUM_THREE_WIRE_MODE - 1
70 };
71
72 enum edcca_mode {
73diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
74index 4598737..a1d83e4 100644
75--- a/src/ap/ap_drv_ops.c
76+++ b/src/ap/ap_drv_ops.c
77@@ -1053,3 +1053,14 @@ int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff)
78 return 0;
79 return hapd->driver->hemu_dump(hapd->drv_priv, hemu_onoff);
80 }
81+
82+int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd)
83+{
84+ if (!hapd->driver || !hapd->driver->three_wire_ctrl)
85+ return 0;
86+ if (hapd->iconf->three_wire_enable > THREE_WIRE_MODE_MAX) {
87+ wpa_printf(MSG_INFO, "Invalid value for three wire enable\n");
88+ return 0;
89+ }
90+ return hapd->driver->three_wire_ctrl(hapd->drv_priv, hapd->iconf->three_wire_enable);
91+}
92diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
93index bca39c5..5ba6297 100644
94--- a/src/ap/ap_drv_ops.h
95+++ b/src/ap/ap_drv_ops.h
96@@ -144,6 +144,7 @@ int hostapd_drv_configure_edcca_threshold(struct hostapd_data *hapd,
97 int hostapd_drv_get_edcca(struct hostapd_data *hapd, const u8 mode, u8 *value);
98 int hostapd_drv_hemu_ctrl(struct hostapd_data *hapd);
99 int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff);
100+int hostapd_drv_three_wire_ctrl(struct hostapd_data *hapd);
101
102 #include "drivers/driver.h"
103
104diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
105index 921769d..f9dabdf 100644
106--- a/src/ap/hostapd.c
107+++ b/src/ap/hostapd.c
108@@ -2303,6 +2303,8 @@ dfs_offload:
109 goto fail;
110 if (hostapd_drv_hemu_ctrl(hapd) < 0)
111 goto fail;
112+ if (hostapd_drv_three_wire_ctrl(hapd) < 0)
113+ goto fail;
114
115 wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
116 iface->bss[0]->conf->iface);
117diff --git a/src/common/mtk_vendor.h b/src/common/mtk_vendor.h
118index 69a46df..ee5a4f4 100644
119--- a/src/common/mtk_vendor.h
120+++ b/src/common/mtk_vendor.h
121@@ -13,6 +13,7 @@ enum mtk_nl80211_vendor_subcmds {
122 MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL = 0xc5,
123 MTK_NL80211_VENDOR_SUBCMD_PHY_CAPA_CTRL= 0xc6,
124 MTK_NL80211_VENDOR_SUBCMD_EDCCA_CTRL = 0xc7,
125+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL = 0xc8
126 };
127
128 enum mtk_vendor_attr_edcca_ctrl {
129@@ -55,6 +56,21 @@ static struct nla_policy edcca_ctrl_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_CTRL] = {
130 [MTK_VENDOR_ATTR_EDCCA_CTRL_COMPENSATE] = { .type = NLA_U8 },
131 };
132
133+enum mtk_vendor_attr_3wire_ctrl {
134+ MTK_VENDOR_ATTR_3WIRE_CTRL_UNSPEC,
135+
136+ MTK_VENDOR_ATTR_3WIRE_CTRL_MODE,
137+
138+ /* keep last */
139+ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL,
140+ MTK_VENDOR_ATTR_3WIRE_CTRL_MAX =
141+ NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL - 1
142+};
143+
144+static struct nla_policy three_wire_ctrl_policy[NUM_MTK_VENDOR_ATTRS_3WIRE_CTRL] = {
145+ [MTK_VENDOR_ATTR_3WIRE_CTRL_MODE] = {.type = NLA_U8 },
146+};
147+
148 enum mtk_vendor_attr_csi_ctrl {
149 MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
150
151diff --git a/src/drivers/driver.h b/src/drivers/driver.h
152index 4cd7505..9ca19af 100644
153--- a/src/drivers/driver.h
154+++ b/src/drivers/driver.h
155@@ -4693,6 +4693,14 @@ struct wpa_driver_ops {
156 */
157 int (*hemu_ctrl)(void *priv, u8 hemu_onoff);
158 int (*hemu_dump)(void *priv, u8 *hemu_onoff);
159+
160+ /**
161+ * three_wire_ctrl - set three_wire_ctrl mode
162+ * @priv: Private driver interface data
163+ * @three_wire_enable: three_wire_ctrl mode
164+ *
165+ */
166+ int (*three_wire_ctrl)(void *priv, u8 three_wire_enable);
167 };
168
169 /**
170diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
171index 73dee2e..2bb8cc2 100644
172--- a/src/drivers/driver_nl80211.c
173+++ b/src/drivers/driver_nl80211.c
174@@ -12637,6 +12637,38 @@ static int nl80211_get_edcca(void *priv, const u8 mode, u8 *value)
175 return ret;
176 }
177
178+static int nl80211_enable_three_wire(void *priv, const u8 three_wire_enable)
179+{
180+ struct i802_bss *bss = priv;
181+ struct wpa_driver_nl80211_data *drv = bss->drv;
182+ /* Prepare nl80211 cmd */
183+ struct nl_msg *msg;
184+ struct nlattr *data;
185+ int ret;
186+
187+ if (!drv->mtk_3wire_vendor_cmd_avail) {
188+ wpa_printf(MSG_INFO,
189+ "nl80211: Driver does not support setting three wire control");
190+ return 0;
191+ }
192+
193+ if (!(msg = nl80211_drv_msg(drv, 0, NL80211_CMD_VENDOR)) ||
194+ nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_MTK) ||
195+ nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
196+ MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL) ||
197+ !(data = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA)) ||
198+ nla_put_u8(msg, MTK_VENDOR_ATTR_3WIRE_CTRL_MODE, three_wire_enable)) {
199+ nlmsg_free(msg);
200+ return -ENOBUFS;
201+ }
202+ nla_nest_end(msg, data);
203+ ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
204+ if (ret) {
205+ wpa_printf(MSG_ERROR, "Failed to enable three wire. ret=%d (%s) ",
206+ ret, strerror(-ret));
207+ }
208+ return ret;
209+}
210
211 const struct wpa_driver_ops wpa_driver_nl80211_ops = {
212 .name = "nl80211",
213@@ -12789,4 +12821,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
214 .configure_edcca_enable = nl80211_configure_edcca_enable,
215 .configure_edcca_threshold = nl80211_configure_edcca_threshold,
216 .get_edcca = nl80211_get_edcca,
217+ .three_wire_ctrl = nl80211_enable_three_wire,
218 };
219diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
220index 57f0249..9fe7811 100644
221--- a/src/drivers/driver_nl80211.h
222+++ b/src/drivers/driver_nl80211.h
223@@ -183,6 +183,7 @@ struct wpa_driver_nl80211_data {
224 unsigned int uses_6ghz:1;
225 unsigned int mtk_edcca_vendor_cmd_avail:1;
226 unsigned int mtk_hemu_vendor_cmd_avail:1;
227+ unsigned int mtk_3wire_vendor_cmd_avail:1;
228
229 u64 vendor_scan_cookie;
230 u64 remain_on_chan_cookie;
231diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
232index cc146d9..04bc54e 100644
233--- a/src/drivers/driver_nl80211_capa.c
234+++ b/src/drivers/driver_nl80211_capa.c
235@@ -1059,6 +1059,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
236 case MTK_NL80211_VENDOR_SUBCMD_HEMU_CTRL :
237 drv->mtk_hemu_vendor_cmd_avail = 1;
238 break;
239+ case MTK_NL80211_VENDOR_SUBCMD_3WIRE_CTRL :
240+ drv->mtk_3wire_vendor_cmd_avail = 1;
241+ break;
242 }
243 }
244
245--
2462.36.1
247