Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2859370pxv; Mon, 12 Jul 2021 03:47:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxREiTUDeyaM53+0sRKBb2olK0oSkQBg/RdHuMUSU4ApEhd4T+CrkmrwBkBLKDTVtV23ZK1 X-Received: by 2002:a92:da86:: with SMTP id u6mr21999795iln.265.1626086837961; Mon, 12 Jul 2021 03:47:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626086837; cv=none; d=google.com; s=arc-20160816; b=UnDjogBcAebSUcoe0LsrkDTvjRfomHK8TtFl9ISZywaBYzTCnq4HgBNc9Bk+6JvYk0 Q11j/rAOy85MBCi4K1ahX6+rrQoGpwXNIkeMaptFVU3FfUi6Hua4aKTsDmLNez0HPoiz kdEevYPHcTyND3Xq83Hb9CFvHYUrJoDMunI8clNvCOPOZcdBNpaQkd2k1uM6d2qWuyCM 4poAI2lUYg2TMy/oLq8g0xt8wnXndgZkEQuCAWzFTFUaaHCzaodWEyScMCCgoou1r6Ge dgHLIhdjPK+wKhzJ9ishJRIcqeBDHNhJNOyFj/sTCtKhWd03hlKxooKzcIXIXzEZmw7D NsFw== 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=T573jecKUCkyaw9crWx7JCmh2MPYoolx8SJ83CJQshI=; b=B7DuHm2WRiP9EIWMF07u8m+tj+i0qvmfKslR/QfCgE9Qq4zrrxEv7DzB7urruPr/b/ UIvGHCZRs8HAJFTNS3xt9G0Pklnc5OkrgckA10gi+jLv3xC/Jb+gkTWJIVQCfaW7HSky Y/Flr+HYuYO2Q82ASR5WvVl2XA8lb8R1plZlIgEteiYFpmcCFFAnzwsXxlzpvvSa0uPm 3n5karB6OGtsICgXu62joLwTeRrntOhcZ0NOwCHzGBacQBn2IREfNBtEMBzHSC5p0hpJ V7ngbtgMz007Jxh1IW2w1jb7SKObSXW/4g5+Lf2q/D2DHGYjJOG6xsJuEsyqcQVz9ykA lkxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WbIApeQv; 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 u12si19008347ilm.99.2021.07.12.03.47.05; Mon, 12 Jul 2021 03:47:17 -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=WbIApeQv; 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 S1350566AbhGLHvJ (ORCPT + 99 others); Mon, 12 Jul 2021 03:51:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:49492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243191AbhGLHQg (ORCPT ); Mon, 12 Jul 2021 03:16:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2AF7561418; Mon, 12 Jul 2021 07:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626074016; bh=UgK1Ze01MAjJJsyGw+twSkC2N7wpPNaiRBI7VjrOqy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WbIApeQvv1odLwxnTRQTlNWFQbhRjVxn3ZNcMjSDRI27+gJKWFADq9658qnpldrmE QxiIPodkEfwCtbOeNY8IfBG7YJi+0cbTGBgVrzsw3ph+5w2vkmtumVqfBB9NLyvPm4 voN6sxFnVrNkMU3BfRH13elGlo3SAq97nESpk1ls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Bianconi , Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 5.12 434/700] mt76: mt7921: Dont alter Rx path classifier Date: Mon, 12 Jul 2021 08:08:37 +0200 Message-Id: <20210712061022.626931482@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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 2c80c02a682aefc073df2cfbb48c77c74579cb4a ] Keep Rx path classifier the mt7921 firmware prefers to allow frames pass through MCU. Fixes: 5c14a5f944b9 ("mt76: mt7921: introduce mt7921e support") Reviewed-by: Lorenzo Bianconi Signed-off-by: Sean Wang Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../net/wireless/mediatek/mt76/mt7921/init.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c index a0797cec136e..f9bd907b90fa 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c @@ -110,30 +110,12 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) static void mt7921_mac_init_band(struct mt7921_dev *dev, u8 band) { - u32 mask, set; - mt76_rmw_field(dev, MT_TMAC_CTCR0(band), MT_TMAC_CTCR0_INS_DDLMT_REFTIME, 0x3f); mt76_set(dev, MT_TMAC_CTCR0(band), MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN | MT_TMAC_CTCR0_INS_DDLMT_EN); - mask = MT_MDP_RCFR0_MCU_RX_MGMT | - MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR | - MT_MDP_RCFR0_MCU_RX_CTL_BAR; - set = FIELD_PREP(MT_MDP_RCFR0_MCU_RX_MGMT, MT_MDP_TO_HIF) | - FIELD_PREP(MT_MDP_RCFR0_MCU_RX_CTL_NON_BAR, MT_MDP_TO_HIF) | - FIELD_PREP(MT_MDP_RCFR0_MCU_RX_CTL_BAR, MT_MDP_TO_HIF); - mt76_rmw(dev, MT_MDP_BNRCFR0(band), mask, set); - - mask = MT_MDP_RCFR1_MCU_RX_BYPASS | - MT_MDP_RCFR1_RX_DROPPED_UCAST | - MT_MDP_RCFR1_RX_DROPPED_MCAST; - set = FIELD_PREP(MT_MDP_RCFR1_MCU_RX_BYPASS, MT_MDP_TO_HIF) | - FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_UCAST, MT_MDP_TO_HIF) | - FIELD_PREP(MT_MDP_RCFR1_RX_DROPPED_MCAST, MT_MDP_TO_HIF); - mt76_rmw(dev, MT_MDP_BNRCFR1(band), mask, set); - mt76_set(dev, MT_WF_RMAC_MIB_TIME0(band), MT_WF_RMAC_MIB_RXTIME_EN); mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(band), MT_WF_RMAC_MIB_RXTIME_EN); -- 2.30.2