Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3588765pxb; Mon, 24 Jan 2022 12:57:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ0SZu3F7QzZQTpZiYpTnnIl+uCbqp/IFb0iWUsdHZjIEB2XXwo+2zrv6hvrDqZsJg3wC5 X-Received: by 2002:a17:902:a60f:b0:14b:63db:9bc1 with SMTP id u15-20020a170902a60f00b0014b63db9bc1mr2977584plq.60.1643057843833; Mon, 24 Jan 2022 12:57:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057843; cv=none; d=google.com; s=arc-20160816; b=F979ByC5/riAo3ML/MIRieCufI8LvXG9OwFqngQ39WTxlEW8zo4VgsdJfta9uZSQgG 1cS7SvdtBENWZ0UH8t3bAGbYGFxE9mMm0CIJ8fUv493raLAZyEn0qz9GrRgvtUFUuQS2 ZaxqgHbJvsx/Ok2mXaGLAIcLndzvN8eSei8gS9ePhRQ32hM3nrcolgh8QHxkSJFALYnB AZ0yhME/dQGVzyY/JIjlDinir6/+r75t0w2lCNYU1crCWArX4Uft0SC/n2pdgVkNv9V9 0kcsIKc+NadnhnYuQuaX2E4DamT8bmdo4EkhjnF5wKZpMNaOMYGZhX6TP0Nmuup2n24K vZHg== 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=vrtORelA4CucExMiPFvES+wjpTQiIdp3fIHEWTTgay4=; b=G79+OEPBd/3qsAvW/XSU/KYhfdaGaA6y2CTqdH1xb9YflKSnsE8IS3OJ867fnOngt/ FUrqJym0axpsF+egAlPpiTazhoZSRER1x7Gse3hB8Lg8mL+ylmrd6t0giVk64ibQG2Mq wjfj89YiiRsaC+rRmKNBWyXA+eS91Zt46F4NaauAP4uV2R4xEl65uQrOG4v4pArnf6fP kj0kMJKpUziSzBAgLmnvxkxmf0P7jOhKJIzHtAMqMtEmw37r6qGt2deufH1XJSaAZmHf qv+0vCgxZ3OmO9YWzQ04dbsH+5mExzJkCweBJNN4DbiBfk2xamZiotk/Y5FLb5fkZ0rP Hmew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ay3E388E; 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 c3si13549072pls.81.2022.01.24.12.57.10; Mon, 24 Jan 2022 12:57:23 -0800 (PST) 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=Ay3E388E; 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 S1380843AbiAXUQ7 (ORCPT + 99 others); Mon, 24 Jan 2022 15:16:59 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:54130 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359511AbiAXT7q (ORCPT ); Mon, 24 Jan 2022 14:59:46 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E2CFF60FEA; Mon, 24 Jan 2022 19:59:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1D60C340E5; Mon, 24 Jan 2022 19:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054385; bh=ND1OzIQ4qqHezNqKTpq1HofiiNOFrdx989O0rs0C+SM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ay3E388EtsoQ6C6rTgsCp+i/OwispjUSBbaaAdmOEiTxF0K6AWjpdSwvDra6rfT+d PhlkTkMuShR7QmFwy1jSiHAyM6MV8NJ4tmKlDkmrQ1uG9ueCLyY1BpQZiFIbxqX96D oc8kpVhScFxUDzQ4GGkp1a1hPbFOM80jeolSTZfA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Po-Hao Huang , Ping-Ke Shih , Kalle Valo , Sasha Levin Subject: [PATCH 5.10 373/563] rtw88: 8822c: update rx settings to prevent potential hw deadlock Date: Mon, 24 Jan 2022 19:42:18 +0100 Message-Id: <20220124184037.313369633@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@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: Po-Hao Huang [ Upstream commit c1afb26727d9e507d3e17a9890e7aaf7fc85cd55 ] These settings enables mac to detect and recover when rx fifo circuit deadlock occurs. Previous version missed this, so we fix it. Signed-off-by: Po-Hao Huang Signed-off-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20211217012708.8623-1-pkshih@realtek.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/main.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8821c.h | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 565efd8806247..2ef1416899f03 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1652,7 +1652,7 @@ int rtw_core_init(struct rtw_dev *rtwdev) /* default rx filter setting */ rtwdev->hal.rcr = BIT_APP_FCS | BIT_APP_MIC | BIT_APP_ICV | - BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS | + BIT_PKTCTL_DLEN | BIT_HTC_LOC_CTRL | BIT_APP_PHYSTS | BIT_AB | BIT_AM | BIT_APM; ret = rtw_load_firmware(rtwdev, RTW_NORMAL_FW); diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h index bd01e82b6bcd0..8d1e8ff71d7ef 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h @@ -131,7 +131,7 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data) #define WLAN_TX_FUNC_CFG2 0x30 #define WLAN_MAC_OPT_NORM_FUNC1 0x98 #define WLAN_MAC_OPT_LB_FUNC1 0x80 -#define WLAN_MAC_OPT_FUNC2 0x30810041 +#define WLAN_MAC_OPT_FUNC2 0xb0810041 #define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \ (WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \ diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c index 22d0dd640ac94..dbfd67c3f598c 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c @@ -204,7 +204,7 @@ static void rtw8822b_phy_set_param(struct rtw_dev *rtwdev) #define WLAN_TX_FUNC_CFG2 0x30 #define WLAN_MAC_OPT_NORM_FUNC1 0x98 #define WLAN_MAC_OPT_LB_FUNC1 0x80 -#define WLAN_MAC_OPT_FUNC2 0x30810041 +#define WLAN_MAC_OPT_FUNC2 0xb0810041 #define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \ (WLAN_SIFS_OFDM_CONT_TX << BIT_SHIFT_SIFS_OFDM_CTX) | \ diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index 79ad6232dce83..cee586335552d 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -1248,7 +1248,7 @@ static void rtw8822c_phy_set_param(struct rtw_dev *rtwdev) #define WLAN_TX_FUNC_CFG2 0x30 #define WLAN_MAC_OPT_NORM_FUNC1 0x98 #define WLAN_MAC_OPT_LB_FUNC1 0x80 -#define WLAN_MAC_OPT_FUNC2 0x30810041 +#define WLAN_MAC_OPT_FUNC2 0xb0810041 #define WLAN_MAC_INT_MIG_CFG 0x33330000 #define WLAN_SIFS_CFG (WLAN_SIFS_CCK_CONT_TX | \ -- 2.34.1