mt76: mt7615: implement hardware reset support
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/2 mt76: mt7615: implement hardware reset support
When the firmware detects a problem, it needs the host to stop/reset DMA and resume it again when the hardware state has been reset.
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mcu.c | 3 +- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + .../net/wireless/mediatek/mt76/mt7615/dma.c | 3 +- .../net/wireless/mediatek/mt76/mt7615/init.c | 2 + .../net/wireless/mediatek/mt76/mt7615/mac.c | 125 ++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7615/mmio.c | 10 ++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 6 + .../net/wireless/mediatek/mt76/mt7615/regs.h | 23 ++++ 8 files changed, 171 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mcu.c +2 -1
@@ -35,7 +35,8 @@ struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev, timeout = expires - jiffies;wait_event_timeout (dev->mmio.mcu.wait, - !skb_queue_empty (&dev->mmio.mcu.res_q), + (!skb_queue_empty (&dev->mmio.mcu.res_q) || +test_bit (MT76_MCU_RESET , &dev->phy.state)), timeout);return skb_dequeue (&dev->mmio.mcu.res_q); }
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -274,6 +274,7 @@ enum {MT76_STATE_MCU_RUNNING ,MT76_SCANNING ,MT76_RESET , +MT76_MCU_RESET ,MT76_REMOVED , MT76_READING_STATS, };
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +2 -1
@@ -265,7 +265,8 @@ int mt7615_dma_init(struct mt7615_dev *dev) MT_WPDMA_GLO_CFG_RX_DMA_EN);/* enable interrupts for TX/RX rings */ -mt7615_irq_enable (dev,MT_INT_RX_DONE_ALL |MT_INT_TX_DONE_ALL ); +mt7615_irq_enable (dev,MT_INT_RX_DONE_ALL |MT_INT_TX_DONE_ALL | +MT_INT_MCU_CMD );if (is_mt7622 (&dev->mt76))mt7622_dma_sched_init (dev);
drivers/net/wireless/mediatek/mt76/mt7615/init.c +2 -0
@@ -447,6 +447,8 @@ int mt7615_register_device(struct mt7615_dev *dev)INIT_DELAYED_WORK (&dev->mt76.mac_work, mt7615_mac_work);INIT_LIST_HEAD (&dev->sta_poll_list);spin_lock_init (&dev->sta_poll_lock); +init_waitqueue_head (&dev->reset_wait); +INIT_WORK (&dev->reset_work, mt7615_mac_reset_work); ret =mt7622_wmac_init (dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +125 -0
131 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +10 -0
@@ -53,6 +53,16 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance)napi_schedule (&dev->mt76.napi[1 ]); } +if (intr &MT_INT_MCU_CMD ) { +u32 val =mt76_rr (dev,MT_MCU_CMD ); + +if (val &MT_MCU_CMD_ERROR_MASK ) { + dev->reset_state = val; +ieee80211_queue_work (mt76_hw (dev), &dev->reset_work); +wake_up (&dev->reset_wait); + } + } +return IRQ_HANDLED ; }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +6 -0
@@ -18,6 +18,7 @@ MT7615_MAX_INTERFACES)#define MT7615_WATCHDOG_TIME (HZ / 10) +#define MT7615_RESET_TIMEOUT (30 * HZ)#define MT7615_RATE_RETRY 2#define MT7615_TX_RING_SIZE 1024
@@ -156,6 +157,10 @@ struct mt7615_dev {struct work_struct mcu_work; +struct work_struct reset_work; +wait_queue_head_t reset_wait; +u32 reset_state; +struct list_head sta_poll_list;spinlock_t sta_poll_lock;
@@ -352,6 +357,7 @@ void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb);int mt7615_mac_wtbl_set_key (struct mt7615_dev *dev,struct mt76_wcid *wcid,struct ieee80211_key_conf *key,enum set_key_cmd cmd); +void mt7615_mac_reset_work (struct work_struct *work);int mt7615_mcu_set_dbdc (struct mt7615_dev *dev);int mt7615_mcu_set_eeprom (struct mt7615_dev *dev);
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +23 -0
@@ -35,6 +35,12 @@#define MT_CFG_LPCR_HOST_FW_OWN BIT(0)#define MT_CFG_LPCR_HOST_DRV_OWN BIT(1) +#define MT_MCU_INT_EVENT MT_HIF(0x1f8) +#define MT_MCU_INT_EVENT_PDMA_STOPPED BIT(0) +#define MT_MCU_INT_EVENT_PDMA_INIT BIT(1) +#define MT_MCU_INT_EVENT_SER_TRIGGER BIT(2) +#define MT_MCU_INT_EVENT_RESET_DONE BIT(3) +#define MT_INT_SOURCE_CSR MT_HIF(0x200)#define MT_INT_MASK_CSR MT_HIF(0x204)#define MT_DELAY_INT_CFG MT_HIF(0x210)
@@ -43,6 +49,7 @@#define MT_INT_RX_DONE_ALL GENMASK(1, 0)#define MT_INT_TX_DONE_ALL GENMASK(19, 4)#define MT_INT_TX_DONE (_n) BIT((_n) + 4) +#define MT_INT_MCU_CMD BIT(30)#define MT_WPDMA_GLO_CFG MT_HIF(0x208)#define MT_WPDMA_GLO_CFG_TX_DMA_EN BIT(0)
@@ -63,6 +70,22 @@#define MT_WPDMA_RST_IDX MT_HIF(0x20c) +#define MT_WPDMA_MEM_RNG_ERR MT_HIF(0x224) + +#define MT_MCU_CMD MT_HIF(0x234) +#define MT_MCU_CMD_CLEAR_FW_OWN BIT(0) +#define MT_MCU_CMD_STOP_PDMA_FW_RELOAD BIT(1) +#define MT_MCU_CMD_STOP_PDMA BIT(2) +#define MT_MCU_CMD_RESET_DONE BIT(3) +#define MT_MCU_CMD_RECOVERY_DONE BIT(4) +#define MT_MCU_CMD_NORMAL_STATE BIT(5) +#define MT_MCU_CMD_LMAC_ERROR BIT(24) +#define MT_MCU_CMD_PSE_ERROR BIT(25) +#define MT_MCU_CMD_PLE_ERROR BIT(26) +#define MT_MCU_CMD_PDMA_ERROR BIT(27) +#define MT_MCU_CMD_PCIE_ERROR BIT(28) +#define MT_MCU_CMD_ERROR_MASK (GENMASK(5, 1) | GENMASK(28, 24)) +#define MT_TX_RING_BASE MT_HIF(0x300)#define MT_RX_RING_BASE MT_HIF(0x400)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/2 mt76: mt7615: add support for testing hardware reset
Send an undersized corrupt packet to the DMA queue, which causes the firmware to issue a full chip reset
Signed-off-by Felix Fietkau <[email protected]>
--- .../wireless/mediatek/mt76/mt7615/debugfs.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +24 -0
@@ -98,6 +98,28 @@ mt7615_fw_debug_get(void *data, u64 *val)DEFINE_DEBUGFS_ATTRIBUTE (fops_fw_debug, mt7615_fw_debug_get, mt7615_fw_debug_set,"%lld\n" ); +static int +mt7615_reset_test_set (void *data,u64 val) +{ +struct mt7615_dev *dev = data; +struct sk_buff *skb; + +if (!mt7615_wait_for_mcu_init (dev)) +return 0 ; + + skb =alloc_skb (1 ,GFP_KERNEL ); +if (!skb) +return -ENOMEM ; + +skb_put (skb,1 ); +mt76_tx_queue_skb_raw (dev,0 , skb,0 ); + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_reset_test,NULL , + mt7615_reset_test_set,"%lld\n" ); +static int mt7615_ampdu_stat_read (struct seq_file *file,void *data) {
@@ -264,6 +286,8 @@ int mt7615_init_debugfs(struct mt7615_dev *dev) &dev->radar_pattern.power);debugfs_create_file ("radar_trigger" ,0200 , dir, dev, &fops_radar_pattern); +debugfs_create_file ("reset_test" ,0200 , dir, dev, + &fops_reset_test);debugfs_create_devm_seqfile (dev->mt76.dev,"temperature" , dir, mt7615_read_temperature);
Signature · 1 line
2.24.0