Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp2523528pxf; Sun, 4 Apr 2021 04:48:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRlEc/f+wiu3YKYBMRLCIwy9YOBqAIUY0POCZS3Jqz5ZLNTtU9hmlS5wEelzgSStRicznd X-Received: by 2002:aa7:dd97:: with SMTP id g23mr25632589edv.154.1617536936057; Sun, 04 Apr 2021 04:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617536936; cv=none; d=google.com; s=arc-20160816; b=UWKcRYXlfOsfUTUzGuI1a+YSQrQBMVDV4GBzg4r6YV8D4z+7blrKWLjrwvjagxIkIO Yr1WFYXVakJQLbSRQoSfHpVeiPdECbGk0bTnWJsmmPXqeBG2vSU4mRbn/Tmf8Qje5hOs WCPib+hDOFCjnbTxKZJiGJYUsy5d0kYQivaHIF2daPG6mbeBTp1qsVsw5T5W1pHb+Cvb t5+m/dJKJ++dKFfVPzk+1y5dYoGlSVBEOHHWpIt0txGuhTklJxotDhlRH7oeGVG2n9P8 FRixdjx89EdXS1hKgdBZesNAWWrZG1RcxdENKTOKzJVEDOH9Tcm5dTkXNGRGLLIxuamq eRKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vJEw0rFhVVUO7NgMmxChP8Oi5m7UwDQDCV5+UOsfEcw=; b=Zopp/JZ6WQNaD5EyE5m4RfEQZbVtOlrFK0OLvz5E2wpbHlhReDCk+Yixt4TP6s/Kh1 Dy2DocbrI5x60oyHytRbh0UwwvLwntexEzyx2TmNndZ67ntlBIJCWeBKsOHntknxScjy P7pwSXr1KFLFHLrl+sitODmLOAMYKhBnVrdzVlMPo1uSbliVMa3MQho6Zu+22WnH3xu/ CXlF/zc7U2i06pLQzVgbFSKQVoUb/cnpfWQI4D9Kuz+Z4y2ZmvA5R2m3nL7rZoTRo0U/ dFG6Rpzg5tZQYd6/i8AFliUDUZm46qxKS2tDM0o2ixdog3C4Cub0KubH87VY3MyaC/1P zekQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r37sYybT; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i10si12468013ejd.137.2021.04.04.04.48.13; Sun, 04 Apr 2021 04:48:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r37sYybT; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230446AbhDDLhL (ORCPT + 99 others); Sun, 4 Apr 2021 07:37:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:60612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbhDDLhK (ORCPT ); Sun, 4 Apr 2021 07:37:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4624D61386; Sun, 4 Apr 2021 11:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617536226; bh=oVK8wSHdW1TalBk7gcvkKj0NQmVPxBgJ0v+ho/i0ie0=; h=From:To:Cc:Subject:Date:From; b=r37sYybTq1KUX1TXZDobG3k9jtYSC09ENYCj7TkE3K9BXu3FeRsZvQRFO80TQh/SF Tv8HDwk89L4RiMIJONuvQBB8tBdumasJuiF1UZWxC3zVfBcVAGOL0YtzFekbtgNfGj w3jVwsUjhbzD6rqt+vumBFMrZG/TeQFXjojfNEBdoM3sVmvYE2Tpo/keyUsgkglruf brMwOLLX7/C1OF4gAB3FlyO93LlDiCQKegwmH1SrOdPoyc578K8hJR/ROuRpfxtf8U MlXWqteo+Y2//OhFV90M1e/OcOeyZN8D2kHji56X8SIpuk38TK2tmqGeW+zpYLzjbb ZcaOIR9LH5FKg== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, sean.wang@mediatek.com Subject: [PATCH] mt76: mt7921: introduce MT_WFDMA_DUMMY_CR definition Date: Sun, 4 Apr 2021 13:36:57 +0200 Message-Id: <5ddfd1ea6169b5c96f23bee50196c013269aface.1617536164.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Introduce MT_WFDMA_DUMMY_CR definition and remove magic numbers Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c index 60de29a921a8..992faf82ad09 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c @@ -323,7 +323,7 @@ int mt7921_dma_init(struct mt7921_dev *dev) mt76_set(dev, MT_WFDMA0_GLO_CFG, MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN); - mt76_set(dev, 0x54000120, BIT(1)); + mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); /* enable interrupts for TX/RX rings */ mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index c4a9ac7da5f4..858273470a7c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1272,7 +1272,7 @@ mt7921_dma_reset(struct mt7921_dev *dev) mt76_set(dev, MT_WFDMA0_GLO_CFG, MT_WFDMA0_GLO_CFG_TX_DMA_EN | MT_WFDMA0_GLO_CFG_RX_DMA_EN); - mt76_set(dev, 0x54000120, BIT(1)); + mt76_set(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); /* enable interrupts for TX/RX rings */ mt7921_irq_enable(dev, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h index 13097ef94e02..391cbefe0f82 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h @@ -391,6 +391,12 @@ #define MT_TOP_MISC MT_TOP(0xf0) #define MT_TOP_MISC_FW_STATE GENMASK(2, 0) +#define MT_MCU_WPDMA0_BASE 0x54000000 +#define MT_MCU_WPDMA0(ofs) (MT_MCU_WPDMA0_BASE + (ofs)) + +#define MT_WFDMA_DUMMY_CR MT_MCU_WPDMA0(0x120) +#define MT_WFDMA_NEED_REINIT BIT(1) + #define MT_HW_BOUND 0x70010020 #define MT_HW_CHIPID 0x70010200 #define MT_HW_REV 0x70010204 -- 2.30.2