Commit a4031fec authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

wifi: mt76: mt7996: fix EMI rings for RRO 



The RRO EMI rings only need to be allocated when WED is not active.
This patch fixes command timeout issue for the setting of WED off and
RRO on.

Fixes: 3a291644 ("wifi: mt76: mt7996: Add SW path for HW-RRO v3.1")
Co-developed-by: default avatarRex Lu <rex.lu@mediatek.com>
Signed-off-by: default avatarRex Lu <rex.lu@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20251106064203.1000505-12-shayne.chen@mediatek.com


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f1e9f369

drivers/net/wireless/mediatek/mt76/mt7996/dma.c

+9 −6
Original line number Diff line number Diff line
@@ -515,12 +515,15 @@ int mt7996_dma_rro_init(struct mt7996_dev *dev) 
		if (ret)

			return ret;



		/* We need to set cpu idx pointer before resetting the EMI

		 * queues.

		if (!mtk_wed_device_active(&mdev->mmio.wed)) {

			/* We need to set cpu idx pointer before resetting the

			 * EMI queues.

			 */

			mdev->q_rx[MT_RXQ_RRO_RXDMAD_C].emi_cpu_idx =

				&dev->wed_rro.emi_rings_cpu.ptr->ring[0].idx;

		mt76_queue_reset(dev, &mdev->q_rx[MT_RXQ_RRO_RXDMAD_C], true);

			mt76_queue_reset(dev, &mdev->q_rx[MT_RXQ_RRO_RXDMAD_C],

					 true);

		}

		goto start_hw_rro;

	}

drivers/net/wireless/mediatek/mt76/mt7996/init.c

+16 −3
Original line number Diff line number Diff line
@@ -960,9 +960,10 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev) 
		       MT7996_RRO_MSDU_PG_SIZE_PER_CR);

	}



	if (dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {

	if (!mtk_wed_device_active(&dev->mt76.mmio.wed) &&

	    dev->mt76.hwrro_mode == MT76_HWRRO_V3_1) {

		ptr = dmam_alloc_coherent(dev->mt76.dma_dev,

					  sizeof(dev->wed_rro.emi_rings_cpu.ptr),

					  sizeof(*dev->wed_rro.emi_rings_cpu.ptr),

					  &dev->wed_rro.emi_rings_cpu.phy_addr,

					  GFP_KERNEL);

		if (!ptr)
@@ -971,7 +972,7 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev) 
		dev->wed_rro.emi_rings_cpu.ptr = ptr;



		ptr = dmam_alloc_coherent(dev->mt76.dma_dev,

					  sizeof(dev->wed_rro.emi_rings_dma.ptr),

					  sizeof(*dev->wed_rro.emi_rings_dma.ptr),

					  &dev->wed_rro.emi_rings_dma.phy_addr,

					  GFP_KERNEL);

		if (!ptr)
@@ -1037,6 +1038,18 @@ static void mt7996_wed_rro_free(struct mt7996_dev *dev) 
				   dev->wed_rro.msdu_pg[i].phy_addr);

	}



	if (dev->wed_rro.emi_rings_cpu.ptr)

		dmam_free_coherent(dev->mt76.dma_dev,

				   sizeof(*dev->wed_rro.emi_rings_cpu.ptr),

				   dev->wed_rro.emi_rings_cpu.ptr,

				   dev->wed_rro.emi_rings_cpu.phy_addr);



	if (dev->wed_rro.emi_rings_dma.ptr)

		dmam_free_coherent(dev->mt76.dma_dev,

				   sizeof(*dev->wed_rro.emi_rings_dma.ptr),

				   dev->wed_rro.emi_rings_dma.ptr,

				   dev->wed_rro.emi_rings_dma.phy_addr);



	if (!dev->wed_rro.session.ptr)

		return;