From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.43 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794743785; b=KTlahuc7Xf/VjhG7lsrQplYZ9r/0YoeJa9U0m9nFuDXPEuI63tRrJfaH9rEVgIOQcNow jXn4kNJuDl4NIoZMQufuBBonA17I3wlSkc9qFMVVKXC1ni/Ymx4cnlHJks4HkRPKfoz0z 6bTFLuH8BAT4y6OzpyfgslmRdGdrc1fhH0mcTsuzzm7ahSeUquF8HwH+B8A0n7eRIu4vu 4waoMKqR0AXCv20mbtcyxoi5d5cVL2UsqoiBQdRgUjc6BH41sPuIaNK+Mih2VcCGTeSom HSSy8o6kUnXuTtZNe90qdW3g/pBuVD5MJ8AbTjxhXaAHf2bb60IpRbgNZ+W8j/N9CCQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794743785; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=Bi9izper4hhzVGDMuEBOOUEjObfUjf3Mhvpg/zT4k3A=; b=5cofskQA5/V9FZYi2xC7E9y3Vl0QkFkk78z16nd4AVNVxkHAKXjSlUTx2gNkCvFNMztq dS5obzabg1Q97CRDVUIFcWo2v7j5IMeyjFrJVRXDSpQwATAQy24m4K2uf9YwXB0QXniiu eUIdZywKmL78+AB8F08HR/Y/LZp4DX2xPFsliHLSAfh8mDyHZ5z5mTuwYIxY5mGelo8iE fCYLbH96zuMJ1dlNzcQsE06MozpDRpfS0XC3hE83ISBT5ZcjqZg8IcDAxq1z9/VTdsKjx uGFlcvXECDTPOd2lyiJ+iRF3kD3zRWBWjRRrFFv9i8bhzVqRi3jo0nO5YCFaOYRpMww== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=MgMXFNPv; arc=none smtp.remote-ip=209.85.216.43 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C18AE606A88B for ; Sun, 15 Nov 2026 11:56:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C18AE606A88B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=MgMXFNPv Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-3ace1f3897cso1257196a91.0 for ; Sun, 15 Nov 2026 03:56:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794743784; x=1795348584; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Bi9izper4hhzVGDMuEBOOUEjObfUjf3Mhvpg/zT4k3A=; b=MgMXFNPvec2LvAmy755QczgUvumom5UQxVeGxpCTcgJMLwX2zsGzrknCQZgBOA7fOA Xt80K78EtDlXqn9sssv1TJGB/pAHBiD3vBPnwCA6jVI2JEVCKWZovGFHBwwuwC9Vb7cG A3jS+nFUZuPAt4GN6aZ1PUqvmf6Xscze7ulOHpP/ooqTsGLf0D5PZY9OIiWB87gJphEd DdUikCLHd7i68v6QEKJU7AaIssTcAnzxR9c/WEwHipd+lyLyEuZlKwHTgFKLlonXfzPe ZbRfVCw6mcmmNcjEJtekcjQvQqa1NzoWWJ7j/VPK7CeDTKodFeEUSX7/T6JwJDoOVsHB x0Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794743784; x=1795348584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Bi9izper4hhzVGDMuEBOOUEjObfUjf3Mhvpg/zT4k3A=; b=FmdMc7AgHTBX29sgPjyNrsZ4iCGSHytjybe+LWGZQytfOIUSXDg/e+7O4Tj/K6lJ9S JvvTH3lxyPA8vzuncEE9iTsbA98ZCV+2xF8lRlOXGNQNFLUJQK5vlCRB4786W5ZehmXp bBYs2/6LO5ENasp1/sk8I7sSxwusC8iGNMWkNcnRG7vwT4KyG89Iecyx8cS6LOf6W5ri FpYYvo5yme4Zo4rv20paiGvIER+7vJfvhlwqPmPBrFAphWwtyZv10ZGXM0zBEtPcvl4n W9n335vTvwOl0SMGw5VrnhE67WhY2hFOklHrlwWKWyWeTsR26ZaFna1tAzVOZbTgG6F2 otsg== X-Forwarded-Encrypted: i=1; AL+hErFq3pNiL2X9gyspTWLEz0k1HpDh8vGUNAqA/FUX+yD0b4q13neFKb3jTCShNu7v1dLu84uloGYXcH06X/k=@vger.kernel.org X-Gm-Message-State: APuU4Z8/B/62ZaI3BTOs/OwhWzNsRcDezU0BwyNtexZH6ds3qXPRV8eg J7i0EpFqB/cOhnAR/D+mIN52yhYCh7XxdbIlers5GSiPnj8i6EUvdgao X-Gm-Gg: AYBFou0hnKYfYUCKb6H+8iOdqTLzo1f0qSmCJRxUhVHipnuZhAXcK5oChqrHuFGA/Mn s72bPkm3ihPf33jjInXr+ZieiT8F2YT2CKmtsRclReeXk/YZDjYd5W5DVdW2qbgpnAGDvQuoCJ2 DxSETc/qJ+47EluEMbMRNe5pmAD33wmxuikqP+sR6hnszNkmhWXP9L5umU4vXF4kKS3lglkx0lJ g9Sa1/xbqcC7l2xfXLoID7A+03yyWcHtLa6Lb421BFbGX+HdZWAGf9m72WiGpFqMTTN6qqO6p73 4pmM2M4M2Pqc56cW9UWvHTB+zEmutD5sXjS7QlQf2MwNyUx5snUuf/ECuUXlTsl3rVZ01HSXJSN BE0mibXGBYTVQklycJ/BQrkGRjUFLCcpsu2g4+/q/RYxjQ5Vkp/9NUyDQuGCm4nEeg7+J+BuoBj ZGYJENRw7WiccWP5HqgWvVOZiawokH8JZ2e2nRKTtWzBkXyvsoD+6291GG5tOy1glJnKahEjcB2 ZxeJ2QZRAkDRDRBXPsKsAoR+X525eF98KIF1HnlI8diZtDBDaxB2OsTYhkLKHzzAiyHMLz0xdjp dxrwQicNn9TAy2RtL2hmO+a2yPQ4w6EyxGO4YERcrQyE6iXmjfy/fVsCZ6N+vcDrWjdmDT0hYOn B0sEd19o+ZqaXclKSNogBCWhBTpw1vOyDwy4uWTDVbI7y X-Received: by 2002:a17:90b:5910:b0:3b0:aaed:48d0 with SMTP id 98e67ed59e1d1-3b1b0b4d0d0mr6724017a91.37.1794743784133; Sun, 15 Nov 2026 03:56:24 -0800 (PST) Received: from acemagic-m1.tail4fb79.ts.net ([2401:7400:c804:b668:5ade:5fb:5602:326b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b1b3ac294bsm5853901a91.2.2026.11.15.03.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 03:56:23 -0800 (PST) From: Ho Jie Feng To: Ping-Ke Shih Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Bitterblue Smith , Luka Gejak , Ho Jie Feng Subject: [PATCH rtw-next v4 5/7] wifi: rtw88: prepare frequency-offset correction for more chips Date: Sun, 15 Nov 2026 19:43:31 +0800 Message-ID: <20261115114336.1739863-6-hjf3108@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261115114336.1739863-1-hjf3108@gmail.com> References: <20261115114336.1739863-1-hjf3108@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Promote chip specific functions into the common core for cfo tracking. These become helpers which can be used by the other drivers. Signed-off-by: Ho Jie Feng --- drivers/net/wireless/realtek/rtw88/phy.c | 106 ++++++++++++++++++ drivers/net/wireless/realtek/rtw88/phy.h | 2 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 100 +---------------- drivers/net/wireless/realtek/rtw88/rtw8822c.h | 3 - 4 files changed, 113 insertions(+), 98 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c index e2515a662b..d0c1fb65be 100644 --- a/drivers/net/wireless/realtek/rtw88/phy.c +++ b/drivers/net/wireless/realtek/rtw88/phy.c @@ -720,6 +720,112 @@ void rtw_phy_parsing_cfo(struct rtw_dev *rtwdev, } EXPORT_SYMBOL(rtw_phy_parsing_cfo); +#define CFO_TRK_ENABLE_TH 20 +#define CFO_TRK_STOP_TH 10 +#define CFO_TRK_ADJ_TH 10 + +static u8 rtw_phy_cfo_tracking_reset(struct rtw_dev *rtwdev) +{ + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_cfo_track *cfo = &dm_info->cfo_track; + + cfo->is_adjust = true; + + if (cfo->crystal_cap > rtwdev->efuse.crystal_cap) + return cfo->crystal_cap - 1; + else if (cfo->crystal_cap < rtwdev->efuse.crystal_cap) + return cfo->crystal_cap + 1; + + return cfo->crystal_cap; +} + +void rtw_phy_cfo_xcap_init(struct rtw_dev *rtwdev) +{ + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_cfo_track *cfo = &dm_info->cfo_track; + + cfo->crystal_cap = rtwdev->efuse.crystal_cap; + cfo->is_adjust = true; +} +EXPORT_SYMBOL(rtw_phy_cfo_xcap_init); + +#define REPORT_TO_KHZ(val) ({typeof(val) _v = (val); (_v << 1) + (_v >> 1); }) +static s32 rtw_phy_cfo_calc_avg(struct rtw_dev *rtwdev, u8 path_num) +{ + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_cfo_track *cfo = &dm_info->cfo_track; + s32 cfo_avg, cfo_path_sum = 0, cfo_rpt_sum; + u8 i; + + for (i = 0; i < path_num; i++) { + cfo_rpt_sum = REPORT_TO_KHZ(cfo->cfo_tail[i]); + + if (cfo->cfo_cnt[i]) + cfo_avg = cfo_rpt_sum / cfo->cfo_cnt[i]; + else + cfo_avg = 0; + + cfo_path_sum += cfo_avg; + } + + for (i = 0; i < path_num; i++) { + cfo->cfo_tail[i] = 0; + cfo->cfo_cnt[i] = 0; + } + + return cfo_path_sum / path_num; +} + +static void rtw_phy_cfo_need_adjust(struct rtw_dev *rtwdev, s32 cfo_avg) +{ + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_cfo_track *cfo = &dm_info->cfo_track; + + if (!cfo->is_adjust) { + if (abs(cfo_avg) > CFO_TRK_ENABLE_TH) + cfo->is_adjust = true; + } else { + if (abs(cfo_avg) <= CFO_TRK_STOP_TH) + cfo->is_adjust = false; + } +} + +u8 rtw_phy_cfo_xcap_track(struct rtw_dev *rtwdev, u8 xcap_max, bool bt_hold) +{ + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_cfo_track *cfo = &dm_info->cfo_track; + u8 path_num = rtwdev->hal.rf_path_num; + s8 crystal_cap = cfo->crystal_cap; + s32 cfo_avg = 0; + + if (rtwdev->sta_cnt != 1) + return rtw_phy_cfo_tracking_reset(rtwdev); + + if (cfo->packet_count == cfo->packet_count_pre) + return cfo->crystal_cap; + + cfo->packet_count_pre = cfo->packet_count; + cfo_avg = rtw_phy_cfo_calc_avg(rtwdev, path_num); + rtw_phy_cfo_need_adjust(rtwdev, cfo_avg); + + if (bt_hold) { + cfo->is_adjust = false; + return rtwdev->efuse.crystal_cap; + } + + if (cfo->is_adjust) { + if (cfo_avg > CFO_TRK_ADJ_TH) + crystal_cap++; + else if (cfo_avg < -CFO_TRK_ADJ_TH) + crystal_cap--; + + crystal_cap = clamp_t(s8, crystal_cap, 0, xcap_max); + } + + return (u8)crystal_cap; +} +EXPORT_SYMBOL(rtw_phy_cfo_xcap_track); + static void rtw_phy_cfo_track(struct rtw_dev *rtwdev) { const struct rtw_chip_info *chip = rtwdev->chip; diff --git a/drivers/net/wireless/realtek/rtw88/phy.h b/drivers/net/wireless/realtek/rtw88/phy.h index 8a843aac73..b551cb860d 100644 --- a/drivers/net/wireless/realtek/rtw88/phy.h +++ b/drivers/net/wireless/realtek/rtw88/phy.h @@ -68,6 +68,8 @@ void rtw_phy_adaptivity_set_mode(struct rtw_dev *rtwdev); void rtw_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl); void rtw_phy_parsing_cfo(struct rtw_dev *rtwdev, struct rtw_rx_pkt_stat *pkt_stat); +void rtw_phy_cfo_xcap_init(struct rtw_dev *rtwdev); +u8 rtw_phy_cfo_xcap_track(struct rtw_dev *rtwdev, u8 xcap_max, bool bt_hold); void rtw_phy_tx_path_diversity(struct rtw_dev *rtwdev); struct rtw_txpwr_lmt_cfg_pair { diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c index 09315d23e2..d7b0204e6d 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -4243,103 +4243,13 @@ static void rtw8822c_set_crystal_cap(struct rtw_dev *rtwdev, u8 crystal_cap) rtw8822c_set_crystal_cap_reg(rtwdev, crystal_cap); } -static void rtw8822c_cfo_tracking_reset(struct rtw_dev *rtwdev) -{ - struct rtw_dm_info *dm_info = &rtwdev->dm_info; - struct rtw_cfo_track *cfo = &dm_info->cfo_track; - - cfo->is_adjust = true; - - if (cfo->crystal_cap > rtwdev->efuse.crystal_cap) - rtw8822c_set_crystal_cap(rtwdev, cfo->crystal_cap - 1); - else if (cfo->crystal_cap < rtwdev->efuse.crystal_cap) - rtw8822c_set_crystal_cap(rtwdev, cfo->crystal_cap + 1); -} - -static void rtw8822c_cfo_init(struct rtw_dev *rtwdev) -{ - struct rtw_dm_info *dm_info = &rtwdev->dm_info; - struct rtw_cfo_track *cfo = &dm_info->cfo_track; - - cfo->crystal_cap = rtwdev->efuse.crystal_cap; - cfo->is_adjust = true; -} - -#define REPORT_TO_KHZ(val) ({typeof(val) _v = (val); (_v << 1) + (_v >> 1); }) -static s32 rtw8822c_cfo_calc_avg(struct rtw_dev *rtwdev, u8 path_num) -{ - struct rtw_dm_info *dm_info = &rtwdev->dm_info; - struct rtw_cfo_track *cfo = &dm_info->cfo_track; - s32 cfo_avg, cfo_path_sum = 0, cfo_rpt_sum; - u8 i; - - for (i = 0; i < path_num; i++) { - cfo_rpt_sum = REPORT_TO_KHZ(cfo->cfo_tail[i]); - - if (cfo->cfo_cnt[i]) - cfo_avg = cfo_rpt_sum / cfo->cfo_cnt[i]; - else - cfo_avg = 0; - - cfo_path_sum += cfo_avg; - } - - for (i = 0; i < path_num; i++) { - cfo->cfo_tail[i] = 0; - cfo->cfo_cnt[i] = 0; - } - - return cfo_path_sum / path_num; -} - -static void rtw8822c_cfo_need_adjust(struct rtw_dev *rtwdev, s32 cfo_avg) -{ - struct rtw_dm_info *dm_info = &rtwdev->dm_info; - struct rtw_cfo_track *cfo = &dm_info->cfo_track; - - if (!cfo->is_adjust) { - if (abs(cfo_avg) > CFO_TRK_ENABLE_TH) - cfo->is_adjust = true; - } else { - if (abs(cfo_avg) <= CFO_TRK_STOP_TH) - cfo->is_adjust = false; - } - - if (!rtw_coex_disabled(rtwdev)) { - cfo->is_adjust = false; - rtw8822c_set_crystal_cap(rtwdev, rtwdev->efuse.crystal_cap); - } -} - static void rtw8822c_cfo_track(struct rtw_dev *rtwdev) { - struct rtw_dm_info *dm_info = &rtwdev->dm_info; - struct rtw_cfo_track *cfo = &dm_info->cfo_track; - u8 path_num = rtwdev->hal.rf_path_num; - s8 crystal_cap = cfo->crystal_cap; - s32 cfo_avg = 0; - - if (rtwdev->sta_cnt != 1) { - rtw8822c_cfo_tracking_reset(rtwdev); - return; - } - - if (cfo->packet_count == cfo->packet_count_pre) - return; - - cfo->packet_count_pre = cfo->packet_count; - cfo_avg = rtw8822c_cfo_calc_avg(rtwdev, path_num); - rtw8822c_cfo_need_adjust(rtwdev, cfo_avg); - - if (cfo->is_adjust) { - if (cfo_avg > CFO_TRK_ADJ_TH) - crystal_cap++; - else if (cfo_avg < -CFO_TRK_ADJ_TH) - crystal_cap--; + u8 crystal_cap; - crystal_cap = clamp_t(s8, crystal_cap, 0, XCAP_MASK); - rtw8822c_set_crystal_cap(rtwdev, (u8)crystal_cap); - } + crystal_cap = rtw_phy_cfo_xcap_track(rtwdev, XCAP_MASK, + !rtw_coex_disabled(rtwdev)); + rtw8822c_set_crystal_cap(rtwdev, crystal_cap); } static const struct rtw_phy_cck_pd_reg @@ -4985,7 +4895,7 @@ static const struct rtw_chip_ops rtw8822c_ops = { .cfg_csi_rate = rtw_bf_cfg_csi_rate, .adaptivity_init = rtw8822c_adaptivity_init, .adaptivity = rtw8822c_adaptivity, - .cfo_init = rtw8822c_cfo_init, + .cfo_init = rtw_phy_cfo_xcap_init, .cfo_track = rtw8822c_cfo_track, .config_tx_path = rtw8822c_config_tx_path, .config_txrx_mode = rtw8822c_config_trx_mode, diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/realtek/rtw88/rtw8822c.h index fc62b67a15..c27e4c394a 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h @@ -181,9 +181,6 @@ const struct rtw_table name ## _tbl = { \ #define REG_ANAPARLDO_POW_MAC 0x0029 #define BIT_LDOE25_PON BIT(0) #define XCAP_MASK GENMASK(6, 0) -#define CFO_TRK_ENABLE_TH 20 -#define CFO_TRK_STOP_TH 10 -#define CFO_TRK_ADJ_TH 10 #define REG_TXDFIR0 0x808 #define REG_DFIRBW 0x810 -- 2.53.0