raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

wifi: mt76: mt7921: get regulatory information from the clc event

Browse Source 
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>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Ming Yen Hsieh
2023-09-30 10:25:08 +08:00
committed by Felix Fietkau
parent 51ba0e3a15
commit 4fc8df50fd
5 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
View File

@@ -1355,6 +1355,7 @@ enum {
MT_NIC_CAP_ANTSWP = 0x16, MT_NIC_CAP_ANTSWP = 0x16,
MT_NIC_CAP_WFDMA_REALLOC, MT_NIC_CAP_WFDMA_REALLOC,
MT_NIC_CAP_6G, MT_NIC_CAP_6G,
MT_NIC_CAP_CHIP_CAP = 0x20,
}; };
#define UNI_WOW_DETECT_TYPE_MAGIC BIT(0) #define UNI_WOW_DETECT_TYPE_MAGIC BIT(0)

26
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
View File

@@ -557,6 +557,9 @@ static int mt7921_mcu_get_nic_capability(struct mt792x_phy *mphy)
mt7921_mcu_parse_tx_resource(phy->dev, mt7921_mcu_parse_tx_resource(phy->dev,
skb); skb);
break; break;
case MT_NIC_CAP_CHIP_CAP:
memcpy(&mphy->chip_cap, (void *)skb->data, sizeof(u64));
break;
default: default:
break; break;
} }
@@ -1243,7 +1246,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
struct mt7921_clc *clc, struct mt7921_clc *clc,
u8 idx) u8 idx)
{ {
struct sk_buff *skb; #define CLC_CAP_EVT_EN BIT(0)
struct sk_buff *skb, *ret_skb = NULL;
struct { struct {
u8 ver; u8 ver;
u8 pad0; u8 pad0;
@@ -1251,7 +1255,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 idx; u8 idx;
u8 env; u8 env;
u8 acpi_conf; u8 acpi_conf;
u8 pad1; u8 cap;
u8 alpha2[2]; u8 alpha2[2];
u8 type[2]; u8 type[2];
u8 env_6g; u8 env_6g;
@@ -1268,6 +1272,9 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
if (!clc) if (!clc)
return 0; return 0;
if (dev->phy.chip_cap & MT792x_CHIP_CAP_CLC_EVT_EN)
req.cap |= CLC_CAP_EVT_EN;
pos = clc->data; pos = clc->data;
for (i = 0; i < clc->nr_country; i++) { for (i = 0; i < clc->nr_country; i++) {
struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos; 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; return -ENOMEM;
skb_put_data(skb, rule->data, len); skb_put_data(skb, rule->data, len);
ret = mt76_mcu_skb_send_msg(&dev->mt76, skb, ret = mt76_mcu_skb_send_and_get_msg(&dev->mt76, skb,
MCU_CE_CMD(SET_CLC), false); MCU_CE_CMD(SET_CLC),
!!(req.cap & CLC_CAP_EVT_EN),
&ret_skb);
if (ret < 0) if (ret < 0)
return ret; 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++; valid_cnt++;
} }

13
drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
View File

@@ -99,4 +99,17 @@ struct mt7921_rftest_evt {
__le32 param0; __le32 param0;
__le32 param1; __le32 param1;
} __packed; } __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 #endif

1
drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
View File

@@ -24,6 +24,7 @@
#define MT7921_SKU_TABLE_SIZE (MT7921_SKU_RATE_NUM + 1) #define MT7921_SKU_TABLE_SIZE (MT7921_SKU_RATE_NUM + 1)
#define MCU_UNI_EVENT_ROC 0x27 #define MCU_UNI_EVENT_ROC 0x27
#define MCU_UNI_EVENT_CLC 0x80
enum { enum {
UNI_ROC_ACQUIRE, UNI_ROC_ACQUIRE,

4
drivers/net/wireless/mediatek/mt76/mt792x.h
View File

@@ -25,6 +25,8 @@
#define MT792x_FW_TAG_FEATURE 4 #define MT792x_FW_TAG_FEATURE 4
#define MT792x_FW_CAP_CNM BIT(7) #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 */ /* NOTE: used to map mt76_rates. idx may change if firmware expands table */
#define MT792x_BASIC_RATES_TBL 11 #define MT792x_BASIC_RATES_TBL 11
@@ -125,6 +127,7 @@ struct mt792x_phy {
struct mt76_mib_stats mib; struct mt76_mib_stats mib;
u8 sta_work_count; u8 sta_work_count;
u8 clc_chan_conf;
enum mt792x_reg_power_type power_type; enum mt792x_reg_power_type power_type;
struct sk_buff_head scan_event_list; struct sk_buff_head scan_event_list;
@@ -133,6 +136,7 @@ struct mt792x_phy {
void *acpisar; void *acpisar;
#endif #endif
void *clc[MT792x_CLC_MAX_NUM]; void *clc[MT792x_CLC_MAX_NUM];
u64 chip_cap;
struct work_struct roc_work; struct work_struct roc_work;
struct timer_list roc_timer; struct timer_list roc_timer;