blob: f8c2ac81deb9b7a758f998c29d549b8000d98d90 [file] [log] [blame]
developer1d9da7d2023-04-15 12:45:34 +08001From 19fae145418da66151cab3e3af3e3ad9632a6381 Mon Sep 17 00:00:00 2001
developer297ab042023-03-31 15:18:15 +08002From: Howard Hsu <howard-yh.hsu@mediatek.com>
3Date: Fri, 24 Feb 2023 16:29:42 +0800
developer1d9da7d2023-04-15 12:45:34 +08004Subject: [PATCH 1032/1032] wifi: mt76: mt7915: disable SW-ACI by default
developer297ab042023-03-31 15:18:15 +08005
6Support to enable/disable SW-ACI by module parameter "sw_aci_enable".
7SW-ACI feature is disable by default.
8---
9 mt7915/main.c | 8 ++++++++
10 mt7915/mcu.c | 15 +++++++++++++++
11 mt7915/mt7915.h | 1 +
12 mt7915/mtk_debugfs.c | 14 +++++---------
13 4 files changed, 29 insertions(+), 9 deletions(-)
14
15diff --git a/mt7915/main.c b/mt7915/main.c
developer1d9da7d2023-04-15 12:45:34 +080016index 4d4fdeb..0d5e527 100644
developer297ab042023-03-31 15:18:15 +080017--- a/mt7915/main.c
18+++ b/mt7915/main.c
19@@ -8,6 +8,10 @@
20 #include "mt7915.h"
21 #include "mcu.h"
22
23+static bool sw_aci_enable = false;
24+module_param(sw_aci_enable, bool, 0644);
25+MODULE_PARM_DESC(sw_aci_enable, "Enable the feature of Adjacent Channel Interference Detection");
26+
27 static bool mt7915_dev_running(struct mt7915_dev *dev)
28 {
29 struct mt7915_phy *phy;
30@@ -41,6 +45,10 @@ int mt7915_run(struct ieee80211_hw *hw)
31 goto out;
32
33 mt7915_mac_enable_nf(dev, dev->phy.mt76->band_idx);
34+
35+ ret = mt7915_mcu_sw_aci_set(dev, sw_aci_enable);
36+ if (ret)
37+ goto out;
38 }
39
40 if (phy != &dev->phy) {
41diff --git a/mt7915/mcu.c b/mt7915/mcu.c
developer1d9da7d2023-04-15 12:45:34 +080042index 0fe15a5..f87a386 100644
developer297ab042023-03-31 15:18:15 +080043--- a/mt7915/mcu.c
44+++ b/mt7915/mcu.c
developer5bea7322023-04-13 18:50:55 +080045@@ -4891,3 +4891,18 @@ int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value)
developer297ab042023-03-31 15:18:15 +080046
47 return 0;
48 }
49+
50+int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val)
51+{
52+#define SWLNA_ENABLE 6
53+ struct {
54+ u32 subcmd;
55+ u8 enable;
56+ } req = {
57+ .subcmd = SWLNA_ENABLE,
58+ .enable = val ? 1 : 0,
59+ };
60+
61+ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SWLNA_ACI_CTRL), &req,
62+ sizeof(req), NULL);
63+}
64diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
developer1d9da7d2023-04-15 12:45:34 +080065index 1680413..c379b2a 100644
developer297ab042023-03-31 15:18:15 +080066--- a/mt7915/mt7915.h
67+++ b/mt7915/mt7915.h
developer5bea7322023-04-13 18:50:55 +080068@@ -781,6 +781,7 @@ int mt7915_vendor_amnt_sta_remove(struct mt7915_phy *phy,
developer297ab042023-03-31 15:18:15 +080069 #endif
70 int mt7915_mcu_set_edcca(struct mt7915_phy *phy, int mode, u8 *value, s8 compensation);
71 int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value);
72+int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val);
73 int mt7915_mcu_ipi_hist_ctrl(struct mt7915_phy *phy, void *data, u8 cmd, bool wait_resp);
74 int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool wait_resp);
75
76diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
developer1d9da7d2023-04-15 12:45:34 +080077index da4056e..e102ddc 100644
developer297ab042023-03-31 15:18:15 +080078--- a/mt7915/mtk_debugfs.c
79+++ b/mt7915/mtk_debugfs.c
developer2324aa22023-04-12 11:30:15 +080080@@ -3644,16 +3644,12 @@ static int mt7915_show_eeprom_mode(struct seq_file *s, void *data)
developer297ab042023-03-31 15:18:15 +080081 static int
82 mt7915_sw_aci_set(void *data, u64 val)
83 {
84-#define SWLNA_ENABLE 6
85 struct mt7915_dev *dev = data;
86- struct {
87- u32 subcmd;
88- u8 enable;
89- } req = {
90- .subcmd = SWLNA_ENABLE,
91- .enable = (u8) val,
92- };
93- return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SWLNA_ACI_CTRL), &req, sizeof(req), NULL);
94+
95+ if (val > 1)
96+ return -EINVAL;
97+
98+ return mt7915_mcu_sw_aci_set(dev, !!val);
99 }
100
101
102--
1032.18.0
104