Skip to contentSkip to conversation

wifi: mt76: mt7925: add rfkill_poll for hardware rfkill

PATCH Superseded Allan Wang 2 participants 2 messages May 5, 2025

Subsystems (2)
Arm MediaTek MediaTek MT76 wireless LAN driver

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Allan Wang

author
#0 lore raw

PATCH 1/1 wifi: mt76: mt7925: add rfkill_poll for hardware rfkill

Add mac80211 rfkill_poll ops to monitor hardware rfkill state and state change will be updated.

Signed-off-by Allan Wang <[email protected]>
---
 .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  1 +
 .../net/wireless/mediatek/mt76/mt7925/main.c  | 16 ++++++++
 .../net/wireless/mediatek/mt76/mt7925/mcu.c   | 39 +++++++++++++++++++
 .../wireless/mediatek/mt76/mt7925/mt7925.h    |  1 +
 .../net/wireless/mediatek/mt76/mt7925/pci.c   |  4 ++
 5 files changed, 61 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -0
index 478cd1886736..e195d69f61f6 100644
@@ -1298,6 +1298,7 @@ enum {
 	MCU_UNI_CMD_PER_STA_INFO = 0x6d,
 	MCU_UNI_CMD_ALL_STA_INFO = 0x6e,
 	MCU_UNI_CMD_ASSERT_DUMP = 0x6f,
+	MCU_UNI_CMD_RADIO_STATUS = 0x80,
 	MCU_UNI_CMD_SDO = 0x88,
 };
drivers/net/wireless/mediatek/mt76/mt7925/main.c +16 -0
index 83f93f9e002c..65bf9aef2b5e 100644
@@ -334,6 +334,9 @@ int __mt7925_start(struct mt792x_phy *phy)
 	ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
 				     MT792x_WATCHDOG_TIME);
 
+	if (phy->chip_cap & MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN)
+		wiphy_rfkill_start_polling(mphy->hw->wiphy);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(__mt7925_start);

@@ -2205,6 +2208,18 @@ static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw,
 	mutex_unlock(&dev->mt76.mutex);
 }
 
+static void mt7925_rfkill_poll(struct ieee80211_hw *hw)
+{
+	struct mt792x_phy *phy = mt792x_hw_phy(hw);
+	int ret = 0;
+
+	mt792x_mutex_acquire(phy->dev);
+	ret = mt7925_mcu_wf_rf_pin_ctrl(phy);
+	mt792x_mutex_release(phy->dev);
+
+	wiphy_rfkill_set_hw_state(hw->wiphy, ret ? false : true);
+}
+
 const struct ieee80211_ops mt7925_ops = {
 	.tx = mt792x_tx,
 	.start = mt7925_start,

@@ -2265,6 +2280,7 @@ const struct ieee80211_ops mt7925_ops = {
 	.link_info_changed = mt7925_link_info_changed,
 	.change_vif_links = mt7925_change_vif_links,
 	.change_sta_links = mt7925_change_sta_links,
+	.rfkill_poll = mt7925_rfkill_poll,
 };
 EXPORT_SYMBOL_GPL(mt7925_ops);
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +39 -0
index 286f602623c0..31fa092d2c8c 100644
@@ -3633,6 +3633,45 @@ int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy)
 	return 0;
 }
 
+int mt7925_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy)
+{
+#define UNI_CMD_RADIO_STATUS_GET	0
+	struct mt792x_dev *dev = phy->dev;
+	struct sk_buff *skb;
+	int ret;
+
+	struct {
+		__le16 tag;
+		__le16 len;
+		u8 rsv[4];
+	} __packed req = {
+		.tag = UNI_CMD_RADIO_STATUS_GET,
+		.len = cpu_to_le16(sizeof(req)),
+	};
+
+	struct mt7925_radio_status_event {
+		__le16 tag;
+		__le16 len;
+
+		u8 data;
+		u8 rsv[3];
+	} __packed * status;
+
+	ret = mt76_mcu_send_and_get_msg(&dev->mt76,
+					MCU_UNI_CMD(RADIO_STATUS),
+					&req, sizeof(req), true, &skb);
+	if (ret)
+		return ret;
+
+	skb_pull(skb, sizeof(struct tlv));
+	status = (struct mt7925_radio_status_event *)skb->data;
+	ret = (int)status->data;
+
+	dev_kfree_skb(skb);
+
+	return ret;
+}
+
 int mt7925_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,
 			    u8 bit_op, u32 bit_map)
 {
drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h +1 -0
index 4e50f2597ccd..283a40badd28 100644
@@ -365,5 +365,6 @@ int mt7925_mcu_wtbl_update_hdr_trans(struct mt792x_dev *dev,
 				     struct ieee80211_vif *vif,
 				     struct ieee80211_sta *sta,
 				     int link_id);
+int mt7925_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy);
 
 #endif
