developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 1 | From eebe902614c5e2759492afcd1f84665d241077cb Mon Sep 17 00:00:00 2001 |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 2 | From: Rex Lu <rex.lu@mediatek.com> |
| 3 | Date: Mon, 11 Dec 2023 19:21:16 +0800 |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 4 | Subject: [PATCH 3/4] wifi: mt76: mt7915: support backaward compatiable |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 5 | |
| 6 | --- |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 7 | mt7915/mmio.c | 4 ++-- |
| 8 | wed.c | 2 +- |
| 9 | 2 files changed, 3 insertions(+), 3 deletions(-) |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 10 | |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 11 | diff --git a/mt7915/mmio.c b/mt7915/mmio.c |
developer | dc9eeae | 2024-04-08 14:36:46 +0800 | [diff] [blame] | 12 | index 142f308..11db3ed 100644 |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 13 | --- a/mt7915/mmio.c |
| 14 | +++ b/mt7915/mmio.c |
| 15 | @@ -697,7 +697,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, |
| 16 | MT_RXQ_WED_RING_BASE; |
| 17 | wed->wlan.wpdma_rx_glo = pci_resource_start(pci_dev, 0) + |
| 18 | MT_WPDMA_GLO_CFG; |
| 19 | - wed->wlan.wpdma_rx = pci_resource_start(pci_dev, 0) + |
| 20 | + wed->wlan.wpdma_rx[0] = pci_resource_start(pci_dev, 0) + |
| 21 | MT_RXQ_WED_DATA_RING_BASE; |
| 22 | } else { |
| 23 | struct platform_device *plat_dev = pdev_ptr; |
| 24 | @@ -717,7 +717,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr, |
| 25 | wed->wlan.wpdma_tx = res->start + MT_TXQ_WED_RING_BASE; |
| 26 | wed->wlan.wpdma_txfree = res->start + MT_RXQ_WED_RING_BASE; |
| 27 | wed->wlan.wpdma_rx_glo = res->start + MT_WPDMA_GLO_CFG; |
| 28 | - wed->wlan.wpdma_rx = res->start + MT_RXQ_WED_DATA_RING_BASE; |
| 29 | + wed->wlan.wpdma_rx[0] = res->start + MT_RXQ_WED_DATA_RING_BASE; |
| 30 | } |
| 31 | |
| 32 | wed->wlan.nbuf = is_mt7915(&dev->mt76) ? |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 33 | diff --git a/wed.c b/wed.c |
developer | dc9eeae | 2024-04-08 14:36:46 +0800 | [diff] [blame] | 34 | index 5ed681e..652f59e 100644 |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 35 | --- a/wed.c |
| 36 | +++ b/wed.c |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 37 | @@ -175,7 +175,7 @@ int mt76_wed_dma_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset) |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 38 | break; |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 39 | case MT76_WED_RRO_Q_MSDU_PG: |
| 40 | q->flags &= ~MT_QFLAG_WED; |
developer | 753619c | 2024-02-22 13:42:45 +0800 | [diff] [blame] | 41 | - __mt76_dma_queue_reset(dev, q); |
developer | a46f613 | 2024-03-26 14:09:54 +0800 | [diff] [blame] | 42 | + __mt76_dma_queue_reset(dev, q, false); |
| 43 | mtk_wed_device_msdu_pg_rx_ring_setup(q->wed, ring, q->regs); |
| 44 | q->head = q->ndesc - 1; |
| 45 | q->queued = q->head; |
developer | 1a17367 | 2023-12-21 14:49:33 +0800 | [diff] [blame] | 46 | -- |
| 47 | 2.18.0 |
| 48 | |