dt-bindings: net: wireless: mt76: document bindings for MT7622
Subsystems (4)
Felix Fietkau
maintainerPATCH 1/15 dt-bindings: net: wireless: mt76: document bindings for MT7622
MT7622 is a SoC that includes a 2.4 GHz 4x4 802.11n WMAC. Its feature set is comparable to a MT7615 chip, but limited to 2.4 GHz.
--- .../bindings/net/wireless/mediatek,mt76.txt | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt +23 -3
@@ -4,13 +4,21 @@ This node provides properties for configuring the MediaTek mt76xx wireless device. The node is expected to be specified as a child node of the PCI controller to which the wireless chip is connected. -Alternatively, it can specify the wireless part of the MT7628/MT7688 SoC. -For SoC, use the compatible string "mediatek,mt7628-wmac" and the following -properties: +Alternatively, it can specify the wireless part of the MT7628/MT7688 or +MT7622 SoC. For SoC, use the following compatible strings: + +compatible: +- "mediatek,mt7628-wmac" for MT7628/MT7688 +- "mediatek,mt7622-wmac" for MT7622 +properties: - reg: Address and length of the register set for the device. - interrupts: Main device interrupt +MT7622 specific properties: +- power-domains: phandle to the power domain that the WMAC is part of +- mediatek,infracfg: phandle to the infrastructure bus fabric syscon node + Optional properties: - ieee80211-freq-limit: See ieee80211.txt
@@ -53,3 +61,15 @@ wmac: wmac@10300000 { mediatek,mtd-eeprom = <&factory 0x0000>; }; + +MT7622 example: + +wmac: wmac@18000000 { + compatible = "mediatek,mt7622-wmac"; + reg = <0 0x18000000 0 0x100000>; + interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_LOW>; + + mediatek,infracfg = <&infracfg>; + + power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>; +};
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/15 mt76: mt7615: add __aligned(4) to txp structs
The beginning of the struct is guaranteed to be 4-byte aligned, and this attribute allows the compiler to generate more efficient code
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +2 -2
@@ -243,7 +243,7 @@ struct mt7615_txp {u8 nbuf;__le32 buf[MT_TXP_MAX_BUF_NUM ];__le16 len[MT_TXP_MAX_BUF_NUM ]; -} __packed; +} __packed__aligned(4) ;struct mt7615_tx_free {__le16 rx_byte_cnt;
@@ -251,7 +251,7 @@ struct mt7615_tx_free {u8 txd_cnt;u8 rsv[3 ];__le16 token[]; -} __packed; +} __packed__aligned(4) ;#define MT_TX_FREE_MSDU_ID_CNT GENMASK(6, 0)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/15 mt76: mt7615: move mmio related code from pci.c to mmio.c
In reply to Felix FietkauWill be shared with MT7622 SoC support
--- .../wireless/mediatek/mt76/mt7615/Makefile | 2 +- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 105 ++++++++++++++++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 1 + .../net/wireless/mediatek/mt76/mt7615/pci.c | 97 +--------------- 4 files changed, 108 insertions(+), 97 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
drivers/net/wireless/mediatek/mt76/mt7615/Makefile +1 -1
@@ -4,5 +4,5 @@ obj-$(CONFIG_MT7615E) += mt7615e.o CFLAGS_trace.o := -I$(src) -mt7615e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o \ +mt7615e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o mmio.o \ debugfs.o trace.o
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c new file +105 -0
105 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -231,6 +231,7 @@ mt7615_ext_phy(struct mt7615_dev *dev)extern const struct ieee80211_ops mt7615_ops;extern struct pci_driver mt7615_pci_driver; +int mt7615_mmio_probe (struct device *pdev,void __iomem *mem_base,int irq);u32 mt7615_reg_map (struct mt7615_dev *dev,u32 addr);int mt7615_register_device (struct mt7615_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/pci.c +1 -96
118 lines not on this page · raw message
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 4/15 mt76: mt7615: split up firmware loading functions
In reply to Felix FietkauPreparation for adding MT7622 support
--- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +26 -6
@@ -345,7 +345,7 @@ static int mt7615_driver_own(struct mt7615_dev *dev)return 0 ; } -static int mt7615_load_patch (struct mt7615_dev *dev) +static int mt7615_load_patch (struct mt7615_dev *dev,const char *name) {const struct mt7615_patch_hdr *hdr;const struct firmware *fw =NULL ;
@@ -362,7 +362,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)return -EAGAIN ; } - ret =request_firmware (&fw,MT7615_ROM_PATCH , dev->mt76.dev); + ret =request_firmware (&fw, name, dev->mt76.dev);if (ret) goto out;
@@ -458,13 +458,13 @@ mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,return 0 ; } -static int mt7615_load_ram (struct mt7615_dev *dev) +static int mt7615_load_n9 (struct mt7615_dev *dev,const char *name) {const struct mt7615_fw_trailer *hdr;const struct firmware *fw;int ret; - ret =request_firmware (&fw,MT7615_FIRMWARE_N9 , dev->mt76.dev); + ret =request_firmware (&fw, name, dev->mt76.dev);if (ret)return ret;
@@ -491,9 +491,18 @@ static int mt7615_load_ram(struct mt7615_dev *dev) goto out; } +out:release_firmware (fw); +return ret; +} + +static int mt7615_load_cr4 (struct mt7615_dev *dev,const char *name) +{ +const struct mt7615_fw_trailer *hdr; +const struct firmware *fw; +int ret; - ret =request_firmware (&fw,MT7615_FIRMWARE_CR4 , dev->mt76.dev); + ret =request_firmware (&fw, name, dev->mt76.dev);if (ret)return ret;
@@ -529,6 +538,17 @@ static int mt7615_load_ram(struct mt7615_dev *dev)return ret; } +static int mt7615_load_ram (struct mt7615_dev *dev) +{ +int ret; + + ret =mt7615_load_n9 (dev,MT7615_FIRMWARE_N9 ); +if (ret) +return ret; + +return mt7615_load_cr4 (dev,MT7615_FIRMWARE_CR4 ); +} +static int mt7615_load_firmware (struct mt7615_dev *dev) {int ret;
@@ -541,7 +561,7 @@ static int mt7615_load_firmware(struct mt7615_dev *dev)return -EIO ; } - ret =mt7615_load_patch (dev); + ret =mt7615_load_patch (dev,MT7615_ROM_PATCH );if (ret)return ret;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 5/15 mt76: mt7615: store N9 firmware version instead of CR4
In reply to Felix FietkauCR4 is used very little, N9 is the main firmware that the driver interacts with
--- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +4 -4
@@ -491,6 +491,10 @@ static int mt7615_load_n9(struct mt7615_dev *dev, const char *name) goto out; } +snprintf (dev->mt76.hw->wiphy->fw_version, +sizeof (dev->mt76.hw->wiphy->fw_version), +"%.10s-%.15s" , hdr->fw_ver, hdr->build_date); + out:release_firmware (fw);return ret;
@@ -528,10 +532,6 @@ static int mt7615_load_cr4(struct mt7615_dev *dev, const char *name) goto out; } -snprintf (dev->mt76.hw->wiphy->fw_version, -sizeof (dev->mt76.hw->wiphy->fw_version), -"%.10s-%.15s" , hdr->fw_ver, hdr->build_date); - out:release_firmware (fw);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 6/15 mt76: mt7615: fix MT_INT_TX_DONE_ALL definition for MT7622
In reply to Felix FietkauMT7622 uses more interrupt bits for queue tx completion events. Enabling those extra bits is harmless on MT7615
--- drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +1 -1
@@ -37,7 +37,7 @@#define MT_INT_RX_DONE (_n) BIT(_n)#define MT_INT_RX_DONE_ALL GENMASK(1, 0) -#define MT_INT_TX_DONE_ALL GENMASK(7, 4) +#define MT_INT_TX_DONE_ALL GENMASK(19, 4)#define MT_INT_TX_DONE (_n) BIT((_n) + 4)#define MT_WPDMA_GLO_CFG MT_HIF(0x208)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 7/15 mt76: mt7615: add dma and tx queue initialization for MT7622
In reply to Felix FietkauMT7622 queue mapping is different from MT7615 and requires an extra dma scheduler init and a few register tweaks
--- .../net/wireless/mediatek/mt76/mt7615/dma.c | 168 ++++++++++++------ .../wireless/mediatek/mt76/mt7615/mt7615.h | 16 ++ .../net/wireless/mediatek/mt76/mt7615/regs.h | 21 +++ 3 files changed, 154 insertions(+), 51 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +117 -51
@@ -12,47 +12,85 @@#include "mac.h" static int -mt7615_init_tx_queues (struct mt7615_dev *dev,int n_desc) +mt7615_init_tx_queue (struct mt7615_dev *dev,struct mt76_sw_queue *q, +int idx,int n_desc) { -struct mt76_sw_queue *q;struct mt76_queue *hwq; -int err, i; +int err; hwq =devm_kzalloc (dev->mt76.dev,sizeof (*hwq),GFP_KERNEL );if (!hwq)return -ENOMEM ; - err =mt76_queue_alloc (dev, hwq,0 , n_desc,0 ,MT_TX_RING_BASE ); + err =mt76_queue_alloc (dev, hwq, idx, n_desc,0 ,MT_TX_RING_BASE );if (err <0 )return err; -for (i =0 ; i <MT_TXQ_MCU ; i++) { - q = &dev->mt76.q_tx[i]; -INIT_LIST_HEAD (&q->swq); - q->q = hwq; - } +INIT_LIST_HEAD (&q->swq); + q->q = hwq;return 0 ; }static int -mt7615_init_mcu_queue (struct mt7615_dev *dev,struct mt76_sw_queue *q, -int idx,int n_desc) +mt7622_init_tx_queues_multi (struct mt7615_dev *dev) { -struct mt76_queue *hwq; -int err; +static const u8 wmm_queue_map[] = { +MT7622_TXQ_AC0 , +MT7622_TXQ_AC1 , +MT7622_TXQ_AC2 , +MT7622_TXQ_AC3 , + }; +int ret; +int i; - hwq =devm_kzalloc (dev->mt76.dev,sizeof (*hwq),GFP_KERNEL ); -if (!hwq) -return -ENOMEM ; +for (i =0 ; i <ARRAY_SIZE (wmm_queue_map); i++) { + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[i], + wmm_queue_map[i], +MT7615_TX_RING_SIZE /2 ); +if (ret) +return ret; + } - err =mt76_queue_alloc (dev, hwq, idx, n_desc,0 ,MT_TX_RING_BASE ); -if (err <0 ) -return err; + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_PSD ], +MT7622_TXQ_MGMT ,MT7615_TX_MGMT_RING_SIZE ); +if (ret) +return ret; -INIT_LIST_HEAD (&q->swq); - q->q = hwq; + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], +MT7622_TXQ_MCU ,MT7615_TX_MCU_RING_SIZE ); +return ret; +} + +static int +mt7615_init_tx_queues (struct mt7615_dev *dev) +{ +struct mt76_sw_queue *q; +int ret, i; + + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_FWDL ], +MT7615_TXQ_FWDL , +MT7615_TX_FWDL_RING_SIZE ); +if (ret) +return ret; +if (!is_mt7615 (&dev->mt76)) +return mt7622_init_tx_queues_multi (dev); + + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[0 ],0 , +MT7615_TX_RING_SIZE ); +if (ret) +return ret; + +for (i =1 ; i <MT_TXQ_MCU ; i++) { + q = &dev->mt76.q_tx[i]; +INIT_LIST_HEAD (&q->swq); + q->q = dev->mt76.q_tx[0 ].q; + } + + ret =mt7615_init_tx_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], +MT7615_TXQ_MCU , +MT7615_TX_MCU_RING_SIZE );return 0 ; }
@@ -90,25 +128,32 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, } } +static void +mt7615_tx_cleanup (struct mt7615_dev *dev) +{ +int i; + +mt76_queue_tx_cleanup (dev,MT_TXQ_MCU , false); +if (is_mt7615 (&dev->mt76)) { +mt76_queue_tx_cleanup (dev,MT_TXQ_BE , false); + }else { +for (i =0 ; i <IEEE80211_NUM_ACS ; i++) +mt76_queue_tx_cleanup (dev, i, false); + } +} +static int mt7615_poll_tx (struct napi_struct *napi,int budget) { -static const u8 queue_map[] = { -MT_TXQ_MCU , -MT_TXQ_BE - };struct mt7615_dev *dev; -int i; dev = container_of(napi, struct mt7615_dev, mt76.tx_napi); -for (i =0 ; i <ARRAY_SIZE (queue_map); i++) -mt76_queue_tx_cleanup (dev, queue_map[i], false); +mt7615_tx_cleanup (dev);if (napi_complete_done (napi,0 ))mt7615_irq_enable (dev,MT_INT_TX_DONE_ALL ); -for (i =0 ; i <ARRAY_SIZE (queue_map); i++) -mt76_queue_tx_cleanup (dev, queue_map[i], false); +mt7615_tx_cleanup (dev);mt7615_mac_sta_poll (dev);
@@ -117,6 +162,30 @@ static int mt7615_poll_tx(struct napi_struct *napi, int budget)return 0 ; } +static void mt7622_dma_sched_init (struct mt7615_dev *dev) +{ +u32 reg =mt7615_reg_map (dev,MT_DMASHDL_BASE ); +int i; + +mt76_rmw (dev, reg +MT_DMASHDL_PKT_MAX_SIZE , +MT_DMASHDL_PKT_MAX_SIZE_PLE |MT_DMASHDL_PKT_MAX_SIZE_PSE , +FIELD_PREP (MT_DMASHDL_PKT_MAX_SIZE_PLE ,1 ) | +FIELD_PREP (MT_DMASHDL_PKT_MAX_SIZE_PSE ,8 )); + +for (i =0 ; i <=5 ; i++) +mt76_wr (dev, reg +MT_DMASHDL_GROUP_QUOTA (i), +FIELD_PREP (MT_DMASHDL_GROUP_QUOTA_MIN ,0x10 ) | +FIELD_PREP (MT_DMASHDL_GROUP_QUOTA_MAX ,0x800 )); + +mt76_wr (dev, reg +MT_DMASHDL_Q_MAP (0 ),0x42104210 ); +mt76_wr (dev, reg +MT_DMASHDL_Q_MAP (1 ),0x42104210 ); +mt76_wr (dev, reg +MT_DMASHDL_Q_MAP (2 ),0x5 ); +mt76_wr (dev, reg +MT_DMASHDL_Q_MAP (3 ),0 ); + +mt76_wr (dev, reg +MT_DMASHDL_SCHED_SET0 ,0x6012345f ); +mt76_wr (dev, reg +MT_DMASHDL_SCHED_SET1 ,0xedcba987 ); +} +int mt7615_dma_init (struct mt7615_dev *dev) {int ret;
@@ -126,9 +195,12 @@ int mt7615_dma_init(struct mt7615_dev *dev)mt76_wr (dev,MT_WPDMA_GLO_CFG ,MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE |MT_WPDMA_GLO_CFG_FIFO_LITTLE_ENDIAN | -MT_WPDMA_GLO_CFG_FIRST_TOKEN_ONLY |MT_WPDMA_GLO_CFG_OMIT_TX_INFO ); +if (!is_mt7622 (&dev->mt76)) +mt76_set (dev,MT_WPDMA_GLO_CFG , +MT_WPDMA_GLO_CFG_FIRST_TOKEN_ONLY ); +mt76_rmw_field (dev,MT_WPDMA_GLO_CFG ,MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT0 ,0x1 );
@@ -141,28 +213,19 @@ int mt7615_dma_init(struct mt7615_dev *dev)mt76_rmw_field (dev,MT_WPDMA_GLO_CFG ,MT_WPDMA_GLO_CFG_MULTI_DMA_EN ,0x3 ); -mt76_wr (dev,MT_WPDMA_GLO_CFG1 ,0x1 ); -mt76_wr (dev,MT_WPDMA_TX_PRE_CFG ,0xf0000 ); -mt76_wr (dev,MT_WPDMA_RX_PRE_CFG ,0xf7f0000 ); -mt76_wr (dev,MT_WPDMA_ABT_CFG ,0x4000026 ); -mt76_wr (dev,MT_WPDMA_ABT_CFG1 ,0x18811881 ); -mt76_set (dev,0x7158 ,BIT (16 )); -mt76_clear (dev,0x7000 ,BIT (23 )); -mt76_wr (dev,MT_WPDMA_RST_IDX , ~0 ); - - ret =mt7615_init_tx_queues (dev,MT7615_TX_RING_SIZE ); -if (ret) -return ret; +if (is_mt7615 (&dev->mt76)) { +mt76_wr (dev,MT_WPDMA_GLO_CFG1 ,0x1 ); +mt76_wr (dev,MT_WPDMA_TX_PRE_CFG ,0xf0000 ); +mt76_wr (dev,MT_WPDMA_RX_PRE_CFG ,0xf7f0000 ); +mt76_wr (dev,MT_WPDMA_ABT_CFG ,0x4000026 ); +mt76_wr (dev,MT_WPDMA_ABT_CFG1 ,0x18811881 ); +mt76_set (dev,0x7158 ,BIT (16 )); +mt76_clear (dev,0x7000 ,BIT (23 )); + } - ret =mt7615_init_mcu_queue (dev, &dev->mt76.q_tx[MT_TXQ_MCU ], -MT7615_TXQ_MCU , -MT7615_TX_MCU_RING_SIZE ); -if (ret) -return ret; +mt76_wr (dev,MT_WPDMA_RST_IDX , ~0 ); - ret =mt7615_init_mcu_queue (dev, &dev->mt76.q_tx[MT_TXQ_FWDL ], -MT7615_TXQ_FWDL , -MT7615_TX_FWDL_RING_SIZE ); + ret =mt7615_init_tx_queues (dev);if (ret)return ret;
@@ -201,6 +264,9 @@ int mt7615_dma_init(struct mt7615_dev *dev)/* enable interrupts for TX/RX rings */ mt7615_irq_enable (dev,MT_INT_RX_DONE_ALL |MT_INT_TX_DONE_ALL ); +if (is_mt7622 (&dev->mt76)) +mt7622_dma_sched_init (dev); +return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +16 -0
@@ -20,6 +20,7 @@#define MT7615_RATE_RETRY 2#define MT7615_TX_RING_SIZE 1024 +#define MT7615_TX_MGMT_RING_SIZE 128#define MT7615_TX_MCU_RING_SIZE 128#define MT7615_TX_FWDL_RING_SIZE 128
@@ -56,6 +57,16 @@ enum mt7615_hw_txq_id { MT7615_TXQ_FWDL, }; +enum mt7622_hw_txq_id { +MT7622_TXQ_AC0 , +MT7622_TXQ_AC1 , +MT7622_TXQ_AC2 , +MT7622_TXQ_FWDL =MT7615_TXQ_FWDL , +MT7622_TXQ_AC3 , +MT7622_TXQ_MGMT , +MT7622_TXQ_MCU =15 , +}; +struct mt7615_rate_set {struct ieee80211_tx_rate probe_rate;struct ieee80211_tx_rate rates[4 ];
@@ -287,6 +298,11 @@ static inline bool is_mt7622(struct mt76_dev *dev)return mt76_chip (dev) ==0x7622 ; } +static inline bool is_mt7615 (struct mt76_dev *dev) +{ +return mt76_chip (dev) ==0x7615 ; +} +static inline void mt7615_irq_enable (struct mt7615_dev *dev,u32 mask) {mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask);
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +21 -0
@@ -339,6 +339,27 @@#define MT_TX_AGG_CNT (n) MT_WF_MIB(0xa8 + ((n) << 2)) +#define MT_DMASHDL_BASE 0x5000a000 +#define MT_DMASHDL_OPTIONAL 0x008 +#define MT_DMASHDL_PAGE 0x00c + +#define MT_DMASHDL_REFILL 0x010 + +#define MT_DMASHDL_PKT_MAX_SIZE 0x01c +#define MT_DMASHDL_PKT_MAX_SIZE_PLE GENMASK(11, 0) +#define MT_DMASHDL_PKT_MAX_SIZE_PSE GENMASK(27, 16) + +#define MT_DMASHDL_GROUP_QUOTA (_n) (0x020 + ((_n) << 2)) +#define MT_DMASHDL_GROUP_QUOTA_MIN GENMASK(11, 0) +#define MT_DMASHDL_GROUP_QUOTA_MAX GENMASK(27, 16) + +#define MT_DMASHDL_SCHED_SET0 0x0b0 +#define MT_DMASHDL_SCHED_SET1 0x0b4 + +#define MT_DMASHDL_Q_MAP (_n) (0x0d0 + ((_n) << 2)) +#define MT_DMASHDL_Q_MAP_MASK GENMASK(3, 0) +#define MT_DMASHDL_Q_MAP_SHIFT (_n) (4 * ((_n) % 8)) +#define MT_LED_BASE_PHYS 0x80024000#define MT_LED_PHYS (_n) (MT_LED_BASE_PHYS + (_n))
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 8/15 mt76: mt7615: add eeprom support for MT7622
In reply to Felix FietkauWhen sending EEPROM data to the MCU, MT7622 uses a longer buffer
--- .../net/wireless/mediatek/mt76/mt7615/eeprom.c | 1 + .../net/wireless/mediatek/mt76/mt7615/eeprom.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 17 +++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +1 -0
@@ -84,6 +84,7 @@ static int mt7615_check_eeprom(struct mt76_dev *dev)switch (val) {case 0x7615 : +case 0x7622 :return 0 ;default :return -EINVAL ;
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h +2 -1
@@ -21,7 +21,8 @@ enum mt7615_eeprom_field {MT_EE_TX2_5G_G0_TARGET_POWER =0x142 ,MT_EE_TX3_5G_G0_TARGET_POWER =0x16a , - __MT_EE_MAX = 0x3bf +MT7615_EE_MAX =0x3bf , + MT7622_EE_MAX = 0x3db, };#define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +11 -6
@@ -621,18 +621,23 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev)__le16 len; }__packed req_hdr = { .buffer_mode =1 , - .len =cpu_to_le16 (__MT_EE_MAX -MT_EE_NIC_CONF_0 ), }; -int ret, len =sizeof (req_hdr) + __MT_EE_MAX -MT_EE_NIC_CONF_0 ; +int ret, len, eep_len;u8 *req, *eep = (u8 *)dev->mt76.eeprom.data; +if (is_mt7622 (&dev->mt76)) + eep_len =MT7622_EE_MAX -MT_EE_NIC_CONF_0 ; +else + eep_len =MT7615_EE_MAX -MT_EE_NIC_CONF_0 ; + + len =sizeof (req_hdr) + eep_len; req =kzalloc (len,GFP_KERNEL );if (!req)return -ENOMEM ; + req_hdr.len =cpu_to_le16 (eep_len);memcpy (req, &req_hdr,sizeof (req_hdr)); -memcpy (req +sizeof (req_hdr), eep +MT_EE_NIC_CONF_0 , - __MT_EE_MAX -MT_EE_NIC_CONF_0 ); +memcpy (req +sizeof (req_hdr), eep +MT_EE_NIC_CONF_0 , eep_len); ret =__mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_EFUSE_BUFFER_MODE , req, len, true);
@@ -1285,7 +1290,7 @@ int mt7615_mcu_set_tx_power(struct mt7615_phy *phy) };s8 tx_power; - len =sizeof (req_hdr) + __MT_EE_MAX -MT_EE_NIC_CONF_0 ; + len =sizeof (req_hdr) +MT7615_EE_MAX -MT_EE_NIC_CONF_0 ; req =kzalloc (len,GFP_KERNEL );if (!req)return -ENOMEM ;
@@ -1293,7 +1298,7 @@ int mt7615_mcu_set_tx_power(struct mt7615_phy *phy)memcpy (req, &req_hdr,sizeof (req_hdr)); data = req +sizeof (req_hdr);memcpy (data, eep +MT_EE_NIC_CONF_0 , - __MT_EE_MAX -MT_EE_NIC_CONF_0 ); +MT7615_EE_MAX -MT_EE_NIC_CONF_0 ); tx_power = hw->conf.power_level *2 ;switch (n_chains) {
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 9/15 mt76: mt7615: add calibration free support for MT7622
In reply to Felix FietkauMT7622 uses fewer efuse overrides than MT7615
--- .../wireless/mediatek/mt76/mt7615/eeprom.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +22 -0
@@ -210,6 +210,26 @@ static void mt7615_apply_cal_free_data(struct mt7615_dev *dev) eeprom[ical_nocheck[i]] = otp[ical_nocheck[i]]; } +static void mt7622_apply_cal_free_data (struct mt7615_dev *dev) +{ +static const u16 ical[] = { +0x53 ,0x54 ,0x55 ,0x56 ,0xf4 ,0xf7 ,0x144 ,0x156 ,0x15b + }; +u8 *eeprom = dev->mt76.eeprom.data; +u8 *otp = dev->mt76.otp.data; +int i; + +if (!otp) +return ; + +for (i =0 ; i <ARRAY_SIZE (ical); i++) { +if (!otp[ical[i]]) +continue ; + + eeprom[ical[i]] = otp[ical[i]]; + } +} +int mt7615_eeprom_init (struct mt7615_dev *dev) {int ret;
@@ -222,6 +242,8 @@ int mt7615_eeprom_init(struct mt7615_dev *dev)if (ret && dev->mt76.otp.data)memcpy (dev->mt76.eeprom.data, dev->mt76.otp.data,MT7615_EEPROM_SIZE ); +else if (is_mt7622 (&dev->mt76)) +mt7622_apply_cal_free_data (dev);else mt7615_apply_cal_free_data (dev);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 10/15 mt76: mt7615: disable 5 GHz on MT7622
In reply to Felix FietkauIt is not supported by the chip, so avoid issues with potentially wrong EEPROM configurations.
--- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +3 -0
@@ -111,6 +111,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)break ; } +if (is_mt7622 (&dev->mt76)) + dev->mt76.cap.has_5ghz = false; +/* read tx-rx mask from eeprom */ val =mt76_rr (dev,MT_TOP_STRAP_STA ); max_nss = val &MT_TOP_3NSS ?3 :4 ;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 11/15 mt76: mt7615: implement probing and firmware loading on MT7622
In reply to Felix FietkauMT7622 does not have a CR4 microcontroller, so it only uses its own N9 firmware.
--- .../wireless/mediatek/mt76/mt7615/Makefile | 1 + .../net/wireless/mediatek/mt76/mt7615/init.c | 4 + .../net/wireless/mediatek/mt76/mt7615/main.c | 28 ++++++ .../net/wireless/mediatek/mt76/mt7615/mcu.c | 85 ++++++++++++++++--- .../wireless/mediatek/mt76/mt7615/mt7615.h | 19 +++++ .../net/wireless/mediatek/mt76/mt7615/pci.c | 3 - .../net/wireless/mediatek/mt76/mt7615/regs.h | 9 ++ .../net/wireless/mediatek/mt76/mt7615/soc.c | 77 +++++++++++++++++ 8 files changed, 213 insertions(+), 13 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/soc.c
drivers/net/wireless/mediatek/mt76/mt7615/Makefile +1 -0
@@ -6,3 +6,4 @@ CFLAGS_trace.o := -I$(src) mt7615e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o mmio.o \ debugfs.o trace.o +mt7615e-$(CONFIG_MT7622_WMAC) += soc.o
drivers/net/wireless/mediatek/mt76/mt7615/init.c +4 -0
@@ -442,6 +442,10 @@ int mt7615_register_device(struct mt7615_dev *dev)INIT_LIST_HEAD (&dev->sta_poll_list);spin_lock_init (&dev->sta_poll_lock); + ret =mt7622_wmac_init (dev); +if (ret) +return ret; + ret =mt7615_init_hardware (dev);if (ret)return ret;
drivers/net/wireless/mediatek/mt76/mt7615/main.c +28 -0
@@ -730,3 +730,31 @@ const struct ieee80211_ops mt7615_ops = { .set_antenna = mt7615_set_antenna, .set_coverage_class = mt7615_set_coverage_class, }; + +static int __init mt7615_init (void ) +{ +int ret; + + ret =pci_register_driver (&mt7615_pci_driver); +if (ret) +return ret; + +if (IS_ENABLED (CONFIG_MT7622_WMAC )) { + ret =platform_driver_register (&mt7622_wmac_driver); +if (ret) +pci_unregister_driver (&mt7615_pci_driver); + } + +return ret; +} + +static void __exit mt7615_exit(void) +{ +if (IS_ENABLED (CONFIG_MT7622_WMAC )) +platform_driver_unregister (&mt7622_wmac_driver); +pci_unregister_driver (&mt7615_pci_driver); +} + +module_init (mt7615_init); +module_exit (mt7615_exit); +MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +75 -10
142 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +19 -0
@@ -6,6 +6,7 @@#include <linux/interrupt.h> #include <linux/ktime.h> +#include <linux/regmap.h> #include "../mt76.h" #include "regs.h"
@@ -31,6 +32,9 @@#define MT7615_FIRMWARE_N9 "mediatek/mt7615_n9.bin"#define MT7615_ROM_PATCH "mediatek/mt7615_rom_patch.bin" +#define MT7622_FIRMWARE_N9 "mediatek/mt7622_n9.bin" +#define MT7622_ROM_PATCH "mediatek/mt7622_rom_patch.bin" +#define MT7615_EEPROM_SIZE 1024#define MT7615_TOKEN_SIZE 4096
@@ -148,6 +152,8 @@ struct mt7615_dev {u16 chainmask; +struct regmap *infracfg; +struct work_struct mcu_work;struct list_head sta_poll_list;
@@ -241,6 +247,16 @@ mt7615_ext_phy(struct mt7615_dev *dev)extern const struct ieee80211_ops mt7615_ops;extern struct pci_driver mt7615_pci_driver; +extern struct platform_driver mt7622_wmac_driver; + +#ifdef CONFIG_MT7622_WMAC +int mt7622_wmac_init (struct mt7615_dev *dev); +#else +static inline int mt7622_wmac_init (struct mt7615_dev *dev) +{ +return 0 ; +} +#endif int mt7615_mmio_probe (struct device *pdev,void __iomem *mem_base,int irq);u32 mt7615_reg_map (struct mt7615_dev *dev,u32 addr);
@@ -295,6 +311,9 @@ int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev);static inline bool is_mt7622 (struct mt76_dev *dev) { +if (!IS_ENABLED (CONFIG_MT7622_WMAC )) +return false; +return mt76_chip (dev) ==0x7622 ; }
drivers/net/wireless/mediatek/mt76/mt7615/pci.c +0 -3
@@ -53,10 +53,7 @@ struct pci_driver mt7615_pci_driver = { .remove = mt7615_pci_remove, }; -module_pci_driver (mt7615_pci_driver); -MODULE_DEVICE_TABLE (pci, mt7615_pci_device_table);MODULE_FIRMWARE (MT7615_FIRMWARE_CR4 );MODULE_FIRMWARE (MT7615_FIRMWARE_N9 );MODULE_FIRMWARE (MT7615_ROM_PATCH ); -MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +9 -0
@@ -8,6 +8,10 @@#define MT_HW_CHIPID 0x1008#define MT_TOP_STRAP_STA 0x1010#define MT_TOP_3NSS BIT(24) + +#define MT_TOP_OFF_RSV 0x1128 +#define MT_TOP_OFF_RSV_FW_STATE GENMASK(18, 16) +#define MT_TOP_MISC2 0x1134#define MT_TOP_MISC2_FW_STATE GENMASK(2, 0)
@@ -49,6 +53,7 @@#define MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE BIT(6)#define MT_WPDMA_GLO_CFG_BIG_ENDIAN BIT(7)#define MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT0 BIT(9) +#define MT_WPDMA_GLO_CFG_BYPASS_TX_SCH BIT(9)/* MT7622 */ #define MT_WPDMA_GLO_CFG_MULTI_DMA_EN GENMASK(11, 10)#define MT_WPDMA_GLO_CFG_FIFO_LITTLE_ENDIAN BIT(12)#define MT_WPDMA_GLO_CFG_TX_BT_SIZE_BIT21 GENMASK(23, 22)
@@ -395,4 +400,8 @@#define MT_EFUSE_WDATA (_i) (0x010 + ((_i) * 4))#define MT_EFUSE_RDATA (_i) (0x030 + ((_i) * 4)) +/* INFRACFG host register range on MT7622 */ +#define MT_INFRACFG_MISC 0x700 +#define MT_INFRACFG_MISC_AP2CONN_WAKE BIT(1) +#endif
drivers/net/wireless/mediatek/mt76/mt7615/soc.c new file +77 -0
77 lines not on this page · raw message
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 12/15 mt76: mt7615: implement DMA support for MT7622
In reply to Felix FietkauMT7622 does not have the CR4 microcontroller sitting in the data path. Because of that, it uses the chip's native tx descriptor format instead of something parsed and converted by the firmware.
--- .../net/wireless/mediatek/mt76/mt7615/init.c | 5 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 221 +++++++++++++----- .../net/wireless/mediatek/mt76/mt7615/mac.h | 32 ++- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 2 +- 4 files changed, 200 insertions(+), 60 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +4 -1
@@ -346,7 +346,10 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN ); - hw->max_tx_fragments =MT_TXP_MAX_BUF_NUM ; +if (is_mt7615 (&phy->dev->mt76)) + hw->max_tx_fragments =MT_TXP_MAX_BUF_NUM ; +else + hw->max_tx_fragments =MT_HW_TXP_MAX_BUF_NUM ; } static void
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +166 -55
295 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +29 -3
@@ -233,8 +233,27 @@ enum tx_phy_bandwidth {#define MT_TX_RATE_IDX GENMASK(5, 0)#define MT_TXP_MAX_BUF_NUM 6 +#define MT_HW_TXP_MAX_MSDU_NUM 4 +#define MT_HW_TXP_MAX_BUF_NUM 4 -struct mt7615_txp { +#define MT_MSDU_ID_VALID BIT(15) + +#define MT_TXD_LEN_MSDU_LAST BIT(14) +#define MT_TXD_LEN_AMSDU_LAST BIT(15) + +struct mt7615_txp_ptr { +__le32 buf0; +__le16 len0; +__le16 len1; +__le32 buf1; +} __packed__aligned(4) ; + +struct mt7615_hw_txp { +__le16 msdu_id[MT_HW_TXP_MAX_MSDU_NUM ]; +struct mt7615_txp_ptr ptr[MT_HW_TXP_MAX_BUF_NUM /2 ]; +} __packed__aligned(4) ; + +struct mt7615_fw_txp {__le16 flags;__le16 token;u8 bss_idx;
@@ -245,6 +264,13 @@ struct mt7615_txp {__le16 len[MT_TXP_MAX_BUF_NUM ]; } __packed__aligned(4) ; +struct mt7615_txp_common { +union { +struct mt7615_fw_txp fw; +struct mt7615_hw_txp hw; + }; +}; +struct mt7615_tx_free {__le16 rx_byte_cnt;__le16 ctrl;
@@ -353,7 +379,7 @@ enum mt7615_cipher_type { MT_CIPHER_GCMP_256, }; -static inline struct mt7615_txp * +static inline struct mt7615_txp_common *mt7615_txwi_to_txp (struct mt76_dev *dev,struct mt76_txwi_cache *t) {u8 *txwi;
@@ -363,7 +389,7 @@ mt7615_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t) txwi =mt76_get_txwi_ptr (dev, t); - return (struct mt7615_txp *)(txwi + MT_TXD_SIZE); + return (struct mt7615_txp_common *)(txwi + MT_TXD_SIZE); }#endif
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +1 -1
@@ -60,7 +60,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, int irq) { static const struct mt76_driver_ops drv_ops = { /* txwi_size = txd size + txp size */ - .txwi_size = MT_TXD_SIZE + sizeof(struct mt7615_txp), + .txwi_size = MT_TXD_SIZE + sizeof(struct mt7615_txp_common), .drv_flags = MT_DRV_TXWI_NO_FREE, .survey_flags = SURVEY_INFO_TIME_TX | SURVEY_INFO_TIME_RX |
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 13/15 mt76: mt7615: decrease rx ring size for MT7622
In reply to Felix FietkauSince it's 2.4 GHz only, it needs fewer buffers
--- drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +5 -2
@@ -188,6 +188,7 @@ static void mt7622_dma_sched_init(struct mt7615_dev *dev)int mt7615_dma_init (struct mt7615_dev *dev) { +int rx_ring_size =MT7615_RX_RING_SIZE ;int ret;mt76_dma_attach (&dev->mt76);
@@ -236,9 +237,11 @@ int mt7615_dma_init(struct mt7615_dev *dev)if (ret)return ret; +if (!is_mt7615 (&dev->mt76)) + rx_ring_size /=2 ; + ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_MAIN ],0 , -MT7615_RX_RING_SIZE ,MT_RX_BUF_SIZE , -MT_RX_RING_BASE ); + rx_ring_size,MT_RX_BUF_SIZE ,MT_RX_RING_BASE );if (ret)return ret;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 14/15 mt76: mt7615: disable DBDC on MT7622
In reply to Felix FietkauIt is only supported on MT7615
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +3 -0
@@ -383,6 +383,9 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev)struct mt76_phy *mphy;int ret; +if (!is_mt7615 (&dev->mt76)) +return -EOPNOTSUPP ; +if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state))return -EINVAL ;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 15/15 mt76: mt7615: add Kconfig entry for MT7622
In reply to Felix FietkauThis enables building support for the MT7622 SoC built-in WLAN chip
--- drivers/net/wireless/mediatek/mt76/mt7615/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/Kconfig +11 -0
@@ -11,3 +11,14 @@ config MT7615E MU-MIMO up to 4 users/group and 160MHz channels. To compile this driver as a module, choose M here. + +config MT7622_WMAC + bool "MT7622 (SoC) WMAC support" + depends on MT7615E + depends on ARCH_MEDIATEK || COMPILE_TEST + select REGMAP + default y + help + This adds support for the built-in WMAC on MT7622 SoC devices + which has the same feature set as a MT7615, but limited to + 2.4 GHz only.
Signature · 1 line
2.24.0
Quoted 8 lines · Felix Fietkau
MT7622 is a SoC that includes a 2.4 GHz 4x4 802.11n WMAC. Its feature set is comparable to a MT7615 chip, but limited to 2.4 GHz.
Signed-off-by Felix Fietkau <[email protected]>--- .../bindings/net/wireless/mediatek,mt76.txt | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)