From nobody Thu Oct 5 14:33:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S1Yvb2lKWz4wrZY; Thu, 5 Oct 2023 14:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1Yvb2HdDz4R03; Thu, 5 Oct 2023 14:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sprP77EsOPni5psai9secDnzb3Yr3sWht0KTuKaHmKY=; b=Imx2/c2Z3xeZqnC92bo9Q7R+X1+xqNb2v6ZZW83DMBdxLYv6QpnABue7W/iSERS5JqK4z+ BFbmpfAjVh/Vz4lAcg/thYA8UQntjLprsuqSCgxQS4BRM3ow+QhYubdU294z1hD8gxE/5Z ZRFQOoLGQWilTbSPU4SXErClPNqMKo04CU3oxpu7cuxduXKZCmIPYZ+IsGvX+I6E4RKmjZ JWfjpKUtAD35d6fXD7S0eXo6PtBdnzlr+cJed6q63njuv0Bu5u3+BU++xXeDHwDgwGcTR6 JQRsk/TxtSCZC51bmmA30IHPpwfhrRH/FBK26qr8Pjl25cEBBlyDJdaglVHHNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696516411; a=rsa-sha256; cv=none; b=cbDEg4CNEFkJjzAyawC9Ejp6x5YsCg6//GsA2QDAV14eJMBW/IFXUzz+EL5mwMJLi6+B+N bEw1EodNa5tnDBXgxJG+qPHXrcJhV3EzBnKZygRaimIPQMDeMlhXnT5IXK8XTWgM2qU+9t 1opVzNSIQ3NDTdQN0fom6Ezu2e/CwRzRS99bBnUkL/9bzOGM/xH70yB7FJSdlcE55Daaa8 4jju6FoahwHW7L1YWBXC5a4wJTtnIadlIA1wWnXbyqt3xdZrnaUXxStd6YFMRBgrh6YHS1 QPVTdoXedQ09cYM2glTE7FAqLkVisryPooV3tro5bUmi4UeoPb58kFGwZORU/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sprP77EsOPni5psai9secDnzb3Yr3sWht0KTuKaHmKY=; b=VcyRV+LCChgMqvNc3nOQLjJ0VvUJQgFQX8PSEYMc9Z8CvvoIj58bDI0MC2MIqiT+T5ux15 3BE7l+8bJJwmA/r1E9WfiXVWeL4t1md9RJig3B1mC0FuqFfv+0EXDRrHkWVzAV3cRrZ0pH ZKhnqk1qNA8qSPKlc5lTpuwGbok6aA6zzZqpGKLD9oYU1ayNrDtgAQthnuIEv8UBXMa+AD j62WcqlDuRRgEogdG68H/46ryho9f44/UCDvtDX6yNVTsppnXE3SKm2JE09cVrqPsa0HU0 yGJcjyG28AozMYX2QSUsAlL7D7KTQtmR0FtFLElW5DpS3PN9n+xOWWKIgtnLtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S1Yvb1LN0z1NbQ; Thu, 5 Oct 2023 14:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395EXVTW010711; Thu, 5 Oct 2023 14:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395EXV5x010708; Thu, 5 Oct 2023 14:33:31 GMT (envelope-from git) Date: Thu, 5 Oct 2023 14:33:31 GMT Message-Id: <202310051433.395EXV5x010708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4f3b2bba240b - main - rtw88: Use RF_CFGCH instead of hard coded 0x18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f3b2bba240b6e0603b5cbb47155fd8215bcbcb3 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4f3b2bba240b6e0603b5cbb47155fd8215bcbcb3 commit 4f3b2bba240b6e0603b5cbb47155fd8215bcbcb3 Author: Bjoern A. Zeeb AuthorDate: 2023-10-05 14:01:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-05 14:30:58 +0000 rtw88: Use RF_CFGCH instead of hard coded 0x18 While debugging some funky register reads of 0xaeaea from RF_CFGCH resulting in "rtw880: [TXGAPK] unknown channel 234!!" more of these reads came to my attention hidden by using the register index rather than the defined value. Make this more grep-able. MFC after: 3 days --- sys/contrib/dev/rtw88/rtw8822c.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/contrib/dev/rtw88/rtw8822c.c b/sys/contrib/dev/rtw88/rtw8822c.c index da58b9ca8e57..a2fda1b36e6c 100644 --- a/sys/contrib/dev/rtw88/rtw8822c.c +++ b/sys/contrib/dev/rtw88/rtw8822c.c @@ -2204,7 +2204,11 @@ static void rtw8822c_set_channel_rf(struct rtw_dev *rtwdev, u8 channel, u8 bw) u32 rf_reg18 = 0; u32 rf_rxbb = 0; +#if defined(__linux__) rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK); +#elif defined(__FreeBSD__) + rf_reg18 = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK); +#endif rf_reg18 &= ~(RF18_BAND_MASK | RF18_CHANNEL_MASK | RF18_RFSI_MASK | RF18_BW_MASK); @@ -3277,7 +3281,11 @@ static void rtw8822c_dpk_information(struct rtw_dev *rtwdev) u32 reg; u8 band_shift; +#if defined(__linux__) reg = rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK); +#elif defined(__FreeBSD__) + reg = rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK); +#endif band_shift = FIELD_GET(BIT(16), reg); dpk_info->dpk_band = 1 << band_shift; @@ -4158,7 +4166,11 @@ static bool rtw8822c_dpk_reload(struct rtw_dev *rtwdev) dpk_info->is_reload = false; +#if defined(__linux__) channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, 0x18, RFREG_MASK) & 0xff); +#elif defined(__FreeBSD__) + channel = (u8)(rtw_read_rf(rtwdev, RF_PATH_A, RF_CFGCH, RFREG_MASK) & 0xff); +#endif if (channel == dpk_info->dpk_ch) { rtw_dbg(rtwdev, RTW_DBG_RFK,