Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4751684pxj; Wed, 12 May 2021 12:24:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmlYjsWQFUTKXLzpl7qIm2m0WBvkQPdH35eoOelMg0MLxzrwmH1o0TNM0B9mQ0Alc3C/2N X-Received: by 2002:a17:907:b09:: with SMTP id h9mr8532890ejl.430.1620847454476; Wed, 12 May 2021 12:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847454; cv=none; d=google.com; s=arc-20160816; b=MePim3xCNmJ42fl7oOCBvEjXSOFoREQcX0ub0QFO51AQeHv5MnjlvKrK3EP+osOHmq KB+tIOynd9NY3G7MUaaGuy3W5lPdE2m34myCsaY28nARsPnNO2gWCBKH9cvQkbshqC7P mVGF6v+IQjP0cvCisoLa6uIrMxQNhwCD0O3eIwyz8KdppuYryvI8vll2+S8q7hB0FMib eS/afOpZoKI91S3DJensgbMLzIwi+XgPRVRElEp1iW6qUOovg6/iX/NjTMH2AdpEpI+v DrF0H+Y7yG4HPR2HZZgiUrlgM9DtjH8+p8rXgiNhMqxlmmFgu7GzCmeXUCyNK90UThOh Zx1A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0UkqybDNTxU5DFcjRak8tkDNYMGftt0tE6jjliYexyM=; b=ErxCtd1OvWhLzKHT1cHzfWvgmNS5g5gWdR6ClOuPyF+Mc1wpza6h4t1r7QXrCv5VXS NhWKzeUFixIOnSYrjPubbAKpXVGlwu2inuNQYQg83I/qhZIcjcY09fKs4YdcDKLlSZ5K bDyIzB3mp1J0Lq+R9WvXfDkjMefNaCYyw4Nh85AUQAEf+xjxWzOJvRi59YKxV//LVBqM ea3HGU+nOlgT7C4ZTon/M7Mu127hix7KAgavXPDJKnoi/Ma66GMwX3tVNJzuNXUQQ4t0 sPFETSsxM1dAn/XDTPNZ11fCp7GxIqo7FpVd85KvNrERWfu+e7Yj5p3wfOYH/OX1vWyk n+FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N6M3o73c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s3si234008edq.457.2021.05.12.12.23.50; Wed, 12 May 2021 12:24:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b=N6M3o73c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377887AbhELTJc (ORCPT + 99 others); Wed, 12 May 2021 15:09:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:37578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237786AbhELQnN (ORCPT ); Wed, 12 May 2021 12:43:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7B8FF61C6A; Wed, 12 May 2021 16:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835995; bh=3/xdwj08t05KJdosI3aohZK+htRhLJFwjq2coPJx6/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6M3o73cqyo8Xvm20m7FDB611nVoykaybH39cH5ZtxukPF7ZO2JXlFwMqn7WVw8qe qdwJvzIiweXJspX1VS9lnQR1AEDBeXaPEJZxcfgkkKAM1IckqwX9txRhA433F3Qe58 G08Z5h9Jqe7XxK6YDP8nbaXKPlAthtx6t85vflOU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YN Chen , Sean Wang , Lorenzo Bianconi , Felix Fietkau , Sasha Levin Subject: [PATCH 5.12 532/677] mt76: mt7921: fix the base of PCIe interrupt Date: Wed, 12 May 2021 16:49:38 +0200 Message-Id: <20210512144855.053035075@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Wang [ Upstream commit 23c1d2dc9ed5be1d0df7987335f5646e3826a461 ] Should use 0x10000 as the base to operate PCIe interrupt according to the vendor reference driver. Fixes: ffa1bf97425b ("mt76: mt7921: introduce PM support") Co-developed-by: YN Chen Signed-off-by: YN Chen Signed-off-by: Sean Wang Tested-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index c747022f7642..0262bd8b1626 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -137,7 +137,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); ret = devm_request_irq(mdev->dev, pdev->irq, mt7921_irq_handler, IRQF_SHARED, KBUILD_MODNAME, dev); @@ -248,7 +248,7 @@ static int mt7921_pci_resume(struct pci_dev *pdev) return err; /* enable interrupt */ - mt7921_l1_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); mt7921_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | MT_INT_MCU_CMD); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h index 2dd2e628b776..e7bb918446ee 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h @@ -389,7 +389,7 @@ #define MT_HW_CHIPID 0x70010200 #define MT_HW_REV 0x70010204 -#define MT_PCIE_MAC_BASE 0x74030000 +#define MT_PCIE_MAC_BASE 0x10000 #define MT_PCIE_MAC(ofs) (MT_PCIE_MAC_BASE + (ofs)) #define MT_PCIE_MAC_INT_ENABLE MT_PCIE_MAC(0x188) -- 2.30.2