Re: [PATCH] mt76: mt7996: reset device after MCU message timeout

[Lorenzo Bianconi <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2065 bytes --]

> Trigger a full reset after MCU message timeout.
> 
> Signed-off-by: Chad Monroe <chad@monroe.io>
> ---
>  drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 5 +++++
>  drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 9 +++++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> index 2560e2f46e89..07b0a694c1bb 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
> @@ -2736,6 +2736,11 @@ void mt7996_reset(struct mt7996_dev *dev)
>  		return;
>  	}
>  
> +	if ((READ_ONCE(dev->recovery.state) & MT_MCU_CMD_STOP_DMA)) {

nit: you do not need double brackets here.

Regards,
Lorenzo

> +		set_bit(MT76_MCU_RESET, &dev->mphy.state);
> +		wake_up(&dev->mt76.mcu.wait);
> +	}
> +
>  	queue_work(dev->mt76.wq, &dev->reset_work);
>  	wake_up(&dev->reset_wait);
>  }
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> index 14a88ef79b6c..40ebda9a3f12 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
> @@ -209,6 +209,7 @@ static int
>  mt7996_mcu_parse_response(struct mt76_dev *mdev, int cmd,
>  			  struct sk_buff *skb, int seq)
>  {
> +	struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);
>  	struct mt7996_mcu_rxd *rxd;
>  	struct mt7996_mcu_uni_event *event;
>  	int mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);
> @@ -217,6 +218,14 @@ mt7996_mcu_parse_response(struct mt76_dev *mdev, int cmd,
>  	if (!skb) {
>  		dev_err(mdev->dev, "Message %08x (seq %d) timeout\n",
>  			cmd, seq);
> +
> +		if (!test_and_set_bit(MT76_MCU_RESET, &dev->mphy.state)) {
> +			dev->recovery.restart = true;
> +			wake_up(&dev->mt76.mcu.wait);
> +			queue_work(dev->mt76.wq, &dev->reset_work);
> +			wake_up(&dev->reset_wait);
> +		}
> +
>  		return -ETIMEDOUT;
>  	}
>  
> -- 
> 2.47.3
> 
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]