gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: connac: replace is_mt7925() with is_connac3()

Browse Source 
Use is_connac3() instead of is_mt7925() to avoid confusion
when more chips join.

Signed-off-by: Sean Wang <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Sean Wang
2026-05-28 13:32:33 +02:00
committed by Felix Fietkau
parent f698c7f225
commit 1f91523cb9
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76_connac.h
+6 -1
View File
@@ -172,11 +172,16 @@ struct mt76_connac_tx_free {
extern const struct wiphy_wowlan_support mt76_connac_wowlan_support; extern const struct wiphy_wowlan_support mt76_connac_wowlan_support;
static inline bool is_mt7925(struct mt76_dev *dev) static inline bool is_connac3(struct mt76_dev *dev)
{ {
return mt76_chip(dev) == 0x7925 || mt76_chip(dev) == 0x7927; return mt76_chip(dev) == 0x7925 || mt76_chip(dev) == 0x7927;
} }
static inline bool is_mt7925(struct mt76_dev *dev)
{
return mt76_chip(dev) == 0x7925;
}
static inline bool is_mt7927(struct mt76_dev *dev) static inline bool is_mt7927(struct mt76_dev *dev)
{ {
return mt76_chip(dev) == 0x7927; return mt76_chip(dev) == 0x7927;
mt76_connac_mac.c
+2 -2
View File
@@ -173,7 +173,7 @@ void mt76_connac_write_hw_txp(struct mt76_dev *dev,
txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID);
if (is_mt7663(dev) || is_connac2(dev) || is_mt7925(dev)) if (is_mt7663(dev) || is_connac2(dev) || is_connac3(dev))
last_mask = MT_TXD_LEN_LAST; last_mask = MT_TXD_LEN_LAST;
else else
last_mask = MT_TXD_LEN_AMSDU_LAST | last_mask = MT_TXD_LEN_AMSDU_LAST |
@@ -217,7 +217,7 @@ mt76_connac_txp_skb_unmap_hw(struct mt76_dev *dev,
u32 last_mask; u32 last_mask;
int i; int i;
if (is_mt7663(dev) || is_connac2(dev) || is_mt7925(dev)) if (is_mt7663(dev) || is_connac2(dev) || is_connac3(dev))
last_mask = MT_TXD_LEN_LAST; last_mask = MT_TXD_LEN_LAST;
else else
last_mask = MT_TXD_LEN_MSDU_LAST; last_mask = MT_TXD_LEN_MSDU_LAST;
mt76_connac_mcu.c
+2 -2
View File
@@ -67,7 +67,7 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len,
if ((!is_connac_v1(dev) && addr == MCU_PATCH_ADDRESS) || if ((!is_connac_v1(dev) && addr == MCU_PATCH_ADDRESS) ||
(is_connac2(dev) && addr == 0x900000) || (is_connac2(dev) && addr == 0x900000) ||
(is_mt7925(dev) && (addr == 0x900000 || addr == 0xe0002800)) || (is_connac3(dev) && (addr == 0x900000 || addr == 0xe0002800)) ||
(is_mt799x(dev) && addr == 0x900000)) (is_mt799x(dev) && addr == 0x900000))
cmd = MCU_CMD(PATCH_START_REQ); cmd = MCU_CMD(PATCH_START_REQ);
else else
@@ -3089,7 +3089,7 @@ static u32 mt76_connac2_get_data_mode(struct mt76_dev *dev, u32 info)
{ {
u32 mode = DL_MODE_NEED_RSP; u32 mode = DL_MODE_NEED_RSP;
if ((!is_connac2(dev) && !is_mt7925(dev)) || info == PATCH_SEC_NOT_SUPPORT) if ((!is_connac2(dev) && !is_connac3(dev)) || info == PATCH_SEC_NOT_SUPPORT)
return mode; return mode;
switch (FIELD_GET(PATCH_SEC_ENC_TYPE_MASK, info)) { switch (FIELD_GET(PATCH_SEC_ENC_TYPE_MASK, info)) {
mt76_connac_mcu.h
+1 -1
View File
@@ -1879,7 +1879,7 @@ mt76_connac_mcu_gen_dl_mode(struct mt76_dev *dev, u8 feature_set, bool is_wa)
ret |= feature_set & FW_FEATURE_SET_ENCRYPT ? ret |= feature_set & FW_FEATURE_SET_ENCRYPT ?
DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV : 0; DL_MODE_ENCRYPT | DL_MODE_RESET_SEC_IV : 0;
if (is_connac2(dev) || is_mt7925(dev)) if (is_connac2(dev) || is_connac3(dev))
ret |= feature_set & FW_FEATURE_ENCRY_MODE ? ret |= feature_set & FW_FEATURE_ENCRY_MODE ?
DL_CONFIG_ENCRY_MODE_SEL : 0; DL_CONFIG_ENCRY_MODE_SEL : 0;
ret |= FIELD_PREP(DL_MODE_KEY_IDX, ret |= FIELD_PREP(DL_MODE_KEY_IDX,
mt792x_usb.c
+1 -1
View File
@@ -263,7 +263,7 @@ EXPORT_SYMBOL_GPL(mt792xu_dma_init);
int mt792xu_wfsys_reset(struct mt792x_dev *dev) int mt792xu_wfsys_reset(struct mt792x_dev *dev)
{ {
const struct mt792xu_wfsys_desc *desc = is_mt7925(&dev->mt76) ? const struct mt792xu_wfsys_desc *desc = is_connac3(&dev->mt76) ?
&mt7925_wfsys_desc : &mt7925_wfsys_desc :
&mt7921_wfsys_desc; &mt7921_wfsys_desc;
u32 val; u32 val;