Add MT7990 support
Subsystems (2)
Shayne Chen
reviewerv3 cover Add MT7990 support
This series introduces support for the MT7990 PCI Wi-Fi device, a Wi-Fi 7 chipset that supports Dual-Band Dual Concurrent (DBDC) on both 2.4 GHz and 5 GHz bands.
This series is based on:
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/
v2:
- remove accidentally added tag in 03/10
- fix variable used uninitialized in 06/10
- add target tree name
v3:
- no need to wait response for SDO command (03/10)
- modify indentation of switch case bracket (09/10)
Peter Chiu (4):
wifi: mt76: mt7996: rework WA mcu command for mt7990
wifi: mt76: mt7996: rework DMA configuration for mt7990
wifi: mt76: mt7996: adjust HW capabilities for mt7990
wifi: mt76: mt7996: add PCI device id for mt7990
Shayne Chen (2):
wifi: mt76: mt7996: add macros for pci decive id
wifi: mt76: connac: rework TX descriptor and TX free for mt7990
StanleyYP Wang (4):
wifi: mt76: connac: add support to load firmware for mt7990
wifi: mt76: mt7996: rework register mapping for mt7990
wifi: mt76: mt7996: add eeprom support for mt7990
wifi: mt76: mt7996: rework background radar check for mt7990
.../net/wireless/mediatek/mt76/mt76_connac.h | 7 +- .../wireless/mediatek/mt76/mt76_connac3_mac.h | 1 + .../wireless/mediatek/mt76/mt76_connac_mcu.c | 3 +- .../wireless/mediatek/mt76/mt76_connac_mcu.h | 2 + .../wireless/mediatek/mt76/mt7996/coredump.c | 4 +- .../net/wireless/mediatek/mt76/mt7996/dma.c | 192 ++++++++++++------ .../wireless/mediatek/mt76/mt7996/eeprom.c | 41 +++- .../net/wireless/mediatek/mt76/mt7996/init.c | 18 +- .../net/wireless/mediatek/mt76/mt7996/mac.c | 42 +++- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 77 +++++-- .../net/wireless/mediatek/mt76/mt7996/mcu.h | 6 + .../net/wireless/mediatek/mt76/mt7996/mmio.c | 192 ++++++++++++++++-- .../wireless/mediatek/mt76/mt7996/mt7996.h | 50 +++-- .../net/wireless/mediatek/mt76/mt7996/pci.c | 21 +- .../net/wireless/mediatek/mt76/mt7996/regs.h | 51 +++-- 15 files changed, 549 insertions(+), 158 deletions(-)
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 1/10 wifi: mt76: mt7996: add macros for pci decive id
The chipset name (i.e., brand name) used by the driver may cause confusion with the PCI device ID when adding support for new chipsets.
| Chipset name | PCI device id | |--------------|----------------| | 7996 | 0x7990, 0x7991 | | 7992 | 0x7992, 0x799a | | 7990 | 0x7993, 0x799b |
To prevent confusion, replace the code that directly uses the device ID with macros. This is a preliminary patch to support mt7990 chipset.
--- .../net/wireless/mediatek/mt76/mt7996/coredump.c | 4 ++-- .../net/wireless/mediatek/mt76/mt7996/eeprom.c | 8 ++++---- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 6 +++--- .../net/wireless/mediatek/mt76/mt7996/mt7996.h | 9 +++++++-- drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 15 ++++++++------- 7 files changed, 28 insertions(+), 22 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/coredump.c +2 -2
@@ -48,8 +48,8 @@ const struct mt7996_mem_region* mt7996_coredump_get_mem_layout(struct mt7996_dev *dev, u32 *num) {switch (mt76_chip (&dev->mt76)) { -case 0x7990 : -case 0x7991 : +case MT7996_DEVICE_ID : +case MT7996_DEVICE_ID_2 : *num =ARRAY_SIZE (mt7996_mem_regions);return &mt7996_mem_regions[0 ];default :
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c +4 -4
@@ -13,9 +13,9 @@ static int mt7996_check_eeprom(struct mt7996_dev *dev)u16 val =get_unaligned_le16 (eeprom);switch (val) { -case 0x7990 : +case MT7996_DEVICE_ID :return is_mt7996 (&dev->mt76) ?0 : -EINVAL ; -case 0x7992 : +case MT7992_DEVICE_ID :return is_mt7992 (&dev->mt76) ?0 : -EINVAL ;default :return -EINVAL ;
@@ -25,7 +25,7 @@ static int mt7996_check_eeprom(struct mt7996_dev *dev)static char *mt7996_eeprom_name (struct mt7996_dev *dev) {switch (mt76_chip (&dev->mt76)) { -case 0x7992 : +case MT7992_DEVICE_ID :switch (dev->var.type) {case MT7992_VAR_TYPE_23 :if (dev->var.fem ==MT7996_FEM_INT )
@@ -39,7 +39,7 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev)return MT7992_EEPROM_DEFAULT_MIX ;return MT7992_EEPROM_DEFAULT ; } -case 0x7990 : +case MT7996_DEVICE_ID :default :switch (dev->var.type) {case MT7996_VAR_TYPE_233 :
drivers/net/wireless/mediatek/mt76/mt7996/init.c +2 -2
@@ -929,13 +929,13 @@ static int mt7996_variant_type_init(struct mt7996_dev *dev)u8 var_type;switch (mt76_chip (&dev->mt76)) { -case 0x7990 : +case MT7996_DEVICE_ID :if (val &MT_PAD_GPIO_2ADIE_TBTC ) var_type =MT7996_VAR_TYPE_233 ;else var_type =MT7996_VAR_TYPE_444 ;break ; -case 0x7992 : +case MT7992_DEVICE_ID :if (val &MT_PAD_GPIO_ADIE_SINGLE ) var_type =MT7992_VAR_TYPE_23 ;else if (u32_get_bits (val,MT_PAD_GPIO_ADIE_COMB_7992 ))
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +2 -2
@@ -13,7 +13,7 @@#define fw_name (_dev, name, ...) ({ \ char *_fw; \ switch (mt76_chip(&(_dev)->mt76)) { \ - case 0x7992: \ + case MT7992_DEVICE_ID: \ switch ((_dev)->var.type) { \ case MT7992_VAR_TYPE_23: \ _fw = MT7992_##name##_23; \
@@ -22,7 +22,7 @@ _fw = MT7992_##name; \ } \break ; \ -case 0x7990 : \ +case MT7996_DEVICE_ID : \default : \switch ((_dev)->var.type) { \case MT7996_VAR_TYPE_233 : \
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +3 -3
@@ -350,7 +350,7 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,MT_RXQ_RING_BASE (MT7996_RXQ_BAND0 ) +MT7996_RXQ_BAND0 *MT_RING_SIZE ; - wed->wlan.id =0x7991 ; + wed->wlan.id =MT7996_DEVICE_ID_2 ; wed->wlan.tx_tbit[0 ] =ffs (MT_INT_TX_DONE_BAND2 ) -1 ; }else { wed->wlan.hw_rro = dev->has_rro;/* default on */
@@ -443,13 +443,13 @@ static int mt7996_mmio_init(struct mt76_dev *mdev,spin_lock_init (&dev->reg_lock);switch (device_id) { -case 0x7990 : +case MT7996_DEVICE_ID : dev->reg.base = mt7996_reg_base; dev->reg.offs_rev = mt7996_offs; dev->reg.map = mt7996_reg_map; dev->reg.map_size =ARRAY_SIZE (mt7996_reg_map);break ; -case 0x7992 : +case MT7992_DEVICE_ID : dev->reg.base = mt7996_reg_base; dev->reg.offs_rev = mt7992_offs; dev->reg.map = mt7996_reg_map;
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +7 -2
@@ -30,6 +30,11 @@#define MT7996_RX_MCU_RING_SIZE 512#define MT7996_RX_MCU_RING_SIZE_WA 1024 +#define MT7996_DEVICE_ID 0x7990 +#define MT7996_DEVICE_ID_2 0x7991 +#define MT7992_DEVICE_ID 0x7992 +#define MT7992_DEVICE_ID_2 0x799a +#define MT7996_FIRMWARE_WA "mediatek/mt7996/mt7996_wa.bin"#define MT7996_FIRMWARE_WM "mediatek/mt7996/mt7996_wm.bin"#define MT7996_FIRMWARE_DSP "mediatek/mt7996/mt7996_dsp.bin"
@@ -471,11 +476,11 @@ static inline bool mt7996_has_background_radar(struct mt7996_dev *dev) {switch (mt76_chip (&dev->mt76)) { -case 0x7990 : +case MT7996_DEVICE_ID :if (dev->var.type ==MT7996_VAR_TYPE_233 )return false;break ; -case 0x7992 : +case MT7992_DEVICE_ID :if (dev->var.type ==MT7992_VAR_TYPE_23 )return false;break ;
drivers/net/wireless/mediatek/mt76/mt7996/pci.c +8 -7
@@ -16,14 +16,14 @@ static DEFINE_SPINLOCK(hif_lock);static u32 hif_idx;static const struct pci_device_id mt7996_pci_device_table[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,0x7990 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,0x7992 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID ) }, { }, };static const struct pci_device_id mt7996_hif_device_table[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,0x7991 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,0x799a ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID_2 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID_2 ) }, { }, };
@@ -63,8 +63,8 @@ static struct mt7996_hif *mt7996_pci_init_hif2(struct pci_dev *pdev) { hif_idx++; -if (!pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x7991 ,NULL ) && - !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,0x799a ,NULL )) +if (!pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID_2 ,NULL ) && + !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID_2 ,NULL ))return NULL ; writel(hif_idx | MT_PCIE_RECOG_ID_SEM,
@@ -121,7 +121,8 @@ static int mt7996_pci_probe(struct pci_dev *pdev,mt76_pci_disable_aspm (pdev); -if (id->device ==0x7991 || id->device ==0x799a ) +if (id->device ==MT7996_DEVICE_ID_2 || + id->device ==MT7992_DEVICE_ID_2 )return mt7996_pci_hif2_probe (pdev); dev = mt7996_mmio_probe(&pdev->dev, pcim_iomap_table(pdev)[0],
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 2/10 wifi: mt76: connac: add support to load firmware for mt7990
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
Add firmware download support. Note that mt7990 does not have WA and DSP firmwares. This is a preliminary patch to support mt7990 chipset.
--- .../net/wireless/mediatek/mt76/mt76_connac.h | 7 +++++- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 3 +-- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 23 ++++++++++++------- .../wireless/mediatek/mt76/mt7996/mt7996.h | 12 ++++++++++ .../net/wireless/mediatek/mt76/mt7996/pci.c | 2 ++ 5 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +6 -1
@@ -232,9 +232,14 @@ static inline bool is_mt7992(struct mt76_dev *dev)return mt76_chip (dev) ==0x7992 ; } +static inline bool is_mt7990 (struct mt76_dev *dev) +{ +return mt76_chip (dev) ==0x7993 ; +} +static inline bool is_mt799x (struct mt76_dev *dev) { -return is_mt7996 (dev) ||is_mt7992 (dev); +return is_mt7996 (dev) ||is_mt7992 (dev) ||is_mt7990 (dev); }static inline bool is_mt7622 (struct mt76_dev *dev)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +1 -2
@@ -67,8 +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 ) || (is_mt7921 (dev) && addr ==0x900000 ) || (is_mt7925 (dev) && (addr ==0x900000 || addr ==0xe0002800 )) || - (is_mt7996 (dev) && addr ==0x900000 ) || - (is_mt7992 (dev) && addr ==0x900000 )) + (is_mt799x (dev) && addr ==0x900000 )) cmd =MCU_CMD (PATCH_START_REQ );else cmd =MCU_CMD (TARGET_ADDRESS_LEN_REQ );
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +15 -8
@@ -22,6 +22,9 @@ _fw = MT7992_##name; \ } \ break; \ + case MT7990_DEVICE_ID: \ + _fw = MT7990_##name; \ + break; \ case MT7996_DEVICE_ID: \ default: \ switch ((_dev)->var.type) { \
@@ -265,7 +268,7 @@ mt7996_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, txd_len = cmd & __MCU_CMD_FIELD_UNI ?sizeof (*uni_txd) :sizeof (*mcu_txd); txd = (__le32 *)skb_push (skb, txd_len); -if (test_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state)) +if (test_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state) &&mt7996_has_wa (dev)) qid =MT_MCUQ_WA ;else qid =MT_MCUQ_WM ;
@@ -3011,6 +3014,9 @@ static int mt7996_load_ram(struct mt7996_dev *dev)if (ret)return ret; +if (!mt7996_has_wa (dev)) +return 0 ; + ret =__mt7996_load_ram (dev,"DSP" ,fw_name (dev,FIRMWARE_DSP ),MT7996_RAM_TYPE_DSP );if (ret)
@@ -3021,10 +3027,9 @@ static int mt7996_load_ram(struct mt7996_dev *dev) }static int -mt7996_firmware_state (struct mt7996_dev *dev,bool wa) +mt7996_firmware_state (struct mt7996_dev *dev,u8 fw_state) { -u32 state =FIELD_PREP (MT_TOP_MISC_FW_STATE , - wa ?FW_STATE_RDY :FW_STATE_FW_DOWNLOAD ); +u32 state =FIELD_PREP (MT_TOP_MISC_FW_STATE , fw_state);if (!mt76_poll_msec (dev,MT_TOP_MISC ,MT_TOP_MISC_FW_STATE , state,1000 )) {
@@ -3056,13 +3061,14 @@ mt7996_mcu_restart(struct mt76_dev *dev)static int mt7996_load_firmware (struct mt7996_dev *dev) { +u8 fw_state;int ret;/* make sure fw is download state */ -if (mt7996_firmware_state (dev, false)) { +if (mt7996_firmware_state (dev,FW_STATE_FW_DOWNLOAD )) {/* restart firmware once */ mt7996_mcu_restart (&dev->mt76); - ret =mt7996_firmware_state (dev, false); + ret =mt7996_firmware_state (dev,FW_STATE_FW_DOWNLOAD );if (ret) {dev_err (dev->mt76.dev,"Firmware is not ready for download\n" );
@@ -3078,7 +3084,8 @@ static int mt7996_load_firmware(struct mt7996_dev *dev)if (ret)return ret; - ret =mt7996_firmware_state (dev, true); + fw_state =mt7996_has_wa (dev) ?FW_STATE_RDY :FW_STATE_NORMAL_TRX ; + ret =mt7996_firmware_state (dev, fw_state);if (ret)return ret;
@@ -3248,7 +3255,7 @@ int mt7996_mcu_init(struct mt7996_dev *dev)void mt7996_mcu_exit (struct mt7996_dev *dev) {mt7996_mcu_restart (&dev->mt76); -if (mt7996_firmware_state (dev, false)) { +if (mt7996_firmware_state (dev,FW_STATE_FW_DOWNLOAD )) {dev_err (dev->mt76.dev,"Failed to exit mcu\n" ); goto out; }
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +12 -0
@@ -34,6 +34,8 @@#define MT7996_DEVICE_ID_2 0x7991#define MT7992_DEVICE_ID 0x7992#define MT7992_DEVICE_ID_2 0x799a +#define MT7990_DEVICE_ID 0x7993 +#define MT7990_DEVICE_ID_2 0x799b#define MT7996_FIRMWARE_WA "mediatek/mt7996/mt7996_wa.bin"#define MT7996_FIRMWARE_WM "mediatek/mt7996/mt7996_wm.bin"
@@ -55,6 +57,11 @@#define MT7992_FIRMWARE_DSP_23 "mediatek/mt7996/mt7992_dsp_23.bin"#define MT7992_ROM_PATCH_23 "mediatek/mt7996/mt7992_rom_patch_23.bin" +#define MT7990_FIRMWARE_WA "" +#define MT7990_FIRMWARE_WM "mediatek/mt7996/mt7990_wm.bin" +#define MT7990_FIRMWARE_DSP "" +#define MT7990_ROM_PATCH "mediatek/mt7996/mt7990_rom_patch.bin" +#define MT7996_EEPROM_DEFAULT "mediatek/mt7996/mt7996_eeprom.bin"#define MT7996_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7996_eeprom_2i5i6i.bin"#define MT7996_EEPROM_DEFAULT_233 "mediatek/mt7996/mt7996_eeprom_233.bin"
@@ -709,6 +716,11 @@ static inline u16 mt7996_rx_chainmask(struct mt7996_phy *phy)return tx_chainmask | (BIT (fls (tx_chainmask)) * phy->has_aux_rx); } +static inline bool mt7996_has_wa (struct mt7996_dev *dev) +{ +return !is_mt7990 (&dev->mt76); +} +void mt7996_mac_init (struct mt7996_dev *dev);u32 mt7996_mac_wtbl_lmac_addr (struct mt7996_dev *dev,u16 wcid,u8 dw);bool mt7996_mac_wtbl_update (struct mt7996_dev *dev,int idx,u32 mask);
drivers/net/wireless/mediatek/mt76/mt7996/pci.c +2 -0
@@ -257,3 +257,5 @@ MODULE_FIRMWARE(MT7992_FIRMWARE_WA);MODULE_FIRMWARE (MT7992_FIRMWARE_WM );MODULE_FIRMWARE (MT7992_FIRMWARE_DSP );MODULE_FIRMWARE (MT7992_ROM_PATCH ); +MODULE_FIRMWARE (MT7990_FIRMWARE_WM ); +MODULE_FIRMWARE (MT7990_ROM_PATCH );
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 3/10 wifi: mt76: mt7996: rework WA mcu command for mt7990
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Since mt7990 lacks WA firmware, some WA commands are not supported or need to be refactored to use the SDO command.
This is a preliminary patch to support mt7990 chipset.
--- .../wireless/mediatek/mt76/mt76_connac_mcu.h | 2 + .../net/wireless/mediatek/mt76/mt7996/mcu.c | 50 ++++++++++++++++--- .../net/wireless/mediatek/mt76/mt7996/mcu.h | 6 +++ 3 files changed, 50 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +2 -0
@@ -1065,6 +1065,7 @@ enum {MCU_UNI_EVENT_WED_RRO =0x57 ,MCU_UNI_EVENT_PER_STA_INFO =0x6d ,MCU_UNI_EVENT_ALL_STA_INFO =0x6e , + MCU_UNI_EVENT_SDO = 0x83, };#define MCU_UNI_CMD_EVENT BIT(1)
@@ -1297,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_SDO = 0x88, }; enum {
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +42 -8
77 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +6 -0
@@ -937,6 +937,12 @@ enum {UNI_CMD_SER_TRIGGER }; +enum { +UNI_CMD_SDO_SET =1 , +UNI_CMD_SDO_QUERY , +UNI_CMD_SDO_CP_MODE =6 , +}; +enum {MT7996_SEC_MODE_PLAIN ,MT7996_SEC_MODE_AES ,
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 4/10 wifi: mt76: mt7996: rework DMA configuration for mt7990
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Modify DMA ring setting for mt7990.
This is a preliminary patch to support mt7990 chipset.
--- .../net/wireless/mediatek/mt76/mt7996/dma.c | 192 ++++++++++++------ .../wireless/mediatek/mt76/mt7996/mt7996.h | 2 + .../net/wireless/mediatek/mt76/mt7996/regs.h | 4 +- 3 files changed, 135 insertions(+), 63 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/dma.c +130 -62
@@ -55,20 +55,32 @@ static void mt7996_dma_config(struct mt7996_dev *dev)/* rx queue */ RXQ_CONFIG (MT_RXQ_MCU ,WFDMA0 ,MT_INT_RX_DONE_WM ,MT7996_RXQ_MCU_WM ); +/* for mt7990, RX ring 1 is for SDO instead */ RXQ_CONFIG (MT_RXQ_MCU_WA ,WFDMA0 ,MT_INT_RX_DONE_WA ,MT7996_RXQ_MCU_WA ); - -/* mt7996: band0 and band1, mt7992: band0 */ RXQ_CONFIG (MT_RXQ_MAIN ,WFDMA0 ,MT_INT_RX_DONE_BAND0 ,MT7996_RXQ_BAND0 ); -RXQ_CONFIG (MT_RXQ_MAIN_WA ,WFDMA0 ,MT_INT_RX_DONE_WA_MAIN ,MT7996_RXQ_MCU_WA_MAIN ); +if (mt7996_has_wa (dev)) +RXQ_CONFIG (MT_RXQ_MAIN_WA ,WFDMA0 ,MT_INT_RX_DONE_WA_MAIN , +MT7996_RXQ_MCU_WA_MAIN ); -if (is_mt7996 (&dev->mt76)) { +switch (mt76_chip (&dev->mt76)) { +case MT7992_DEVICE_ID : +RXQ_CONFIG (MT_RXQ_BAND1_WA ,WFDMA0 ,MT_INT_RX_DONE_WA_EXT ,MT7996_RXQ_MCU_WA_EXT ); +RXQ_CONFIG (MT_RXQ_BAND1 ,WFDMA0 ,MT_INT_RX_DONE_BAND1 ,MT7996_RXQ_BAND1 ); +break ; +case MT7990_DEVICE_ID : +RXQ_CONFIG (MT_RXQ_BAND1 ,WFDMA0 ,MT_INT_RX_DONE_BAND1 ,MT7996_RXQ_BAND1 ); +RXQ_CONFIG (MT_RXQ_TXFREE_BAND0 ,WFDMA0 , +MT_INT_RX_TXFREE_BAND0_MT7990 ,MT7990_RXQ_TXFREE0 ); +if (dev->hif2) +RXQ_CONFIG (MT_RXQ_TXFREE_BAND1 ,WFDMA0 , +MT_INT_RX_TXFREE_BAND1_MT7990 ,MT7990_RXQ_TXFREE1 ); +break ; +case MT7996_DEVICE_ID : +default :/* mt7996 band2 */ -RXQ_CONFIG (MT_RXQ_BAND2 ,WFDMA0 ,MT_INT_RX_DONE_BAND2 ,MT7996_RXQ_BAND2 );RXQ_CONFIG (MT_RXQ_BAND2_WA ,WFDMA0 ,MT_INT_RX_DONE_WA_TRI ,MT7996_RXQ_MCU_WA_TRI ); - }else { -/* mt7992 band1 */ -RXQ_CONFIG (MT_RXQ_BAND1 ,WFDMA0 ,MT_INT_RX_DONE_BAND1 ,MT7996_RXQ_BAND1 ); -RXQ_CONFIG (MT_RXQ_BAND1_WA ,WFDMA0 ,MT_INT_RX_DONE_WA_EXT ,MT7996_RXQ_MCU_WA_EXT ); +RXQ_CONFIG (MT_RXQ_BAND2 ,WFDMA0 ,MT_INT_RX_DONE_BAND2 ,MT7996_RXQ_BAND2 ); +break ; }if (dev->has_rro) {
@@ -104,9 +116,11 @@ static void mt7996_dma_config(struct mt7996_dev *dev) }/* mcu tx queue */ -MCUQ_CONFIG (MT_MCUQ_WM ,WFDMA0 ,MT_INT_TX_DONE_MCU_WM ,MT7996_TXQ_MCU_WM ); -MCUQ_CONFIG (MT_MCUQ_WA ,WFDMA0 ,MT_INT_TX_DONE_MCU_WA ,MT7996_TXQ_MCU_WA );MCUQ_CONFIG (MT_MCUQ_FWDL ,WFDMA0 ,MT_INT_TX_DONE_FWDL ,MT7996_TXQ_FWDL ); +MCUQ_CONFIG (MT_MCUQ_WM ,WFDMA0 ,MT_INT_TX_DONE_MCU_WM ,MT7996_TXQ_MCU_WM ); +if (mt7996_has_wa (dev)) +MCUQ_CONFIG (MT_MCUQ_WA ,WFDMA0 ,MT_INT_TX_DONE_MCU_WA , +MT7996_TXQ_MCU_WA ); }static u32 __mt7996_dma_prefetch_base (u16 *base,u8 depth)
@@ -121,43 +135,62 @@ static u32 __mt7996_dma_prefetch_base(u16 *base, u8 depth)static void __mt7996_dma_prefetch (struct mt7996_dev *dev,u32 ofs) {u16 base =0 ; -u8 queue; +u8 queue, val;#define PREFETCH (_depth) (__mt7996_dma_prefetch_base(&base, (_depth)))/* prefetch SRAM wrapping boundary for tx/rx ring. */ -mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_FWDL ) + ofs,PREFETCH (0x2 )); -mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_WM ) + ofs,PREFETCH (0x2 )); +/* Tx Command Rings */ + val =is_mt7996 (&dev->mt76) ?2 :4 ; +mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_FWDL ) + ofs,PREFETCH (val)); +mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_WM ) + ofs,PREFETCH (val)); +if (mt7996_has_wa (dev)) +mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_WA ) + ofs,PREFETCH (val)); + +/* Tx Data Rings */ mt76_wr (dev,MT_TXQ_EXT_CTRL (0 ) + ofs,PREFETCH (0x8 )); -mt76_wr (dev,MT_TXQ_EXT_CTRL (1 ) + ofs,PREFETCH (0x8 )); -mt76_wr (dev,MT_MCUQ_EXT_CTRL (MT_MCUQ_WA ) + ofs,PREFETCH (0x2 )); -mt76_wr (dev,MT_TXQ_EXT_CTRL (2 ) + ofs,PREFETCH (0x8 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MCU ) + ofs,PREFETCH (0x2 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MCU_WA ) + ofs,PREFETCH (0x2 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MAIN_WA ) + ofs,PREFETCH (0x2 )); - - queue =is_mt7996 (&dev->mt76) ?MT_RXQ_BAND2_WA :MT_RXQ_BAND1_WA ; -mt76_wr (dev,MT_RXQ_BAND1_CTRL (queue) + ofs,PREFETCH (0x2 )); - -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MAIN ) + ofs,PREFETCH (0x10 )); +if (!is_mt7996 (&dev->mt76) || dev->hif2) +mt76_wr (dev,MT_TXQ_EXT_CTRL (1 ) + ofs,PREFETCH (0x8 )); +if (is_mt7996 (&dev->mt76)) +mt76_wr (dev,MT_TXQ_EXT_CTRL (2 ) + ofs,PREFETCH (0x8 )); + +/* Rx Event Rings */ +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MCU ) + ofs,PREFETCH (val)); +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MCU_WA ) + ofs,PREFETCH (val)); + +/* Rx TxFreeDone From WA Rings */ +if (mt7996_has_wa (dev)) { +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MAIN_WA ) + ofs,PREFETCH (val)); + queue =is_mt7996 (&dev->mt76) ?MT_RXQ_BAND2_WA :MT_RXQ_BAND1_WA ; +mt76_wr (dev,MT_RXQ_EXT_CTRL (queue) + ofs,PREFETCH (val)); + } +/* Rx TxFreeDone From MAC Rings */ + val =is_mt7996 (&dev->mt76) ?4 :8 ; +if (is_mt7990 (&dev->mt76) || (is_mt7996 (&dev->mt76) && dev->has_rro)) +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_TXFREE_BAND0 ) + ofs,PREFETCH (val)); +if (is_mt7990 (&dev->mt76) && dev->hif2) +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_TXFREE_BAND1 ) + ofs,PREFETCH (val)); +else if (is_mt7996 (&dev->mt76) && dev->has_rro) +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_TXFREE_BAND2 ) + ofs,PREFETCH (val)); + +/* Rx Data Rings */ +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MAIN ) + ofs,PREFETCH (0x10 )); queue =is_mt7996 (&dev->mt76) ?MT_RXQ_BAND2 :MT_RXQ_BAND1 ; -mt76_wr (dev,MT_RXQ_BAND1_CTRL (queue) + ofs,PREFETCH (0x10 )); +mt76_wr (dev,MT_RXQ_EXT_CTRL (queue) + ofs,PREFETCH (0x10 )); +/* Rx RRO Rings */ if (dev->has_rro) { -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_RRO_BAND0 ) + ofs, -PREFETCH (0x10 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_RRO_BAND2 ) + ofs, -PREFETCH (0x10 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MSDU_PAGE_BAND0 ) + ofs, -PREFETCH (0x4 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MSDU_PAGE_BAND1 ) + ofs, -PREFETCH (0x4 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_MSDU_PAGE_BAND2 ) + ofs, -PREFETCH (0x4 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_TXFREE_BAND0 ) + ofs, -PREFETCH (0x4 )); -mt76_wr (dev,MT_RXQ_BAND1_CTRL (MT_RXQ_TXFREE_BAND2 ) + ofs, -PREFETCH (0x4 )); +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_RRO_BAND0 ) + ofs,PREFETCH (0x10 )); + queue =is_mt7996 (&dev->mt76) ?MT_RXQ_RRO_BAND2 :MT_RXQ_RRO_BAND1 ; +mt76_wr (dev,MT_RXQ_EXT_CTRL (queue) + ofs,PREFETCH (0x10 )); + +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MSDU_PAGE_BAND0 ) + ofs,PREFETCH (val)); +if (is_mt7996 (&dev->mt76)) { +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MSDU_PAGE_BAND1 ) + ofs, +PREFETCH (val)); +mt76_wr (dev,MT_RXQ_EXT_CTRL (MT_RXQ_MSDU_PAGE_BAND2 ) + ofs, +PREFETCH (val)); + } }#undef PREFETCH
@@ -269,6 +302,9 @@ void mt7996_dma_start(struct mt7996_dev *dev, bool reset, bool wed_reset)mtk_wed_device_start (wed, wed_irq_mask); } +if (!mt7996_has_wa (dev)) + irq_mask &= ~(MT_INT_RX (MT_RXQ_MAIN_WA ) | +MT_INT_RX (MT_RXQ_BAND1_WA )); irq_mask = reset ?MT_INT_MCU_CMD : irq_mask;mt7996_irq_enable (dev, irq_mask);
@@ -474,12 +510,14 @@ int mt7996_dma_init(struct mt7996_dev *dev)return ret;/* command to WA */ - ret =mt76_init_mcu_queue (&dev->mt76,MT_MCUQ_WA , -MT_MCUQ_ID (MT_MCUQ_WA ), -MT7996_TX_MCU_RING_SIZE , -MT_MCUQ_RING_BASE (MT_MCUQ_WA )); -if (ret) -return ret; +if (mt7996_has_wa (dev)) { + ret =mt76_init_mcu_queue (&dev->mt76,MT_MCUQ_WA , +MT_MCUQ_ID (MT_MCUQ_WA ), +MT7996_TX_MCU_RING_SIZE , +MT_MCUQ_RING_BASE (MT_MCUQ_WA )); +if (ret) +return ret; + }/* firmware download */ ret = mt76_init_mcu_queue(&dev->mt76, MT_MCUQ_FWDL,
@@ -498,7 +536,7 @@ int mt7996_dma_init(struct mt7996_dev *dev)if (ret)return ret; -/* event from WA */ +/* event from WA, or SDO event for mt7990 */ ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_MCU_WA], MT_RXQ_ID(MT_RXQ_MCU_WA), MT7996_RX_MCU_RING_SIZE_WA,
@@ -527,13 +565,41 @@ int mt7996_dma_init(struct mt7996_dev *dev) dev->mt76.q_rx[MT_RXQ_MAIN_WA ].wed = wed; } - ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_MAIN_WA ], -MT_RXQ_ID (MT_RXQ_MAIN_WA ), -MT7996_RX_MCU_RING_SIZE , -MT_RX_BUF_SIZE , -MT_RXQ_RING_BASE (MT_RXQ_MAIN_WA )); -if (ret) -return ret; +if (mt7996_has_wa (dev)) { + ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_MAIN_WA ], +MT_RXQ_ID (MT_RXQ_MAIN_WA ), +MT7996_RX_MCU_RING_SIZE , +MT_RX_BUF_SIZE , +MT_RXQ_RING_BASE (MT_RXQ_MAIN_WA )); +if (ret) +return ret; + }else { +if (mtk_wed_device_active (wed)) { + dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0 ].flags =MT_WED_Q_TXFREE ; + dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0 ].wed = wed; + } + ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0 ], +MT_RXQ_ID (MT_RXQ_TXFREE_BAND0 ), +MT7996_RX_MCU_RING_SIZE , +MT7996_RX_BUF_SIZE , +MT_RXQ_RING_BASE (MT_RXQ_TXFREE_BAND0 )); +if (ret) +return ret; + } + +if (!mt7996_has_wa (dev) && dev->hif2) { +if (mtk_wed_device_active (wed)) { + dev->mt76.q_rx[MT_RXQ_TXFREE_BAND1 ].flags =MT_WED_Q_TXFREE ; + dev->mt76.q_rx[MT_RXQ_TXFREE_BAND1 ].wed = wed; + } + ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_TXFREE_BAND1 ], +MT_RXQ_ID (MT_RXQ_TXFREE_BAND1 ), +MT7996_RX_MCU_RING_SIZE , +MT7996_RX_BUF_SIZE , +MT_RXQ_RING_BASE (MT_RXQ_TXFREE_BAND1 )); +if (ret) +return ret; + }if (mt7996_band_valid (dev,MT_BAND2 )) {/* rx data queue for mt7996 band2 */
@@ -573,14 +639,16 @@ int mt7996_dma_init(struct mt7996_dev *dev)return ret;/* tx free notify event from WA for mt7992 band1 */ - rx_base =MT_RXQ_RING_BASE (MT_RXQ_BAND1_WA ) + hif1_ofs; - ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_BAND1_WA ], -MT_RXQ_ID (MT_RXQ_BAND1_WA ), -MT7996_RX_MCU_RING_SIZE , -MT_RX_BUF_SIZE , - rx_base); -if (ret) -return ret; +if (mt7996_has_wa (dev)) { + rx_base =MT_RXQ_RING_BASE (MT_RXQ_BAND1_WA ) + hif1_ofs; + ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_BAND1_WA ], +MT_RXQ_ID (MT_RXQ_BAND1_WA ), +MT7996_RX_MCU_RING_SIZE , +MT_RX_BUF_SIZE , + rx_base); +if (ret) +return ret; + } } if (mtk_wed_device_active(wed) && mtk_wed_get_rx_capa(wed) &&
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +2 -0
@@ -177,6 +177,8 @@ enum mt7996_rxq_id {MT7996_RXQ_TXFREE1 =9 ,MT7996_RXQ_TXFREE2 =7 ,MT7996_RXQ_RRO_IND =0 , +MT7990_RXQ_TXFREE0 =6 , + MT7990_RXQ_TXFREE1 = 7, }; struct mt7996_twt_flow {
drivers/net/wireless/mediatek/mt76/mt7996/regs.h +3 -1
@@ -483,7 +483,7 @@ enum offs_rev {#define MT_MCUQ_EXT_CTRL (q) (MT_Q_BASE(q) + 0x600 + \ MT_MCUQ_ID(q) * 0x4) -#define MT_RXQ_BAND1_CTRL (q) (MT_Q_BASE(__RXQ(q)) + 0x680 + \ +#define MT_RXQ_EXT_CTRL (q) (MT_Q_BASE(__RXQ(q)) + 0x680 + \ MT_RXQ_ID(q) * 0x4)#define MT_TXQ_EXT_CTRL (q) (MT_Q_BASE(__TXQ(q)) + 0x600 + \ MT_TXQ_ID(q) * 0x4)
@@ -504,6 +504,8 @@ enum offs_rev {#define MT_INT_RX_DONE_WA_TRI BIT(3)#define MT_INT_RX_TXFREE_MAIN BIT(17)#define MT_INT_RX_TXFREE_TRI BIT(15) +#define MT_INT_RX_TXFREE_BAND0_MT7990 BIT(14) +#define MT_INT_RX_TXFREE_BAND1_MT7990 BIT(15)#define MT_INT_RX_DONE_BAND2_EXT BIT(23)#define MT_INT_RX_TXFREE_EXT BIT(26)#define MT_INT_MCU_CMD BIT(29)
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 5/10 wifi: mt76: mt7996: rework register mapping for mt7990
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
Rework register offset and l1/l2/cbtop mapping for mt7990. This is a preliminary patch to support mt7990 chipset.
--- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 186 ++++++++++++++++-- .../net/wireless/mediatek/mt76/mt7996/regs.h | 47 +++-- 2 files changed, 208 insertions(+), 25 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +173 -13
@@ -54,6 +54,17 @@ static const u32 mt7996_offs[] = { [MIB_BSCR7] = 0x9e8, [MIB_BSCR17] = 0xa10, [MIB_TRDR1] = 0xa28, + [HIF_REMAP_L1] = 0x24, + [HIF_REMAP_BASE_L1] = 0x130000, + [HIF_REMAP_L2] = 0x1b4, + [HIF_REMAP_BASE_L2] = 0x1000, + [CBTOP1_PHY_END] = 0x77ffffff, + [INFRA_MCU_END] = 0x7c3fffff, + [WTBLON_WDUCR] = 0x370, + [WTBL_UPDATE] = 0x380, + [WTBL_ITCR] = 0x3b0, + [WTBL_ITCR0] = 0x3b8, + [WTBL_ITCR1] = 0x3bc, };static const u32 mt7992_offs[] = {
@@ -80,6 +91,54 @@ static const u32 mt7992_offs[] = { [MIB_BSCR7] = 0xae4, [MIB_BSCR17] = 0xb0c, [MIB_TRDR1] = 0xb24, + [HIF_REMAP_L1] = 0x8, + [HIF_REMAP_BASE_L1] = 0x40000, + [HIF_REMAP_L2] = 0x1b4, + [HIF_REMAP_BASE_L2] = 0x1000, + [CBTOP1_PHY_END] = 0x77ffffff, + [INFRA_MCU_END] = 0x7c3fffff, + [WTBLON_WDUCR] = 0x370, + [WTBL_UPDATE] = 0x380, + [WTBL_ITCR] = 0x3b0, + [WTBL_ITCR0] = 0x3b8, + [WTBL_ITCR1] = 0x3bc, +}; + +static const u32 mt7990_offs[] = { + [MIB_RVSR0 ] =0x800 , + [MIB_RVSR1 ] =0x804 , + [MIB_BTSCR5 ] =0x868 , + [MIB_BTSCR6 ] =0x878 , + [MIB_RSCR1 ] =0x890 , + [MIB_RSCR27 ] =0xa38 , + [MIB_RSCR28 ] =0xa3c , + [MIB_RSCR29 ] =0xa40 , + [MIB_RSCR30 ] =0xa44 , + [MIB_RSCR31 ] =0xa48 , + [MIB_RSCR33 ] =0xa50 , + [MIB_RSCR35 ] =0xa58 , + [MIB_RSCR36 ] =0xa5c , + [MIB_BSCR0 ] =0xbb8 , + [MIB_BSCR1 ] =0xbbc , + [MIB_BSCR2 ] =0xbc0 , + [MIB_BSCR3 ] =0xbc4 , + [MIB_BSCR4 ] =0xbc8 , + [MIB_BSCR5 ] =0xbcc , + [MIB_BSCR6 ] =0xbd0 , + [MIB_BSCR7 ] =0xbd4 , + [MIB_BSCR17 ] =0xbfc , + [MIB_TRDR1 ] =0xc14 , + [HIF_REMAP_L1 ] =0x8 , + [HIF_REMAP_BASE_L1 ] =0x40000 , + [HIF_REMAP_L2 ] =0x1b8 , + [HIF_REMAP_BASE_L2 ] =0x110000 , + [CBTOP1_PHY_END ] =0x7fffffff , + [INFRA_MCU_END ] =0x7cffffff , + [WTBLON_WDUCR ] =0x400 , + [WTBL_UPDATE ] =0x410 , + [WTBL_ITCR ] =0x440 , + [WTBL_ITCR0 ] =0x448 , + [WTBL_ITCR1 ] =0x44c , };static const struct __map mt7996_reg_map[] = {
@@ -135,14 +194,83 @@ static const struct __map mt7996_reg_map[] = { { 0x0, 0x0, 0x0 }, /* imply end of search */ }; +static const struct __map mt7990_reg_map[] = { + {0x54000000 ,0x02000 ,0x1000 },/* WFDMA_0 (PCIE0 MCU DMA0) */ + {0x55000000 ,0x03000 ,0x1000 },/* WFDMA_1 (PCIE0 MCU DMA1) */ + {0x56000000 ,0x04000 ,0x1000 },/* WFDMA_2 (Reserved) */ + {0x57000000 ,0x05000 ,0x1000 },/* WFDMA_3 (MCU wrap CR) */ + {0x58000000 ,0x06000 ,0x1000 },/* WFDMA_4 (PCIE1 MCU DMA0 (MEM_DMA)) */ + {0x59000000 ,0x07000 ,0x1000 },/* WFDMA_5 (PCIE1 MCU DMA1) */ + {0x820c0000 ,0x08000 ,0x4000 },/* WF_UMAC_TOP (PLE) */ + {0x820c8000 ,0x0c000 ,0x2000 },/* WF_UMAC_TOP (PSE) */ + {0x820cc000 ,0x0e000 ,0x2000 },/* WF_UMAC_TOP (PP) */ + {0x820e0000 ,0x20000 ,0x0400 },/* WF_LMAC_TOP BN0 (WF_CFG) */ + {0x820e1000 ,0x20400 ,0x0200 },/* WF_LMAC_TOP BN0 (WF_TRB) */ + {0x820e2000 ,0x20800 ,0x0400 },/* WF_LMAC_TOP BN0 (WF_AGG) */ + {0x820e3000 ,0x20c00 ,0x0400 },/* WF_LMAC_TOP BN0 (WF_ARB) */ + {0x820e4000 ,0x21000 ,0x0400 },/* WF_LMAC_TOP BN0 (WF_TMAC) */ + {0x820e5000 ,0x21400 ,0x0800 },/* WF_LMAC_TOP BN0 (WF_RMAC) */ + {0x820ce000 ,0x21c00 ,0x0200 },/* WF_LMAC_TOP (WF_SEC) */ + {0x820e7000 ,0x21e00 ,0x0200 },/* WF_LMAC_TOP BN0 (WF_DMA) */ + {0x820cf000 ,0x22000 ,0x1000 },/* WF_LMAC_TOP (WF_PF) */ + {0x820e9000 ,0x23400 ,0x0200 },/* WF_LMAC_TOP BN0 (WF_WTBLOFF) */ + {0x820ea000 ,0x24000 ,0x0200 },/* WF_LMAC_TOP BN0 (WF_ETBF) */ + {0x820eb000 ,0x24200 ,0x0400 },/* WF_LMAC_TOP BN0 (WF_LPON) */ + {0x820ec000 ,0x24600 ,0x0200 },/* WF_LMAC_TOP BN0 (WF_INT) */ + {0x820ed000 ,0x24800 ,0x0800 },/* WF_LMAC_TOP BN0 (WF_MIB) */ + {0x820ca000 ,0x26000 ,0x2000 },/* WF_LMAC_TOP BN0 (WF_MUCOP) */ + {0x820d0000 ,0x30000 ,0x10000 },/* WF_LMAC_TOP (WF_WTBLON) */ + {0x00400000 ,0x80000 ,0x10000 },/* WF_MCU_SYSRAM */ + {0x820f0000 ,0xa0000 ,0x0400 },/* WF_LMAC_TOP BN1 (WF_CFG) */ + {0x820f1000 ,0xa0600 ,0x0200 },/* WF_LMAC_TOP BN1 (WF_TRB) */ + {0x820f2000 ,0xa0800 ,0x0400 },/* WF_LMAC_TOP BN1 (WF_AGG) */ + {0x820f3000 ,0xa0c00 ,0x0400 },/* WF_LMAC_TOP BN1 (WF_ARB) */ + {0x820f4000 ,0xa1000 ,0x0400 },/* WF_LMAC_TOP BN1 (WF_TMAC) */ + {0x820f5000 ,0xa1400 ,0x0800 },/* WF_LMAC_TOP BN1 (WF_RMAC) */ + {0x820f7000 ,0xa1e00 ,0x0200 },/* WF_LMAC_TOP BN1 (WF_DMA) */ + {0x820f9000 ,0xa3400 ,0x0200 },/* WF_LMAC_TOP BN1 (WF_WTBLOFF) */ + {0x820fa000 ,0xa4000 ,0x0200 },/* WF_LMAC_TOP BN1 (WF_ETBF) */ + {0x820fb000 ,0xa4200 ,0x0400 },/* WF_LMAC_TOP BN1 (WF_LPON) */ + {0x820fc000 ,0xa4600 ,0x0200 },/* WF_LMAC_TOP BN1 (WF_INT) */ + {0x820fd000 ,0xa4800 ,0x0800 },/* WF_LMAC_TOP BN1 (WF_MIB) */ + {0x820cc000 ,0xa5000 ,0x2000 },/* WF_LMAC_TOP BN1 (WF_MUCOP) */ + {0x820c4000 ,0xa8000 ,0x4000 },/* WF_LMAC_TOP (WF_UWTBL) */ + {0x81030000 ,0xae000 ,0x100 },/* WFSYS_AON part 1 */ + {0x81031000 ,0xae100 ,0x100 },/* WFSYS_AON part 2 */ + {0x81032000 ,0xae200 ,0x100 },/* WFSYS_AON part 3 */ + {0x81033000 ,0xae300 ,0x100 },/* WFSYS_AON part 4 */ + {0x81034000 ,0xae400 ,0x100 },/* WFSYS_AON part 5 */ + {0x80020000 ,0xb0000 ,0x10000 },/* WF_TOP_MISC_OFF */ + {0x81020000 ,0xc0000 ,0x10000 },/* WF_TOP_MISC_ON */ + {0x81040000 ,0x120000 ,0x1000 },/* WF_MCU_CFG_ON */ + {0x81050000 ,0x121000 ,0x1000 },/* WF_MCU_EINT */ + {0x81060000 ,0x122000 ,0x1000 },/* WF_MCU_GPT */ + {0x81070000 ,0x123000 ,0x1000 },/* WF_MCU_WDT */ + {0x80010000 ,0x124000 ,0x1000 },/* WF_AXIDMA */ + {0x7c020000 ,0xd0000 ,0x10000 },/* CONN_INFRA, wfdma for from CODA flow use */ + {0x7c060000 ,0xe0000 ,0x10000 },/* CONN_INFRA, conn_host_csr_top for from CODA flow use */ + {0x20020000 ,0xd0000 ,0x10000 },/* CONN_INFRA, wfdma */ + {0x20060000 ,0xe0000 ,0x10000 },/* CONN_INFRA, conn_host_csr_top */ + {0x7c000000 ,0xf0000 ,0x10000 },/* CONN_INFRA */ + {0x70020000 ,0x1f0000 ,0x9000 },/* PCIE remapping (AP2CONN) */ + {0x0 ,0x0 ,0x0 },/* imply end of search */ +}; +static u32 mt7996_reg_map_l1 (struct mt7996_dev *dev,u32 addr) {u32 offset =FIELD_GET (MT_HIF_REMAP_L1_OFFSET , addr);u32 base =FIELD_GET (MT_HIF_REMAP_L1_BASE , addr); +u32 l1_mask, val; + +if (is_mt7996 (&dev->mt76)) { + l1_mask =MT_HIF_REMAP_L1_MASK_7996 ; + val =FIELD_PREP (MT_HIF_REMAP_L1_MASK_7996 , base); + }else { + l1_mask =MT_HIF_REMAP_L1_MASK ; + val =FIELD_PREP (MT_HIF_REMAP_L1_MASK , base); + } - dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L1 , -MT_HIF_REMAP_L1_MASK , -FIELD_PREP (MT_HIF_REMAP_L1_MASK , base)); + dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L1 , l1_mask, val);/* use read to push write */ dev->bus_ops->rr (&dev->mt76,MT_HIF_REMAP_L1 );
@@ -151,18 +279,41 @@ static u32 mt7996_reg_map_l1(struct mt7996_dev *dev, u32 addr)static u32 mt7996_reg_map_l2 (struct mt7996_dev *dev,u32 addr) { -u32 offset =FIELD_GET (MT_HIF_REMAP_L2_OFFSET , addr); -u32 base =FIELD_GET (MT_HIF_REMAP_L2_BASE , addr); +u32 offset, base, l2_mask, val; - dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L2 , -MT_HIF_REMAP_L2_MASK , -FIELD_PREP (MT_HIF_REMAP_L2_MASK , base)); +if (is_mt7990 (&dev->mt76)) { + offset =FIELD_GET (MT_HIF_REMAP_L2_OFFSET_7990 , addr); + base =FIELD_GET (MT_HIF_REMAP_L2_BASE_7990 , addr); + l2_mask =MT_HIF_REMAP_L2_MASK_7990 ; + val =FIELD_PREP (MT_HIF_REMAP_L2_MASK_7990 , base); + }else { + offset =FIELD_GET (MT_HIF_REMAP_L2_OFFSET , addr); + base =FIELD_GET (MT_HIF_REMAP_L2_BASE , addr); + l2_mask =MT_HIF_REMAP_L2_MASK ; + val =FIELD_PREP (MT_HIF_REMAP_L2_MASK , base); + } + + dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L2 , l2_mask, val);/* use read to push write */ dev->bus_ops->rr (&dev->mt76,MT_HIF_REMAP_L2 );return MT_HIF_REMAP_BASE_L2 + offset; } +static u32 mt7996_reg_map_cbtop (struct mt7996_dev *dev,u32 addr) +{ +u32 offset =FIELD_GET (MT_HIF_REMAP_CBTOP_OFFSET , addr); +u32 base =FIELD_GET (MT_HIF_REMAP_CBTOP_BASE , addr); + + dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_CBTOP , +MT_HIF_REMAP_CBTOP_MASK , +FIELD_PREP (MT_HIF_REMAP_CBTOP_MASK , base)); +/* use read to push write */ + dev->bus_ops->rr (&dev->mt76,MT_HIF_REMAP_CBTOP ); + +return MT_HIF_REMAP_BASE_CBTOP + offset; +} +static u32 __mt7996_reg_addr (struct mt7996_dev *dev,u32 addr) {int i;
@@ -193,17 +344,20 @@ static u32 __mt7996_reg_remap_addr(struct mt7996_dev *dev, u32 addr) (addr >= MT_WFSYS1_PHY_START && addr <= MT_WFSYS1_PHY_END))return mt7996_reg_map_l1 (dev, addr); -if (dev_is_pci (dev->mt76.dev) && - ((addr >=MT_CBTOP1_PHY_START && addr <=MT_CBTOP1_PHY_END ) || - addr >=MT_CBTOP2_PHY_START )) -return mt7996_reg_map_l1 (dev, addr); -/* CONN_INFRA: covert to phyiscal addr and use layer 1 remap */ if (addr >=MT_INFRA_MCU_START && addr <=MT_INFRA_MCU_END ) { addr = addr -MT_INFRA_MCU_START +MT_INFRA_BASE ;return mt7996_reg_map_l1 (dev, addr); } +if (dev_is_pci (dev->mt76.dev) && + ((addr >=MT_CBTOP1_PHY_START && addr <=MT_CBTOP1_PHY_END ) || + addr >=MT_CBTOP2_PHY_START )) { +if (is_mt7990 (&dev->mt76)) +return mt7996_reg_map_cbtop (dev, addr); +return mt7996_reg_map_l1 (dev, addr); + } +return mt7996_reg_map_l2 (dev, addr); }
@@ -455,6 +609,12 @@ static int mt7996_mmio_init(struct mt76_dev *mdev, dev->reg.map = mt7996_reg_map; dev->reg.map_size =ARRAY_SIZE (mt7996_reg_map);break ; +case MT7990_DEVICE_ID : + dev->reg.base = mt7996_reg_base; + dev->reg.offs_rev = mt7990_offs; + dev->reg.map = mt7990_reg_map; + dev->reg.map_size =ARRAY_SIZE (mt7990_reg_map); +break ;default :return -EINVAL ; }
drivers/net/wireless/mediatek/mt76/mt7996/regs.h +35 -12
87 lines not on this page · raw message
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 6/10 wifi: mt76: mt7996: add eeprom support for mt7990
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
Add eeprom definition and default bin file for mt7990. This is a preliminary patch to support mt7990 chipset.
--- drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 6 ++++++ drivers/net/wireless/mediatek/mt76/mt7996/init.c | 3 +++ drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 7 +++++++ 3 files changed, 16 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c +6 -0
@@ -17,6 +17,8 @@ static int mt7996_check_eeprom(struct mt7996_dev *dev)return is_mt7996 (&dev->mt76) ?0 : -EINVAL ;case MT7992_DEVICE_ID :return is_mt7992 (&dev->mt76) ?0 : -EINVAL ; +case MT7990_DEVICE_ID : +return is_mt7990 (&dev->mt76) ?0 : -EINVAL ;default :return -EINVAL ; }
@@ -39,6 +41,10 @@ static char *mt7996_eeprom_name(struct mt7996_dev *dev)return MT7992_EEPROM_DEFAULT_MIX ;return MT7992_EEPROM_DEFAULT ; } +case MT7990_DEVICE_ID : +if (dev->var.fem ==MT7996_FEM_INT ) +return MT7990_EEPROM_DEFAULT_INT ; +return MT7990_EEPROM_DEFAULT ;case MT7996_DEVICE_ID :default :switch (dev->var.type) {
drivers/net/wireless/mediatek/mt76/mt7996/init.c +3 -0
@@ -943,6 +943,9 @@ static int mt7996_variant_type_init(struct mt7996_dev *dev)else return -EINVAL ;break ; +case MT7990_DEVICE_ID : + var_type =MT7990_VAR_TYPE_23 ; +break ;default :return -EINVAL ; }
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +7 -0
@@ -73,6 +73,9 @@#define MT7992_EEPROM_DEFAULT_23 "mediatek/mt7996/mt7992_eeprom_23.bin"#define MT7992_EEPROM_DEFAULT_23_INT "mediatek/mt7996/mt7992_eeprom_23_2i5i.bin" +#define MT7990_EEPROM_DEFAULT "mediatek/mt7996/mt7990_eeprom.bin" +#define MT7990_EEPROM_DEFAULT_INT "mediatek/mt7996/mt7990_eeprom_2i5i.bin" +#define MT7996_EEPROM_SIZE 7680#define MT7996_EEPROM_BLOCK_SIZE 16#define MT7996_TOKEN_SIZE 16384
@@ -143,6 +146,10 @@ enum mt7992_var_type { MT7992_VAR_TYPE_23, }; +enum mt7990_var_type { +MT7990_VAR_TYPE_23 , +}; +enum mt7996_fem_type {MT7996_FEM_EXT ,MT7996_FEM_INT ,
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 7/10 wifi: mt76: mt7996: adjust HW capabilities for mt7990
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
This is a preliminary patch to support mt7990 chipset.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 9 ++++++--- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +6 -3
@@ -440,6 +440,9 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed) hw->queues =4 ; hw->max_rx_aggregation_subframes = max_subframes; hw->max_tx_aggregation_subframes = max_subframes; +if (is_mt7990 (mdev) && dev->has_eht) + hw->max_tx_aggregation_subframes =512 ; + hw->netdev_features =NETIF_F_RXCSUM ;if (mtk_wed_device_active (wed)) hw->netdev_features |=NETIF_F_HW_TC ;
@@ -1064,10 +1067,10 @@ void mt7996_set_stream_vht_txbf_caps(struct mt7996_phy *phy) *cap |=IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE ; -if (is_mt7996 (phy->mt76->dev)) - *cap |=FIELD_PREP (IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK ,3 ); -else +if (is_mt7992 (phy->mt76->dev)) *cap |=FIELD_PREP (IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK ,4 ); +else + *cap |=FIELD_PREP (IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK ,3 ); *cap &= ~(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK | IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +2 -2
@@ -14,7 +14,7 @@#define MT7996_MAX_RADIOS 3#define MT7996_MAX_INTERFACES 19/* per-band */ #define MT7996_MAX_WMM_SETS 4 -#define MT7996_WTBL_BMC_SIZE (is_mt7992(&dev->mt76) ? 32 : 64) +#define MT7996_WTBL_BMC_SIZE (is_mt7996(&dev->mt76) ? 64 : 32)#define MT7996_WTBL_RESERVED (mt7996_wtbl_size(dev) - 1)#define MT7996_WTBL_STA (MT7996_WTBL_RESERVED - \ mt7996_max_interface_num(dev))
@@ -482,7 +482,7 @@ mt7996_phy3(struct mt7996_dev *dev)static inline bool mt7996_band_valid (struct mt7996_dev *dev,u8 band) { -if (is_mt7992 (&dev->mt76)) +if (!is_mt7996 (&dev->mt76))return band <=MT_BAND1 ;return band <=MT_BAND2 ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 8/10 wifi: mt76: connac: rework TX descriptor and TX free for mt7990
In reply to Shayne ChenAdjust the TX descriptor and TX free for updated hardware fields. This is a preliminary patch to support mt7990 chipset.
--- .../wireless/mediatek/mt76/mt76_connac3_mac.h | 1 + .../net/wireless/mediatek/mt76/mt7996/mac.c | 42 ++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h +1 -0
@@ -273,6 +273,7 @@ enum tx_frag_idx {#define MT_TXD6_TX_RATE GENMASK(21, 16)#define MT_TXD6_TIMESTAMP_OFS_EN BIT(15)#define MT_TXD6_TIMESTAMP_OFS_IDX GENMASK(14, 10) +#define MT_TXD6_TID_ADDBA GENMASK(10, 8)#define MT_TXD6_MSDU_CNT GENMASK(9, 4)#define MT_TXD6_MSDU_CNT_V2 GENMASK(15, 10)#define MT_TXD6_DIS_MAT BIT(3)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +36 -6
89 lines not on this page · raw message
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 9/10 wifi: mt76: mt7996: rework background radar check for mt7990
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
The MT7990 comes in 2T2R and 3T3R variants, with only the 2T2R supporting background radar.
--- .../wireless/mediatek/mt76/mt7996/eeprom.c | 27 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7996/init.c | 2 +- .../wireless/mediatek/mt76/mt7996/mt7996.h | 20 +------------- 3 files changed, 29 insertions(+), 20 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c +27 -0
@@ -376,3 +376,30 @@ s8 mt7996_eeprom_get_power_delta(struct mt7996_dev *dev, int band)return val &MT_EE_RATE_DELTA_SIGN ? delta : -delta; } + +bool mt7996_eeprom_has_background_radar (struct mt7996_dev *dev) +{ +switch (mt76_chip (&dev->mt76)) { +case MT7996_DEVICE_ID : +if (dev->var.type ==MT7996_VAR_TYPE_233 ) +return false; +break ; +case MT7992_DEVICE_ID : +if (dev->var.type ==MT7992_VAR_TYPE_23 ) +return false; +break ; +case MT7990_DEVICE_ID : { +u8 path, rx_path, nss, *eeprom = dev->mt76.eeprom.data; + +mt7996_eeprom_parse_stream (eeprom,MT_BAND1 , &path, &rx_path, &nss); +/* Disable background radar capability in 3T3R */ +if (path ==3 || rx_path ==3 ) +return false; +break ; + } +default : +return false; + } + +return true; +}
drivers/net/wireless/mediatek/mt76/mt7996/init.c +1 -1
@@ -475,7 +475,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 );wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER ); -if (mt7996_has_background_radar (dev) && +if (mt7996_eeprom_has_background_radar (dev) && (!mdev->dev->of_node || !of_property_read_bool (mdev->dev->of_node,"mediatek,disable-radar-background" )))
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -19
@@ -488,25 +488,6 @@ mt7996_band_valid(struct mt7996_dev *dev, u8 band)return band <=MT_BAND2 ; } -static inline bool -mt7996_has_background_radar (struct mt7996_dev *dev) -{ -switch (mt76_chip (&dev->mt76)) { -case MT7996_DEVICE_ID : -if (dev->var.type ==MT7996_VAR_TYPE_233 ) -return false; -break ; -case MT7992_DEVICE_ID : -if (dev->var.type ==MT7992_VAR_TYPE_23 ) -return false; -break ; -default : -return false; - } - -return true; -} -static inline struct mt7996_phy *mt7996_band_phy (struct mt7996_dev *dev,enum nl80211_band band) {
@@ -570,6 +551,7 @@ int mt7996_eeprom_parse_hw_cap(struct mt7996_dev *dev, struct mt7996_phy *phy);int mt7996_eeprom_get_target_power (struct mt7996_dev *dev,struct ieee80211_channel *chan);s8 mt7996_eeprom_get_power_delta (struct mt7996_dev *dev,int band); +bool mt7996_eeprom_has_background_radar (struct mt7996_dev *dev);int mt7996_dma_init (struct mt7996_dev *dev);void mt7996_dma_reset (struct mt7996_dev *dev,bool force);void mt7996_dma_prefetch (struct mt7996_dev *dev);
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v3 10/10 wifi: mt76: mt7996: add PCI device id for mt7990
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Add PCI device IDs to enable support for mt7990 chipsets.
--- drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/pci.c +6 -2
@@ -18,12 +18,14 @@ static u32 hif_idx;static const struct pci_device_id mt7996_pci_device_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID ) }, {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7990_DEVICE_ID ) }, { }, };static const struct pci_device_id mt7996_hif_device_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID_2 ) }, {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID_2 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_MEDIATEK ,MT7990_DEVICE_ID_2 ) }, { }, };
@@ -64,7 +66,8 @@ static struct mt7996_hif *mt7996_pci_init_hif2(struct pci_dev *pdev) hif_idx++;if (!pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7996_DEVICE_ID_2 ,NULL ) && - !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID_2 ,NULL )) + !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7992_DEVICE_ID_2 ,NULL ) && + !pci_get_device (PCI_VENDOR_ID_MEDIATEK ,MT7990_DEVICE_ID_2 ,NULL ))return NULL ; writel(hif_idx | MT_PCIE_RECOG_ID_SEM,
@@ -122,7 +125,8 @@ static int mt7996_pci_probe(struct pci_dev *pdev,mt76_pci_disable_aspm (pdev);if (id->device ==MT7996_DEVICE_ID_2 || - id->device ==MT7992_DEVICE_ID_2 ) + id->device ==MT7992_DEVICE_ID_2 || + id->device ==MT7990_DEVICE_ID_2 )return mt7996_pci_hif2_probe (pdev); dev = mt7996_mmio_probe(&pdev->dev, pcim_iomap_table(pdev)[0],
Signature · 1 line
2.39.2