drivers/net/wireless/mediatek/mt76/mt7925/pci.c +4 -0
index c7b5dc1dbb34..b997cd8bf8d0 100644
@@ -31,6 +31,10 @@ static void mt7925e_unregister_device(struct mt792x_dev *dev)
 {
 	int i;
 	struct mt76_connac_pm *pm = &dev->pm;
+	struct ieee80211_hw *hw = mt76_hw(dev);
+
+	if (dev->phy.chip_cap & MT792x_CHIP_CAP_WF_RF_PIN_CTRL_EVT_EN)
+		wiphy_rfkill_stop_polling(hw->wiphy);
 
 	cancel_work_sync(&dev->init_work);
 	mt76_unregister_device(&dev->mt76);
Signature · 1 line
2.45.2
#1 lore raw

Allan Wang <[email protected]> wrote:

[...]

drivers/net/wireless/mediatek/mt76/mt7925/main.c static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw, · line 2214

Quoted 8 lines
drivers/net/wireless/mediatek/mt76/mt7925/main.c +4 -0
@@ -2205,6 +2208,18 @@ static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw,
        mutex_unlock(&dev->mt76.mutex);
 }
 
+static void mt7925_rfkill_poll(struct ieee80211_hw *hw)
+{
+       struct mt792x_phy *phy = mt792x_hw_phy(hw);
+       int ret = 0;

no need initializer.

drivers/net/wireless/mediatek/mt76/mt7925/main.c static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw, · line 2220

Quoted 6 lines
drivers/net/wireless/mediatek/mt76/mt7925/main.c +6 -0
+
+       mt792x_mutex_acquire(phy->dev);
+       ret = mt7925_mcu_wf_rf_pin_ctrl(phy);
+       mt792x_mutex_release(phy->dev);
+
+       wiphy_rfkill_set_hw_state(hw->wiphy, ret ? false : true);

wiphy_rfkill_set_hw_state(hw->wiphy, ret == 0);

or

wiphy_rfkill_set_hw_state(hw->wiphy, !ret);

Quoted 19 lines
drivers/net/wireless/mediatek/mt76/mt7925/main.c +3 -0
+}
+
 const struct ieee80211_ops mt7925_ops = {
        .tx = mt792x_tx,
        .start = mt7925_start,

@@ -2265,6 +2280,7 @@ const struct ieee80211_ops mt7925_ops = {
        .link_info_changed = mt7925_link_info_changed,
        .change_vif_links = mt7925_change_vif_links,
        .change_sta_links = mt7925_change_sta_links,
+       .rfkill_poll = mt7925_rfkill_poll,
 };
 EXPORT_SYMBOL_GPL(mt7925_ops);
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +0 -0
index 286f602623c0..31fa092d2c8c 100644

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy) · line 3642

Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +7 -0
@@ -3633,6 +3633,45 @@ int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy)
        return 0;
 }
 
+int mt7925_mcu_wf_rf_pin_ctrl(struct mt792x_phy *phy)
+{
+#define UNI_CMD_RADIO_STATUS_GET       0
+       struct mt792x_dev *dev = phy->dev;
+       struct sk_buff *skb;
+       int ret;
+

Should avoid empty line in declarations?

Quoted 6 lines
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +6 -0
+       struct {
+               __le16 tag;
+               __le16 len;
+               u8 rsv[4];
+       } __packed req = {
+               .tag = UNI_CMD_RADIO_STATUS_GET,

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy) · line 3658

Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +10 -0
+               .len = cpu_to_le16(sizeof(req)),
+       };
+
+       struct mt7925_radio_status_event {
+               __le16 tag;
+               __le16 len;
+
+               u8 data;
+               u8 rsv[3];
+       } __packed * status;

I remember this should be "__packed *status", but checkpatch reports false-alarm.

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c int mt7925_mcu_set_rate_txpower(struct mt76_phy *phy) · line 3668

Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +10 -0
+
+       ret = mt76_mcu_send_and_get_msg(&dev->mt76,
+                                       MCU_UNI_CMD(RADIO_STATUS),
+                                       &req, sizeof(req), true, &skb);
+       if (ret)
+               return ret;
+
+       skb_pull(skb, sizeof(struct tlv));
+       status = (struct mt7925_radio_status_event *)skb->data;
+       ret = (int)status->data;

I feel int casting is unnecessary.

Quoted 9 lines
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +6 -0
+
+       dev_kfree_skb(skb);
+
+       return ret;
+}
+
 int mt7925_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,
                            u8 bit_op, u32 bit_map)
 {

[...]