Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4744115pxj; Wed, 12 May 2021 12:12:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2VNZKt919Bsc4AlX5uLvNCYYCkZ53vg8oj1fnwdAaTi8HTN3k5EdjylghMtFsJ8U4/jmC X-Received: by 2002:a05:6402:3553:: with SMTP id f19mr44351453edd.167.1620846768160; Wed, 12 May 2021 12:12:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620846768; cv=none; d=google.com; s=arc-20160816; b=vVdI+8oqifcVZokUOximR8cYUwVn19BTtHW2lhAoWal4lsHzYDdmwQtvlbS6IjEJp2 76WWPBcR1CFq9TJaWWVDlwcJsoVAooCzZRrxKL9oCkVfTIMHpxbt+Jy4iAJ++D7SIPjc TtXBKX3+xEkvCrF0ceu2H2sp+5Pe1d+bruqtT3UbeuDlrutCgtABlWxE7L04gXVclDwK rKk2lBs+QSsZrMDk1gvKJKtoljAlOvgelBQDpyUOv5eI54E7WV03FnwPwbdLLhl6tZZ7 WCiUHTbW1h5f8ZhRZqepxVEDlZKEEVOc5hlmyPvYsRRFo7DrUWe9geXjX5NzDDBxOObj HK3A== 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=8Vw4NaECMVGq4gkVSzMrt7jLNcGxdL/jv2wWVuRcVNU=; b=g7VXniDDUeglUf3OmP2Ydjm8LUNf+7wpB6QphYhR0XlwL4PYiDJEftdrg/sNrXKVQ7 RQgiWbf1uJQzbQVj+HbbcoWpU5TAwWeuvyhI7yGCJW+usiBOJQX7fjZMAKBfGHjZh3qg g2xtRaoWvBgpxs8pb3T0xCtt88n3Dc1qHuzy8V1h/w3URP9zKv9xjGt9khsVJnBumDEt vPQNzG0ZkV5IbLx/6w3jUSVJAgEAAz4jVtCe6OTzeeVyvDGYzKGa4K+RfiQ08idfhCzc Tli0r8aZpJWc4m8DK4m1uOHA+4zSbHFqs2j5SL0AeR/iQ0as53MDOx5cXUk7rX/wl+av eK9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=APeC+ZjM; 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 c22si321677edv.55.2021.05.12.12.12.23; Wed, 12 May 2021 12:12:48 -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=APeC+ZjM; 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 S1377666AbhELTIc (ORCPT + 99 others); Wed, 12 May 2021 15:08:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236856AbhELQnM (ORCPT ); Wed, 12 May 2021 12:43:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E018361E5D; Wed, 12 May 2021 16:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835997; bh=3rP5GZ9KfuY0RU6GdNtSVd62DEl4wDHLOHCR6SLI2Gc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=APeC+ZjM0XpTTPS0BQ/NMFKSIrB9/k45Z6ubmdDjVZoK0yHWQ8oofB69bkodsTALR rDEr4b8X5+HjwKRUo/TBXH5Y8Gju1cT2GGpnLeYmicbXzGrOQ0Kq+nY/f2rAvjRUTU MezuSQA/3gScvNAsF1St2byHMicrJWfHpSgtDKEo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YN Chen , Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 5.12 533/677] mt76: mt7921: fix the base of the dynamic remap Date: Wed, 12 May 2021 16:49:39 +0200 Message-Id: <20210512144855.083597384@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 53a8fb4afdc877f8f2d5e1e15cc5ad66155987a6 ] We should change the base for the dynamic remap into another one, because the current base (0xe0000) have been the one used to operate the device ownership. Fixes: 163f4d22c118 ("mt76: mt7921: add MAC support") Co-developed-by: YN Chen Signed-off-by: YN Chen Signed-off-by: Sean Wang Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h index e7bb918446ee..73878d3e2495 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h @@ -362,11 +362,11 @@ #define MT_INFRA_CFG_BASE 0xfe000 #define MT_INFRA(ofs) (MT_INFRA_CFG_BASE + (ofs)) -#define MT_HIF_REMAP_L1 MT_INFRA(0x260) +#define MT_HIF_REMAP_L1 MT_INFRA(0x24c) #define MT_HIF_REMAP_L1_MASK GENMASK(15, 0) #define MT_HIF_REMAP_L1_OFFSET GENMASK(15, 0) #define MT_HIF_REMAP_L1_BASE GENMASK(31, 16) -#define MT_HIF_REMAP_BASE_L1 0xe0000 +#define MT_HIF_REMAP_BASE_L1 0x40000 #define MT_SWDEF_BASE 0x41f200 #define MT_SWDEF(ofs) (MT_SWDEF_BASE + (ofs)) -- 2.30.2