From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87D1B1DDA0E for ; Mon, 1 Sep 2025 20:58:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756760318; cv=none; b=J8c1znjCL1tQD1q1MeMbW+L0Mpstt1EbldYSZpujxilb2WQ/oPtTznwaDO6lGFjoLWjuL7K9TqCIvaSrDdekh1yRFOX5392MfD+MLbrtu/UEg3UWs7V2+I1B+fhxBZRHHScB0xZ/U2tSr7NLGqmLuh7u0WlvR90qQP4vJ6eMGRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756760318; c=relaxed/simple; bh=aliTuoRjIt872Bj/CJN6+NhOiVR54ORYedrqFcadIO0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kFM41eBfsKeJiBdAeB/3N6bu3yfm2y6HfKSXn7/clHo4QxTEAdQAf0OKjMfJ9TD/2eSu32DNgeGYAAbzwUQMM3wnirztBorlTSr108xsn1E2f5cUM3U0dlSfaheH6mBQ4jdu5h9YEN4KP2j8JVqx6FshU0bkQAIjLXf9U12D5EY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WSP53XmQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WSP53XmQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B493C4CEF0; Mon, 1 Sep 2025 20:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756760318; bh=aliTuoRjIt872Bj/CJN6+NhOiVR54ORYedrqFcadIO0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WSP53XmQYk4PVnXbAiMxIDDlTjk6iNCA0dptWEpGF6dwLwwTH3vOtm9V3xb9LMgVI fOvvhSmiHGQbelXwZaD7q0QTiyC4+7xfjnABWAcstiu+f7pkmGKTcd7XEr5HzgsCzq FEjaoXBYxt8+2tE9OdB/a6a/+0gRwACCWrNTUtndcR9sRnxHIo6K9RkgL+/4vMU22U x6Uz3HmzmJIttldNnu8SLwHLZr7wUusavCKNK9uC4WTIMWK8d8YrsDg9AjAX02vCE+ b+lq2r8qyfWCyBY16/B2sfAmCkWF0iUR1NMRslQjkFKBRaI9U/II7okdGtU+TDjmHt kL7g3zQk+72sg== From: Lorenzo Bianconi Date: Mon, 01 Sep 2025 22:58:02 +0200 Subject: [PATCH mt76 v2 06/14] wifi: mt76: mt7996: Introduce the capability to reset MT7992 WED device Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250901-mt7996-rro-rework-v2-6-1f95086b51d1@kernel.org> References: <20250901-mt7996-rro-rework-v2-0-1f95086b51d1@kernel.org> In-Reply-To: <20250901-mt7996-rro-rework-v2-0-1f95086b51d1@kernel.org> To: Felix Fietkau , Ryder Lee , Shayne Chen , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Sujuan Chen , Lorenzo Bianconi Cc: linux-wireless@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Rex Lu , Benjamin Lin X-Mailer: b4 0.14.2 From: Rex Lu This is a preliminary patch to enable WED support for MT7992 Kite chipset supported by MT7996 driver. Co-developed-by: Sujuan Chen Signed-off-by: Sujuan Chen Co-developed-by: Benjamin Lin Signed-off-by: Benjamin Lin Signed-off-by: Rex Lu Co-developed-by: Lorenzo Bianconi Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 6 ++--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 30 ++++++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 + 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/init.c b/drivers/net/wireless/mediatek/mt76/mt7996/init.c index 9f61667584f4d95f7f6c9dcb0d70ef56a4e298fd..b66ba38df570503839e1a9ba1819b4e29303532f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/init.c @@ -756,9 +756,9 @@ void mt7996_wfsys_reset(struct mt7996_dev *dev) msleep(20); } -#ifdef CONFIG_NET_MEDIATEK_SOC_WED -static void mt7996_rro_hw_init(struct mt7996_dev *dev) +void mt7996_rro_hw_init(struct mt7996_dev *dev) { +#ifdef CONFIG_NET_MEDIATEK_SOC_WED struct mtk_wed_device *wed = &dev->mt76.mmio.wed; u32 reg = MT_RRO_ADDR_ELEM_SEG_ADDR0; int i; @@ -838,8 +838,8 @@ static void mt7996_rro_hw_init(struct mt7996_dev *dev) /* interrupt enable */ mt76_wr(dev, MT_RRO_HOST_INT_ENA, MT_RRO_HOST_INT_ENA_HOST_RRO_DONE_ENA); -} #endif +} static int mt7996_wed_rro_init(struct mt7996_dev *dev) { diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index fecf68271234e7949014d5be6b9e2f87c6dbb281..11e71bc175b80784afd080638dc8657ffa092e3e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -1853,6 +1853,32 @@ mt7996_mac_restart(struct mt7996_dev *dev) if (ret) goto out; + if (mtk_wed_device_active(&dev->mt76.mmio.wed) && dev->has_rro) { + u32 wed_irq_mask = dev->mt76.mmio.irqmask | + MT_INT_RRO_RX_DONE | + MT_INT_TX_DONE_BAND2; + + mt7996_rro_hw_init(dev); + mt76_for_each_q_rx(&dev->mt76, i) { + if (mt76_queue_is_wed_rro_ind(&dev->mt76.q_rx[i]) || + mt76_queue_is_wed_rro_msdu_pg(&dev->mt76.q_rx[i])) + mt76_queue_rx_reset(dev, i); + } + + mt76_wr(dev, MT_INT_MASK_CSR, wed_irq_mask); + mtk_wed_device_start_hw_rro(&dev->mt76.mmio.wed, wed_irq_mask, + false); + mt7996_irq_enable(dev, wed_irq_mask); + mt7996_irq_disable(dev, 0); + } + + if (mtk_wed_device_active(&dev->mt76.mmio.wed_hif2)) { + mt76_wr(dev, MT_INT_PCIE1_MASK_CSR, + MT_INT_TX_RX_DONE_EXT); + mtk_wed_device_start(&dev->mt76.mmio.wed_hif2, + MT_INT_TX_RX_DONE_EXT); + } + /* set the necessary init items */ ret = mt7996_mcu_set_eeprom(dev); if (ret) @@ -2065,6 +2091,10 @@ void mt7996_mac_reset_work(struct work_struct *work) mt76_wr(dev, MT_INT_MASK_CSR, wed_irq_mask); + if (is_mt7992(&dev->mt76) && dev->has_rro) + mt76_wr(dev, MT_RRO_3_0_EMU_CONF, + MT_RRO_3_0_EMU_CONF_EN_MASK); + mtk_wed_device_start_hw_rro(&dev->mt76.mmio.wed, wed_irq_mask, true); mt7996_irq_enable(dev, wed_irq_mask); diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h index 094ea070369a8ac33a3aa692d5aaf9535c89d3d8..9af3382003bcfecd2eed5d1384d57bdf65af7f82 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h @@ -569,6 +569,7 @@ extern struct pci_driver mt7996_hif_driver; struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, void __iomem *mem_base, u32 device_id); +void mt7996_rro_hw_init(struct mt7996_dev *dev); void mt7996_wfsys_reset(struct mt7996_dev *dev); irqreturn_t mt7996_irq_handler(int irq, void *dev_instance); u64 __mt7996_get_tsf(struct ieee80211_hw *hw, struct mt7996_vif_link *link); -- 2.50.1