* [PATCH v2 1/6] wifi: mt76: mt7921: move connac nic capability handling to mt7921
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-09-30 2:25 ` [PATCH v2 2/6] wifi: mt76: mt7921: enable set txpower for UNII-4 Deren Wu
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek, Deren Wu
mt76_connac_mcu_get_nic_capability() is used by mt7921 only. It
would be better to put the code in chip folder. And we can provide
more chip capability information in mt792x_phy without making
mt76_phy much bigger.
The three functions would be moved to mt7921 folder and renamed.
mt76_connac_mcu_parse_tx_resource()
mt76_connac_mcu_parse_phy_cap()
mt76_connac_mcu_get_nic_capability()
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
---
.../wireless/mediatek/mt76/mt76_connac_mcu.c | 120 -----------------
.../wireless/mediatek/mt76/mt76_connac_mcu.h | 1 -
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 122 +++++++++++++++++-
3 files changed, 121 insertions(+), 122 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index bcd6c20f37ad..83cf2e2b2868 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -1941,126 +1941,6 @@ void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,
}
EXPORT_SYMBOL_GPL(mt76_connac_mcu_coredump_event);
-static void mt76_connac_mcu_parse_tx_resource(struct mt76_dev *dev,
- struct sk_buff *skb)
-{
- struct mt76_sdio *sdio = &dev->sdio;
- struct mt76_connac_tx_resource {
- __le32 version;
- __le32 pse_data_quota;
- __le32 pse_mcu_quota;
- __le32 ple_data_quota;
- __le32 ple_mcu_quota;
- __le16 pse_page_size;
- __le16 ple_page_size;
- u8 pp_padding;
- u8 pad[3];
- } __packed * tx_res;
-
- tx_res = (struct mt76_connac_tx_resource *)skb->data;
- sdio->sched.pse_data_quota = le32_to_cpu(tx_res->pse_data_quota);
- sdio->sched.pse_mcu_quota = le32_to_cpu(tx_res->pse_mcu_quota);
- sdio->sched.ple_data_quota = le32_to_cpu(tx_res->ple_data_quota);
- sdio->sched.pse_page_size = le16_to_cpu(tx_res->pse_page_size);
- sdio->sched.deficit = tx_res->pp_padding;
-}
-
-static void mt76_connac_mcu_parse_phy_cap(struct mt76_dev *dev,
- struct sk_buff *skb)
-{
- struct mt76_connac_phy_cap {
- u8 ht;
- u8 vht;
- u8 _5g;
- u8 max_bw;
- u8 nss;
- u8 dbdc;
- u8 tx_ldpc;
- u8 rx_ldpc;
- u8 tx_stbc;
- u8 rx_stbc;
- u8 hw_path;
- u8 he;
- } __packed * cap;
-
- enum {
- WF0_24G,
- WF0_5G
- };
-
- cap = (struct mt76_connac_phy_cap *)skb->data;
-
- dev->phy.antenna_mask = BIT(cap->nss) - 1;
- dev->phy.chainmask = dev->phy.antenna_mask;
- dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G);
- dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G);
-}
-
-int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy)
-{
- struct mt76_connac_cap_hdr {
- __le16 n_element;
- u8 rsv[2];
- } __packed * hdr;
- struct sk_buff *skb;
- int ret, i;
-
- ret = mt76_mcu_send_and_get_msg(phy->dev, MCU_CE_CMD(GET_NIC_CAPAB),
- NULL, 0, true, &skb);
- if (ret)
- return ret;
-
- hdr = (struct mt76_connac_cap_hdr *)skb->data;
- if (skb->len < sizeof(*hdr)) {
- ret = -EINVAL;
- goto out;
- }
-
- skb_pull(skb, sizeof(*hdr));
-
- for (i = 0; i < le16_to_cpu(hdr->n_element); i++) {
- struct tlv_hdr {
- __le32 type;
- __le32 len;
- } __packed * tlv = (struct tlv_hdr *)skb->data;
- int len;
-
- if (skb->len < sizeof(*tlv))
- break;
-
- skb_pull(skb, sizeof(*tlv));
-
- len = le32_to_cpu(tlv->len);
- if (skb->len < len)
- break;
-
- switch (le32_to_cpu(tlv->type)) {
- case MT_NIC_CAP_6G:
- phy->cap.has_6ghz = skb->data[0];
- break;
- case MT_NIC_CAP_MAC_ADDR:
- memcpy(phy->macaddr, (void *)skb->data, ETH_ALEN);
- break;
- case MT_NIC_CAP_PHY:
- mt76_connac_mcu_parse_phy_cap(phy->dev, skb);
- break;
- case MT_NIC_CAP_TX_RESOURCE:
- if (mt76_is_sdio(phy->dev))
- mt76_connac_mcu_parse_tx_resource(phy->dev,
- skb);
- break;
- default:
- break;
- }
- skb_pull(skb, len);
- }
-out:
- dev_kfree_skb(skb);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(mt76_connac_mcu_get_nic_capability);
-
static void
mt76_connac_mcu_build_sku(struct mt76_dev *dev, s8 *sku,
struct mt76_power_limits *limits,
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 9bc97a35fc1d..b73dbe1dbf3a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1881,7 +1881,6 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len,
int mt76_connac_mcu_start_patch(struct mt76_dev *dev);
int mt76_connac_mcu_patch_sem_ctrl(struct mt76_dev *dev, bool get);
int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option);
-int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy);
int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,
struct ieee80211_scan_request *scan_req);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 90c93970acab..8d9ebe34816a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -448,6 +448,126 @@ static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name)
return ret;
}
+static void mt7921_mcu_parse_tx_resource(struct mt76_dev *dev,
+ struct sk_buff *skb)
+{
+ struct mt76_sdio *sdio = &dev->sdio;
+ struct mt7921_tx_resource {
+ __le32 version;
+ __le32 pse_data_quota;
+ __le32 pse_mcu_quota;
+ __le32 ple_data_quota;
+ __le32 ple_mcu_quota;
+ __le16 pse_page_size;
+ __le16 ple_page_size;
+ u8 pp_padding;
+ u8 pad[3];
+ } __packed * tx_res;
+
+ tx_res = (struct mt7921_tx_resource *)skb->data;
+ sdio->sched.pse_data_quota = le32_to_cpu(tx_res->pse_data_quota);
+ sdio->sched.pse_mcu_quota = le32_to_cpu(tx_res->pse_mcu_quota);
+ sdio->sched.ple_data_quota = le32_to_cpu(tx_res->ple_data_quota);
+ sdio->sched.pse_page_size = le16_to_cpu(tx_res->pse_page_size);
+ sdio->sched.deficit = tx_res->pp_padding;
+}
+
+static void mt7921_mcu_parse_phy_cap(struct mt76_dev *dev,
+ struct sk_buff *skb)
+{
+ struct mt7921_phy_cap {
+ u8 ht;
+ u8 vht;
+ u8 _5g;
+ u8 max_bw;
+ u8 nss;
+ u8 dbdc;
+ u8 tx_ldpc;
+ u8 rx_ldpc;
+ u8 tx_stbc;
+ u8 rx_stbc;
+ u8 hw_path;
+ u8 he;
+ } __packed * cap;
+
+ enum {
+ WF0_24G,
+ WF0_5G
+ };
+
+ cap = (struct mt7921_phy_cap *)skb->data;
+
+ dev->phy.antenna_mask = BIT(cap->nss) - 1;
+ dev->phy.chainmask = dev->phy.antenna_mask;
+ dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G);
+ dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G);
+}
+
+static int mt7921_mcu_get_nic_capability(struct mt792x_phy *mphy)
+{
+ struct mt76_connac_cap_hdr {
+ __le16 n_element;
+ u8 rsv[2];
+ } __packed * hdr;
+ struct sk_buff *skb;
+ struct mt76_phy *phy = mphy->mt76;
+ int ret, i;
+
+ ret = mt76_mcu_send_and_get_msg(phy->dev, MCU_CE_CMD(GET_NIC_CAPAB),
+ NULL, 0, true, &skb);
+ if (ret)
+ return ret;
+
+ hdr = (struct mt76_connac_cap_hdr *)skb->data;
+ if (skb->len < sizeof(*hdr)) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ skb_pull(skb, sizeof(*hdr));
+
+ for (i = 0; i < le16_to_cpu(hdr->n_element); i++) {
+ struct tlv_hdr {
+ __le32 type;
+ __le32 len;
+ } __packed * tlv = (struct tlv_hdr *)skb->data;
+ int len;
+
+ if (skb->len < sizeof(*tlv))
+ break;
+
+ skb_pull(skb, sizeof(*tlv));
+
+ len = le32_to_cpu(tlv->len);
+ if (skb->len < len)
+ break;
+
+ switch (le32_to_cpu(tlv->type)) {
+ case MT_NIC_CAP_6G:
+ phy->cap.has_6ghz = skb->data[0];
+ break;
+ case MT_NIC_CAP_MAC_ADDR:
+ memcpy(phy->macaddr, (void *)skb->data, ETH_ALEN);
+ break;
+ case MT_NIC_CAP_PHY:
+ mt7921_mcu_parse_phy_cap(phy->dev, skb);
+ break;
+ case MT_NIC_CAP_TX_RESOURCE:
+ if (mt76_is_sdio(phy->dev))
+ mt7921_mcu_parse_tx_resource(phy->dev,
+ skb);
+ break;
+ default:
+ break;
+ }
+ skb_pull(skb, len);
+ }
+out:
+ dev_kfree_skb(skb);
+
+ return ret;
+}
+
int mt7921_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl)
{
struct {
@@ -469,7 +589,7 @@ int mt7921_run_firmware(struct mt792x_dev *dev)
if (err)
return err;
- err = mt76_connac_mcu_get_nic_capability(&dev->mphy);
+ err = mt7921_mcu_get_nic_capability(&dev->phy);
if (err)
return err;
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 2/6] wifi: mt76: mt7921: enable set txpower for UNII-4
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
2023-09-30 2:25 ` [PATCH v2 1/6] wifi: mt76: mt7921: move connac nic capability handling to mt7921 Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-09-30 2:25 ` [PATCH v2 3/6] wifi: mt76: mt7921: add 6GHz power type support for clc Deren Wu
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
support power config for channel 165/173/177
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 83cf2e2b2868..ae6bf3c968df 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2042,7 +2042,7 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,
112, 114, 116, 118, 120, 122, 124,
126, 128, 132, 134, 136, 138, 140,
142, 144, 149, 151, 153, 155, 157,
- 159, 161, 165
+ 159, 161, 165, 169, 173, 177
};
static const u8 chan_list_6ghz[] = {
1, 3, 5, 7, 9, 11, 13,
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 3/6] wifi: mt76: mt7921: add 6GHz power type support for clc
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
2023-09-30 2:25 ` [PATCH v2 1/6] wifi: mt76: mt7921: move connac nic capability handling to mt7921 Deren Wu
2023-09-30 2:25 ` [PATCH v2 2/6] wifi: mt76: mt7921: enable set txpower for UNII-4 Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-09-30 2:25 ` [PATCH v2 4/6] wifi: mt76: mt7921: get regulatory information from the clc event Deren Wu
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek, Deren Wu
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
There are several power type should be supported in 6GHz band. mt7921
apply 6GHz power type from AP settings and clc will setup the
corresponding regulatory power.
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/main.c | 34 +++++++++++++++++++
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 4 ++-
drivers/net/wireless/mediatek/mt76/mt792x.h | 9 +++++
3 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index aa20fdce2729..cf8aecb200fc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -701,6 +701,38 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,
mt792x_mutex_release(dev);
}
+static void
+mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif)
+{
+ struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+ struct mt792x_phy *phy = mvif->phy;
+ struct mt792x_dev *dev = phy->dev;
+
+ if (hweight64(dev->mt76.vif_mask) > 1) {
+ phy->power_type = MT_AP_DEFAULT;
+ goto out;
+ }
+
+ switch (vif->bss_conf.power_type) {
+ case IEEE80211_REG_SP_AP:
+ phy->power_type = MT_AP_SP;
+ break;
+ case IEEE80211_REG_VLP_AP:
+ phy->power_type = MT_AP_VLP;
+ break;
+ case IEEE80211_REG_LPI_AP:
+ phy->power_type = MT_AP_LPI;
+ break;
+ case IEEE80211_REG_UNSET_AP:
+ default:
+ phy->power_type = MT_AP_DEFAULT;
+ break;
+ }
+
+out:
+ mt7921_mcu_set_clc(dev, dev->mt76.alpha2, dev->country_ie_env);
+}
+
int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
struct ieee80211_sta *sta)
{
@@ -736,6 +768,8 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
if (ret)
return ret;
+ mt7921_regd_set_6ghz_power_type(vif);
+
mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
return 0;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 8d9ebe34816a..8c76ef92e14f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1254,10 +1254,12 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 pad1;
u8 alpha2[2];
u8 type[2];
- u8 rsvd[64];
+ u8 env_6g;
+ u8 rsvd[63];
} __packed req = {
.idx = idx,
.env = env_cap,
+ .env_6g = dev->phy.power_type,
.acpi_conf = mt792x_acpi_get_flags(&dev->phy),
};
int ret, valid_cnt = 0;
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 548e89fad4d9..8b1dbddf4582 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -63,6 +63,14 @@ enum {
MT792x_CLC_MAX_NUM,
};
+enum mt792x_reg_power_type {
+ MT_AP_UNSET = 0,
+ MT_AP_DEFAULT,
+ MT_AP_LPI,
+ MT_AP_SP,
+ MT_AP_VLP,
+};
+
DECLARE_EWMA(avg_signal, 10, 8)
struct mt792x_sta {
@@ -114,6 +122,7 @@ struct mt792x_phy {
struct mt76_mib_stats mib;
u8 sta_work_count;
+ enum mt792x_reg_power_type power_type;
struct sk_buff_head scan_event_list;
struct delayed_work scan_work;
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 4/6] wifi: mt76: mt7921: get regulatory information from the clc event
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
` (2 preceding siblings ...)
2023-09-30 2:25 ` [PATCH v2 3/6] wifi: mt76: mt7921: add 6GHz power type support for clc Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-09-30 2:25 ` [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed Deren Wu
2023-09-30 2:25 ` [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi Deren Wu
5 siblings, 0 replies; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek, Deren Wu
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
The clc event can report the radio configuration for the corresponding
country and the driver would take it as regulatory information of a
certain platform device.
This patch would change the clc commnad from no-waiting to waiting for
event. For backward compatible, we also add a new nic capability tag
to indicate the firmware did support this new clc event from now on.
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
---
.../wireless/mediatek/mt76/mt76_connac_mcu.h | 1 +
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 26 ++++++++++++++++---
.../net/wireless/mediatek/mt76/mt7921/mcu.h | 13 ++++++++++
.../wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
drivers/net/wireless/mediatek/mt76/mt792x.h | 4 +++
5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index b73dbe1dbf3a..35f008492a6b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1340,6 +1340,7 @@ enum {
MT_NIC_CAP_ANTSWP = 0x16,
MT_NIC_CAP_WFDMA_REALLOC,
MT_NIC_CAP_6G,
+ MT_NIC_CAP_CHIP_CAP = 0x20,
};
#define UNI_WOW_DETECT_TYPE_MAGIC BIT(0)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 8c76ef92e14f..4f66e27aa43a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -557,6 +557,9 @@ static int mt7921_mcu_get_nic_capability(struct mt792x_phy *mphy)
mt7921_mcu_parse_tx_resource(phy->dev,
skb);
break;
+ case MT_NIC_CAP_CHIP_CAP:
+ memcpy(&mphy->chip_cap, (void *)skb->data, sizeof(u64));
+ break;
default:
break;
}
@@ -1243,7 +1246,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
struct mt7921_clc *clc,
u8 idx)
{
- struct sk_buff *skb;
+#define CLC_CAP_EVT_EN BIT(0)
+ struct sk_buff *skb, *ret_skb = NULL;
struct {
u8 ver;
u8 pad0;
@@ -1251,7 +1255,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 idx;
u8 env;
u8 acpi_conf;
- u8 pad1;
+ u8 cap;
u8 alpha2[2];
u8 type[2];
u8 env_6g;
@@ -1268,6 +1272,9 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
if (!clc)
return 0;
+ if (dev->phy.chip_cap & MT792x_CHIP_CAP_CLC_EVT_EN)
+ req.cap |= CLC_CAP_EVT_EN;
+
pos = clc->data;
for (i = 0; i < clc->nr_country; i++) {
struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos;
@@ -1289,10 +1296,21 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
return -ENOMEM;
skb_put_data(skb, rule->data, len);
- ret = mt76_mcu_skb_send_msg(&dev->mt76, skb,
- MCU_CE_CMD(SET_CLC), false);
+ ret = mt76_mcu_skb_send_and_get_msg(&dev->mt76, skb,
+ MCU_CE_CMD(SET_CLC),
+ !!(req.cap & CLC_CAP_EVT_EN),
+ &ret_skb);
if (ret < 0)
return ret;
+
+ if (ret_skb) {
+ struct mt7921_clc_info_tlv *info;
+
+ info = (struct mt7921_clc_info_tlv *)(ret_skb->data + 4);
+ dev->phy.clc_chan_conf = info->chan_conf;
+ dev_kfree_skb(ret_skb);
+ }
+
valid_cnt++;
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
index 9b0aa3b70f0e..f9a259ee6b82 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
@@ -99,4 +99,17 @@ struct mt7921_rftest_evt {
__le32 param0;
__le32 param1;
} __packed;
+
+struct mt7921_clc_info_tlv {
+ __le16 tag;
+ __le16 len;
+
+ u8 chan_conf; /* BIT(0) : Enable UNII-4
+ * BIT(1) : Enable UNII-5
+ * BIT(2) : Enable UNII-6
+ * BIT(3) : Enable UNII-7
+ * BIT(4) : Enable UNII-8
+ */
+ u8 rsv[63];
+} __packed;
#endif
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 87dd06855f68..ba3f9d9aacad 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -27,6 +27,7 @@
#define MT7921_SDIO_HDR_PKT_TYPE GENMASK(17, 16)
#define MCU_UNI_EVENT_ROC 0x27
+#define MCU_UNI_EVENT_CLC 0x80
enum {
UNI_ROC_ACQUIRE,
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 8b1dbddf4582..34380d1eb9f4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -25,6 +25,8 @@
#define MT792x_FW_TAG_FEATURE 4
#define MT792x_FW_CAP_CNM BIT(7)
+#define MT792x_CHIP_CAP_CLC_EVT_EN BIT(0)
+
/* NOTE: used to map mt76_rates. idx may change if firmware expands table */
#define MT792x_BASIC_RATES_TBL 11
@@ -122,6 +124,7 @@ struct mt792x_phy {
struct mt76_mib_stats mib;
u8 sta_work_count;
+ u8 clc_chan_conf;
enum mt792x_reg_power_type power_type;
struct sk_buff_head scan_event_list;
@@ -130,6 +133,7 @@ struct mt792x_phy {
void *acpisar;
#endif
void *clc[MT792x_CLC_MAX_NUM];
+ u64 chip_cap;
struct work_struct roc_work;
struct timer_list roc_timer;
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
` (3 preceding siblings ...)
2023-09-30 2:25 ` [PATCH v2 4/6] wifi: mt76: mt7921: get regulatory information from the clc event Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-10-17 10:32 ` AngeloGioacchino Del Regno
2023-09-30 2:25 ` [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi Deren Wu
5 siblings, 1 reply; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek, Deren Wu
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
The 5.9/6GHz channel license of a certain platform device has been
regulated in various countries. That may be difference with standard
Liunx regulatory domain settings. In this case, when .reg_notifier()
called for regulatory change, mt792x chipset should update the channel
usage based on clc or dts configurations.
Channel would be disabled by following cases.
* clc report the particular UNII-x is disabled.
* dts enabled and the channel is not configured.
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/eeprom.c | 7 ++-
drivers/net/wireless/mediatek/mt76/mt76.h | 5 ++
.../net/wireless/mediatek/mt76/mt7921/init.c | 51 +++++++++++++++++++
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 3 ++
4 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index 36564930aef1..7725dd6763ef 100644
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -188,7 +188,7 @@ static bool mt76_string_prop_find(struct property *prop, const char *str)
return false;
}
-static struct device_node *
+struct device_node *
mt76_find_power_limits_node(struct mt76_dev *dev)
{
struct device_node *np = dev->dev->of_node;
@@ -227,6 +227,7 @@ mt76_find_power_limits_node(struct mt76_dev *dev)
of_node_put(np);
return fallback;
}
+EXPORT_SYMBOL_GPL(mt76_find_power_limits_node);
static const __be32 *
mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min)
@@ -241,7 +242,7 @@ mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min)
return prop->value;
}
-static struct device_node *
+struct device_node *
mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan)
{
struct device_node *cur;
@@ -265,6 +266,8 @@ mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan)
return NULL;
}
+EXPORT_SYMBOL_GPL(mt76_find_channel_node);
+
static s8
mt76_get_txs_delta(struct device_node *np, u8 nss)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index fede40cf86b7..3730c5e7d702 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1537,6 +1537,11 @@ mt76_mcu_skb_send_msg(struct mt76_dev *dev, struct sk_buff *skb, int cmd,
void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr, u32 clear, u32 set);
+struct device_node *
+mt76_find_power_limits_node(struct mt76_dev *dev);
+struct device_node *
+mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan);
+
s8 mt76_get_rate_power_limits(struct mt76_phy *phy,
struct ieee80211_channel *chan,
struct mt76_power_limits *dest,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 534c7bee5ef1..55baac70860b 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -58,6 +58,55 @@ static int mt7921_thermal_init(struct mt792x_phy *phy)
return PTR_ERR_OR_ZERO(hwmon);
}
+static void
+mt7921_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)
+{
+#define IS_UNII_INVALID(idx, sfreq, efreq) \
+ (!(dev->phy.clc_chan_conf & BIT(idx)) && (cfreq) >= (sfreq) && (cfreq) <= (efreq))
+ struct ieee80211_supported_band *sband;
+ struct mt76_dev *mdev = &dev->mt76;
+ struct device_node *np, *band_np;
+ struct ieee80211_channel *ch;
+ int i, cfreq;
+
+ np = mt76_find_power_limits_node(mdev);
+
+ sband = wiphy->bands[NL80211_BAND_5GHZ];
+ band_np = np ? of_get_child_by_name(np, "txpower-5g") : NULL;
+ for (i = 0; i < sband->n_channels; i++) {
+ ch = &sband->channels[i];
+ cfreq = ch->center_freq;
+
+ if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) {
+ ch->flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+
+ /* UNII-4 */
+ if (IS_UNII_INVALID(0, 5850, 5925))
+ ch->flags |= IEEE80211_CHAN_DISABLED;
+ }
+
+ sband = wiphy->bands[NL80211_BAND_6GHZ];
+ band_np = np ? of_get_child_by_name(np, "txpower-6g") : NULL;
+ for (i = 0; i < sband->n_channels; i++) {
+ ch = &sband->channels[i];
+ cfreq = ch->center_freq;
+
+ if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) {
+ ch->flags |= IEEE80211_CHAN_DISABLED;
+ continue;
+ }
+
+ /* UNII-5/6/7/8 */
+ if (IS_UNII_INVALID(1, 5925, 6425) ||
+ IS_UNII_INVALID(2, 6425, 6525) ||
+ IS_UNII_INVALID(3, 6525, 6875) ||
+ IS_UNII_INVALID(4, 6875, 7125))
+ ch->flags |= IEEE80211_CHAN_DISABLED;
+ }
+}
+
static void
mt7921_regd_notifier(struct wiphy *wiphy,
struct regulatory_request *request)
@@ -74,6 +123,8 @@ mt7921_regd_notifier(struct wiphy *wiphy,
mt76_connac_mcu_set_channel_domain(hw->priv);
mt7921_set_tx_sar_pwr(hw, NULL);
mt792x_mutex_release(dev);
+
+ mt7921_regd_channel_update(wiphy, dev);
}
int mt7921_mac_init(struct mt792x_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 4f66e27aa43a..63f3d4a5c9aa 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1247,6 +1247,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 idx)
{
#define CLC_CAP_EVT_EN BIT(0)
+#define CLC_CAP_DTS_EN BIT(1)
struct sk_buff *skb, *ret_skb = NULL;
struct {
u8 ver;
@@ -1274,6 +1275,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
if (dev->phy.chip_cap & MT792x_CHIP_CAP_CLC_EVT_EN)
req.cap |= CLC_CAP_EVT_EN;
+ if (mt76_find_power_limits_node(&dev->mt76))
+ req.cap |= CLC_CAP_DTS_EN;
pos = clc->data;
for (i = 0; i < clc->nr_country; i++) {
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed
2023-09-30 2:25 ` [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed Deren Wu
@ 2023-10-17 10:32 ` AngeloGioacchino Del Regno
2023-10-17 13:17 ` Deren Wu (武德仁)
0 siblings, 1 reply; 11+ messages in thread
From: AngeloGioacchino Del Regno @ 2023-10-17 10:32 UTC (permalink / raw)
To: Deren Wu, Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek
Il 30/09/23 04:25, Deren Wu ha scritto:
> From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
>
> The 5.9/6GHz channel license of a certain platform device has been
> regulated in various countries. That may be difference with standard
> Liunx regulatory domain settings. In this case, when .reg_notifier()
> called for regulatory change, mt792x chipset should update the channel
> usage based on clc or dts configurations.
>
> Channel would be disabled by following cases.
> * clc report the particular UNII-x is disabled.
> * dts enabled and the channel is not configured.
>
> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
> Co-developed-by: Deren Wu <deren.wu@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Hello,
this patch is giving a kernel panic on the MT8195 Acer Tomato Chromebook.
Please refer to this stacktrace:
<1>[ 19.442078] Unable to handle kernel NULL pointer dereference at virtual
address 0000000000000014
<1>[ 19.457535] Mem abort info:
<1>[ 19.465329] ESR = 0x0000000096000004
<1>[ 19.473295] EC = 0x25: DABT (current EL), IL = 32 bits
<1>[ 19.482354] SET = 0, FnV = 0
<1>[ 19.489143] EA = 0, S1PTW = 0
<1>[ 19.495991] FSC = 0x04: level 0 translation fault
<1>[ 19.504554] Data abort info:
<1>[ 19.511111] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
<1>[ 19.520269] CM = 0, WnR = 0, TnD = 0, TagAccess = 0
<1>[ 19.528988] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
<1>[ 19.537960] user pgtable: 4k pages, 48-bit VAs, pgdp=00000001027a9000
<1>[ 19.548014] [0000000000000014] pgd=0000000000000000, p4d=0000000000000000
<0>[ 19.558429] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP
<4>[ 19.568270] Modules linked in: mt7921e mt7921_common mt792x_lib
mt76_connac_lib mt76 mac80211 btusb btintel cfg80211 btmtk snd_sof_ipc_msg_injector
btrtl snd_sof_ipc_flood_test btbcm bluetooth snd_sof_mt8195 uvcvideo
mtk_adsp_common snd_sof_xtensa_dsp uvc snd_sof_of snd_sof videobuf2_vmalloc
ecdh_generic ecc snd_sof_utils cros_ec_lid_angle cros_ec_sensors crct10dif_ce
cros_ec_sensors_core cros_usbpd_logger crypto_user fuse ip_tables ipv6
<4>[ 19.614237] CPU: 1 PID: 105 Comm: kworker/1:1 Not tainted
6.6.0-rc6-next-20231017+ #324
<4>[ 19.625957] Hardware name: Acer Tomato (rev2) board (DT)
<4>[ 19.634970] Workqueue: events mt7921_init_work [mt7921_common]
<4>[ 19.644522] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
<4>[ 19.655182] pc : mt7921_regd_notifier+0x180/0x290 [mt7921_common]
<4>[ 19.664983] lr : mt7921_regd_notifier+0xd4/0x290 [mt7921_common]
<4>[ 19.674679] sp : ffff800080acba80
<4>[ 19.681649] x29: ffff800080acba80 x28: 0000000000000000 x27: ffff4faf16032148
<4>[ 19.692483] x26: 0000000000000000 x25: 0000000000000000 x24: ffff4faf1603afa0
<4>[ 19.703294] x23: 00000000ffffe926 x22: ffff4faf16031fa0 x21: 0000000000000023
<4>[ 19.714108] x20: 000000000000001c x19: ffff4faf16ba6f40 x18: 00000000ff1d6000
<4>[ 19.724928] x17: 0000000000000000 x16: ffffac6b891c2750 x15: ffff800081051000
<4>[ 19.735722] x14: 0000000000000180 x13: 0000000000000000 x12: 0000000000000002
<4>[ 19.746478] x11: 0000000000000002 x10: ffff4faf01c21780 x9 : ffffac6b891c282c
<4>[ 19.757214] x8 : 00000000006c0000 x7 : ffffac6b6b020cf0 x6 : ffffac6b6b020ce8
<4>[ 19.767945] x5 : ffffac6b6b020d00 x4 : ffffac6b6b020cf8 x3 : ffff4faf16035fa0
<4>[ 19.778648] x2 : 0000000000000000 x1 : 000000000000001c x0 : 0000000000000031
<4>[ 19.789366] Call trace:
<4>[ 19.795381] mt7921_regd_notifier+0x180/0x290 [mt7921_common]
<4>[ 19.804675] wiphy_update_regulatory+0x2bc/0xa08 [cfg80211]
<4>[ 19.813864] wiphy_regulatory_register+0x4c/0x88 [cfg80211]
<4>[ 19.823029] wiphy_register+0x75c/0x8d0 [cfg80211]
<4>[ 19.831446] ieee80211_register_hw+0x70c/0xc10 [mac80211]
<4>[ 19.840479] mt76_register_device+0x168/0x2e8 [mt76]
<4>[ 19.849008] mt7921_init_work+0xdc/0x250 [mt7921_common]
<4>[ 19.857817] process_one_work+0x148/0x3c0
<4>[ 19.865292] worker_thread+0x32c/0x450
<4>[ 19.872489] kthread+0x11c/0x128
<4>[ 19.879173] ret_from_fork+0x10/0x20
<0>[ 19.886153] Code: f0000041 9100a021 94000aef aa0003f9 (b9401780)
<4>[ 19.895634] ---[ end trace 0000000000000000 ]---
Regards,
Angelo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed
2023-10-17 10:32 ` AngeloGioacchino Del Regno
@ 2023-10-17 13:17 ` Deren Wu (武德仁)
0 siblings, 0 replies; 11+ messages in thread
From: Deren Wu (武德仁) @ 2023-10-17 13:17 UTC (permalink / raw)
To: nbd@nbd.name, angelogioacchino.delregno@collabora.com,
lorenzo@kernel.org
Cc: Mingyen Hsieh (謝明諺),
linux-mediatek@lists.infradead.org,
Leon Yen (顏良儒),
Shayne Chen (陳軒丞),
Stella Chang (張曉佩),
Quan Zhou (周全), Sean Wang,
KM Lin (林昆民),
Soul Huang (黃至昶),
Posh Sun (孫瑞廷),
Eric-SY Chang (張書源),
CH Yeh (葉志豪),
Robin Chiu (邱國濱), Ryder Lee,
linux-wireless@vger.kernel.org
Hi Angelo,
On Tue, 2023-10-17 at 12:32 +0200, AngeloGioacchino Del Regno wrote:
> Il 30/09/23 04:25, Deren Wu ha scritto:
> > From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
> >
> > The 5.9/6GHz channel license of a certain platform device has been
> > regulated in various countries. That may be difference with
> > standard
> > Liunx regulatory domain settings. In this case, when
> > .reg_notifier()
> > called for regulatory change, mt792x chipset should update the
> > channel
> > usage based on clc or dts configurations.
> >
> > Channel would be disabled by following cases.
> > * clc report the particular UNII-x is disabled.
> > * dts enabled and the channel is not configured.
> >
> > Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
> > Co-developed-by: Deren Wu <deren.wu@mediatek.com>
> > Signed-off-by: Deren Wu <deren.wu@mediatek.com>
>
> Hello,
> this patch is giving a kernel panic on the MT8195 Acer Tomato
> Chromebook.
>
Thanks for the report. We provide a patch for this case and complete
the test with mt7921/mt7922. Could you please help to check the new
patch?
https://lore.kernel.org/all/b3c45980a230f17af186d4004107ed27ee952cc9.1697547461.git.deren.wu@mediatek.com/
Thanks,
Deren
>
> Please refer to this stacktrace:
>
> <1>[ 19.442078] Unable to handle kernel NULL pointer dereference at
> virtual
> address 0000000000000014
> <1>[ 19.457535] Mem abort info:
> <1>[ 19.465329] ESR = 0x0000000096000004
> <1>[ 19.473295] EC = 0x25: DABT (current EL), IL = 32 bits
> <1>[ 19.482354] SET = 0, FnV = 0
> <1>[ 19.489143] EA = 0, S1PTW = 0
> <1>[ 19.495991] FSC = 0x04: level 0 translation fault
> <1>[ 19.504554] Data abort info:
> <1>[ 19.511111] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
> <1>[ 19.520269] CM = 0, WnR = 0, TnD = 0, TagAccess = 0
> <1>[ 19.528988] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
> <1>[ 19.537960] user pgtable: 4k pages, 48-bit VAs,
> pgdp=00000001027a9000
> <1>[ 19.548014] [0000000000000014] pgd=0000000000000000,
> p4d=0000000000000000
> <0>[ 19.558429] Internal error: Oops: 0000000096000004 [#1] PREEMPT
> SMP
> <4>[ 19.568270] Modules linked in: mt7921e mt7921_common
> mt792x_lib
> mt76_connac_lib mt76 mac80211 btusb btintel cfg80211 btmtk
> snd_sof_ipc_msg_injector
> btrtl snd_sof_ipc_flood_test btbcm bluetooth snd_sof_mt8195 uvcvideo
> mtk_adsp_common snd_sof_xtensa_dsp uvc snd_sof_of snd_sof
> videobuf2_vmalloc
> ecdh_generic ecc snd_sof_utils cros_ec_lid_angle cros_ec_sensors
> crct10dif_ce
> cros_ec_sensors_core cros_usbpd_logger crypto_user fuse ip_tables
> ipv6
> <4>[ 19.614237] CPU: 1 PID: 105 Comm: kworker/1:1 Not tainted
> 6.6.0-rc6-next-20231017+ #324
> <4>[ 19.625957] Hardware name: Acer Tomato (rev2) board (DT)
> <4>[ 19.634970] Workqueue: events mt7921_init_work [mt7921_common]
> <4>[ 19.644522] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT
> -SSBS BTYPE=--)
> <4>[ 19.655182] pc : mt7921_regd_notifier+0x180/0x290
> [mt7921_common]
> <4>[ 19.664983] lr : mt7921_regd_notifier+0xd4/0x290
> [mt7921_common]
> <4>[ 19.674679] sp : ffff800080acba80
> <4>[ 19.681649] x29: ffff800080acba80 x28: 0000000000000000 x27:
> ffff4faf16032148
> <4>[ 19.692483] x26: 0000000000000000 x25: 0000000000000000 x24:
> ffff4faf1603afa0
> <4>[ 19.703294] x23: 00000000ffffe926 x22: ffff4faf16031fa0 x21:
> 0000000000000023
> <4>[ 19.714108] x20: 000000000000001c x19: ffff4faf16ba6f40 x18:
> 00000000ff1d6000
> <4>[ 19.724928] x17: 0000000000000000 x16: ffffac6b891c2750 x15:
> ffff800081051000
> <4>[ 19.735722] x14: 0000000000000180 x13: 0000000000000000 x12:
> 0000000000000002
> <4>[ 19.746478] x11: 0000000000000002 x10: ffff4faf01c21780 x9 :
> ffffac6b891c282c
> <4>[ 19.757214] x8 : 00000000006c0000 x7 : ffffac6b6b020cf0 x6 :
> ffffac6b6b020ce8
> <4>[ 19.767945] x5 : ffffac6b6b020d00 x4 : ffffac6b6b020cf8 x3 :
> ffff4faf16035fa0
> <4>[ 19.778648] x2 : 0000000000000000 x1 : 000000000000001c x0 :
> 0000000000000031
> <4>[ 19.789366] Call trace:
> <4>[ 19.795381] mt7921_regd_notifier+0x180/0x290 [mt7921_common]
> <4>[ 19.804675] wiphy_update_regulatory+0x2bc/0xa08 [cfg80211]
> <4>[ 19.813864] wiphy_regulatory_register+0x4c/0x88 [cfg80211]
> <4>[ 19.823029] wiphy_register+0x75c/0x8d0 [cfg80211]
> <4>[ 19.831446] ieee80211_register_hw+0x70c/0xc10 [mac80211]
> <4>[ 19.840479] mt76_register_device+0x168/0x2e8 [mt76]
> <4>[ 19.849008] mt7921_init_work+0xdc/0x250 [mt7921_common]
> <4>[ 19.857817] process_one_work+0x148/0x3c0
> <4>[ 19.865292] worker_thread+0x32c/0x450
> <4>[ 19.872489] kthread+0x11c/0x128
> <4>[ 19.879173] ret_from_fork+0x10/0x20
> <0>[ 19.886153] Code: f0000041 9100a021 94000aef aa0003f9
> (b9401780)
> <4>[ 19.895634] ---[ end trace 0000000000000000 ]---
>
> Regards,
> Angelo
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi
2023-09-30 2:25 [PATCH v2 0/6] wifi: mt76: mt7921: support per-device regulatory settings Deren Wu
` (4 preceding siblings ...)
2023-09-30 2:25 ` [PATCH v2 5/6] wifi: mt76: mt7921: update the channel usage when the regd domain changed Deren Wu
@ 2023-09-30 2:25 ` Deren Wu
2023-09-30 3:02 ` Deren Wu (武德仁)
5 siblings, 1 reply; 11+ messages in thread
From: Deren Wu @ 2023-09-30 2:25 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Sean Wang, Soul Huang, Ming Yen Hsieh, Leon Yen, Eric-SY Chang,
KM Lin, Robin Chiu, CH Yeh, Posh Sun, Stella Chang, Quan Zhou,
Ryder Lee, Shayne Chen, linux-wireless, linux-mediatek, rong.yan,
Deren Wu
From: "rong.yan" <rong.yan@mediatek.com>
The mtcl table, configured by platform vendor, provides regulatory
information for 5.9/6 GHz channels. mt792x should work on
corresponding channels supported by mtcl. This patch would parse
the settings in mtcl table and apply the result into chip side.
Signed-off-by: rong.yan <rong.yan@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +-
drivers/net/wireless/mediatek/mt76/mt792x.h | 6 +++
.../wireless/mediatek/mt76/mt792x_acpi_sar.c | 53 +++++++++++++++++++
.../wireless/mediatek/mt76/mt792x_acpi_sar.h | 2 +
4 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 63f3d4a5c9aa..94fc3eb40234 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1260,12 +1260,14 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 alpha2[2];
u8 type[2];
u8 env_6g;
- u8 rsvd[63];
+ u8 mtcl_conf;
+ u8 rsvd[62];
} __packed req = {
.idx = idx,
.env = env_cap,
.env_6g = dev->phy.power_type,
.acpi_conf = mt792x_acpi_get_flags(&dev->phy),
+ .mtcl_conf = mt792x_acpi_get_mtcl_conf(&dev->phy, alpha2),
};
int ret, valid_cnt = 0;
u8 i, *pos;
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 34380d1eb9f4..5b2b97762d01 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -364,6 +364,7 @@ int mt792xe_mcu_fw_pmctrl(struct mt792x_dev *dev);
int mt792x_init_acpi_sar(struct mt792x_dev *dev);
int mt792x_init_acpi_sar_power(struct mt792x_phy *phy, bool set_default);
u8 mt792x_acpi_get_flags(struct mt792x_phy *phy);
+u8 mt792x_acpi_get_mtcl_conf(struct mt792x_phy *phy, char *alpha2);
#else
static inline int mt792x_init_acpi_sar(struct mt792x_dev *dev)
{
@@ -380,6 +381,11 @@ static inline u8 mt792x_acpi_get_flags(struct mt792x_phy *phy)
{
return 0;
}
+
+static inline u8 mt792x_acpi_get_mtcl_conf(struct mt792x_phy *phy, char *alpha2)
+{
+ return 0xf;
+}
#endif
#endif /* __MT7925_H */
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
index 303c0f5c9c66..e7afea87e82e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c
@@ -348,3 +348,56 @@ u8 mt792x_acpi_get_flags(struct mt792x_phy *phy)
return flags;
}
EXPORT_SYMBOL_GPL(mt792x_acpi_get_flags);
+
+static u8
+mt792x_acpi_get_mtcl_map(int row, int column, struct mt792x_asar_cl *cl)
+{
+ u8 config = 0;
+
+ if (cl->cl6g[row] & BIT(column))
+ config |= (cl->mode_6g & 0x3) << 2;
+ if (cl->version > 1 && cl->cl5g9[row] & BIT(column))
+ config |= (cl->mode_5g9 & 0x3);
+
+ return config;
+}
+
+u8 mt792x_acpi_get_mtcl_conf(struct mt792x_phy *phy, char *alpha2)
+{
+ static const char * const cc_list_all[] = {
+ "00", "EU", "AR", "AU", "AZ", "BY", "BO", "BR",
+ "CA", "CL", "CN", "ID", "JP", "MY", "MX", "ME",
+ "MA", "NZ", "NG", "PH", "RU", "RS", "SG", "KR",
+ "TW", "TH", "UA", "GB", "US", "VN", "KH", "PY",
+ };
+ static const char * const cc_list_eu[] = {
+ "AT", "BE", "BG", "CY", "CZ", "HR", "DK", "EE",
+ "FI", "FR", "DE", "GR", "HU", "IS", "IE", "IT",
+ "LV", "LI", "LT", "LU", "MT", "NL", "NO", "PL",
+ "PT", "RO", "MT", "SK", "SI", "ES", "CH",
+ };
+ struct mt792x_acpi_sar *sar = phy->acpisar;
+ struct mt792x_asar_cl *cl;
+ int col, row, i;
+
+ if (!sar)
+ return 0xf;
+
+ cl = sar->countrylist;
+ if (!cl)
+ return 0xc;
+
+ for (i = 0; i < ARRAY_SIZE(cc_list_all); i++) {
+ col = 7 - i % 8;
+ row = i / 8;
+ if (!memcmp(cc_list_all[i], alpha2, 2))
+ return mt792x_acpi_get_mtcl_map(row, col, cl);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(cc_list_eu); i++)
+ if (!memcmp(cc_list_eu[i], alpha2, 2))
+ return mt792x_acpi_get_mtcl_map(0, 6, cl);
+
+ return mt792x_acpi_get_mtcl_map(0, 7, cl);
+}
+EXPORT_SYMBOL_GPL(mt792x_acpi_get_mtcl_conf);
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h
index d6d332e863ba..2298983b6342 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h
@@ -77,6 +77,8 @@ struct mt792x_asar_cl {
u8 version;
u8 mode_6g;
u8 cl6g[6];
+ u8 mode_5g9;
+ u8 cl5g9[6];
} __packed;
struct mt792x_asar_fg {
--
2.18.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi
2023-09-30 2:25 ` [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi Deren Wu
@ 2023-09-30 3:02 ` Deren Wu (武德仁)
2023-10-02 5:56 ` Kalle Valo
0 siblings, 1 reply; 11+ messages in thread
From: Deren Wu (武德仁) @ 2023-09-30 3:02 UTC (permalink / raw)
To: nbd@nbd.name, lorenzo@kernel.org
Cc: Mingyen Hsieh (謝明諺),
linux-mediatek@lists.infradead.org,
Leon Yen (顏良儒), Rong Yan (鄢荣),
Shayne Chen (陳軒丞),
Stella Chang (張曉佩),
Quan Zhou (周全), Sean Wang,
KM Lin (林昆民),
Soul Huang (黃至昶),
Posh Sun (孫瑞廷),
Eric-SY Chang (張書源),
CH Yeh (葉志豪),
Robin Chiu (邱國濱), Ryder Lee,
linux-wireless@vger.kernel.org
On Sat, 2023-09-30 at 10:25 +0800, Deren Wu wrote:
> From: "rong.yan" <rong.yan@mediatek.com>
Hi Felix,
I am not sure why this patch is not shown in wireless patchwork, but it
is mediatek patchwork alreay. Guess there is something wrong in
author's naming parsing. I prefer to keep this patch in mail thred only, how do you think?
Regards,
Deren
>
> The mtcl table, configured by platform vendor, provides regulatory
> information for 5.9/6 GHz channels. mt792x should work on
> corresponding channels supported by mtcl. This patch would parse
> the settings in mtcl table and apply the result into chip side.
>
> Signed-off-by: rong.yan <rong.yan@mediatek.com>
> Co-developed-by: Deren Wu <deren.wu@mediatek.com>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
> ---
> .../net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +-
> drivers/net/wireless/mediatek/mt76/mt792x.h | 6 +++
> .../wireless/mediatek/mt76/mt792x_acpi_sar.c | 53
> +++++++++++++++++++
> .../wireless/mediatek/mt76/mt792x_acpi_sar.h | 2 +
> 4 files changed, 64 insertions(+), 1 deletion(-)
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 6/6] wifi: mt76: mt7921: support 5.9/6GHz channel config in acpi
2023-09-30 3:02 ` Deren Wu (武德仁)
@ 2023-10-02 5:56 ` Kalle Valo
0 siblings, 0 replies; 11+ messages in thread
From: Kalle Valo @ 2023-10-02 5:56 UTC (permalink / raw)
To: Deren Wu (武德仁)
Cc: nbd@nbd.name, lorenzo@kernel.org,
Mingyen Hsieh (謝明諺),
linux-mediatek@lists.infradead.org,
Leon Yen (顏良儒), Rong Yan (鄢荣),
Shayne Chen (陳軒丞),
Stella Chang (張曉佩),
Quan Zhou (周全), Sean Wang,
KM Lin (林昆民),
Soul Huang (黃至昶),
Posh Sun (孫瑞廷),
Eric-SY Chang (張書源),
CH Yeh (葉志豪),
Robin Chiu (邱國濱), Ryder Lee,
linux-wireless@vger.kernel.org
"Deren Wu (武德仁)" <Deren.Wu@mediatek.com> writes:
> On Sat, 2023-09-30 at 10:25 +0800, Deren Wu wrote:
>> From: "rong.yan" <rong.yan@mediatek.com>
>
> Hi Felix,
>
> I am not sure why this patch is not shown in wireless patchwork, but it
> is mediatek patchwork alreay. Guess there is something wrong in
> author's naming parsing. I prefer to keep this patch in mail thred only, how do you think?
The patch is also available in lore:
https://lore.kernel.org/all/f01bcf001c896a74e36ac9905bece382efb13b0d.1696039301.git.deren.wu@mediatek.com/
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 11+ messages in thread