[][MAC80211][WiFi6/7][app][Add single wiphy support for atenl & iwpriv wrapper]
[Description]
Add single wiphy support for atenl & iwpirv wrapper
To support single wiphy, main phy idx is used for debugfs in atenl &
iwpriv wrapper.
[Release-log]
N/A
Change-Id: Ic146442a8838cd812be9e92ce3e4f5e5f32c91fe
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9176525
diff --git a/feed/app/atenl/src/atenl.h b/feed/app/atenl/src/atenl.h
index a5f9fbb..a6695c9 100644
--- a/feed/app/atenl/src/atenl.h
+++ b/feed/app/atenl/src/atenl.h
@@ -85,6 +85,7 @@
u16 adie_id;
u8 sub_chip_id;
u8 cur_band;
+ u8 main_phy_idx;
u8 mac_addr[ETH_ALEN];
char *bridge_name;
diff --git a/feed/app/atenl/src/eeprom.c b/feed/app/atenl/src/eeprom.c
index d112dc7..b3a652a 100644
--- a/feed/app/atenl/src/eeprom.c
+++ b/feed/app/atenl/src/eeprom.c
@@ -27,7 +27,7 @@
snprintf(fname, sizeof(fname),
"/sys/kernel/debug/ieee80211/phy%d/mt76/eeprom",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
fd_ori = open(fname, O_RDONLY);
if (fd_ori < 0)
return -1;
@@ -344,17 +344,14 @@
bool flash_mode;
int eeprom_fd;
char buf[30];
- u8 main_phy_idx = phy_idx;
set_band_val(an, 0, phy_idx, phy_idx);
atenl_nl_check_mtd(an);
flash_mode = an->mtd_part != NULL;
// Get the first main phy index for this chip
- if (flash_mode)
- main_phy_idx -= an->band_idx;
-
- snprintf(buf, sizeof(buf), "/tmp/atenl-eeprom-phy%u", main_phy_idx);
+ an->main_phy_idx = phy_idx - an->band_idx;
+ snprintf(buf, sizeof(buf), "/tmp/atenl-eeprom-phy%u", an->main_phy_idx);
eeprom_file = strdup(buf);
eeprom_fd = atenl_eeprom_init_file(an, flash_mode);
@@ -461,7 +458,7 @@
snprintf(fname, sizeof(fname),
"/sys/kernel/debug/ieee80211/phy%d/mt76/eeprom",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
fd_ori = open(fname, O_RDONLY);
if (fd_ori < 0)
return -1;
diff --git a/feed/app/atenl/src/nl.c b/feed/app/atenl/src/nl.c
index 6850fc8..baf2944 100644
--- a/feed/app/atenl/src/nl.c
+++ b/feed/app/atenl/src/nl.c
@@ -1199,12 +1199,13 @@
return NL_SKIP;
nla_parse_nested(tb, MT76_TM_ATTR_MAX, attr, testdata_policy);
+ an->band_idx = nla_get_u32(tb[MT76_TM_ATTR_BAND_IDX]);
+
if (!tb[MT76_TM_ATTR_MTD_PART] || !tb[MT76_TM_ATTR_MTD_OFFSET])
return NL_SKIP;
an->mtd_part = strdup(nla_get_string(tb[MT76_TM_ATTR_MTD_PART]));
an->mtd_offset = nla_get_u32(tb[MT76_TM_ATTR_MTD_OFFSET]);
- an->band_idx = nla_get_u32(tb[MT76_TM_ATTR_BAND_IDX]);
return NL_SKIP;
}
diff --git a/feed/app/atenl/src/util.c b/feed/app/atenl/src/util.c
index b224040..109e7db 100644
--- a/feed/app/atenl/src/util.c
+++ b/feed/app/atenl/src/util.c
@@ -11,7 +11,7 @@
/* write offset into regidx */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regidx",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -30,7 +30,7 @@
/* read value from regval */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regval",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -63,7 +63,7 @@
/* write offset into regidx */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regidx",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -82,7 +82,7 @@
/* write value into regval */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regval",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -118,7 +118,7 @@
/* write regidx */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regidx",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -137,7 +137,7 @@
/* read from rf_regval */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/rf_regval",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -175,7 +175,7 @@
/* write regidx */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/regidx",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;
@@ -194,7 +194,7 @@
/* write value into rf_val */
ret = snprintf(dir, sizeof(dir),
"/sys/kernel/debug/ieee80211/phy%d/mt76/rf_regval",
- get_band_val(an, 0, phy_idx));
+ an->main_phy_idx);
if (snprintf_error(sizeof(dir), ret))
return ret;