From nobody Wed Nov 29 16:38:43 2023 X-Original-To: dev-commits-src-branches@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 4SgQ4g2Th3z52xCB; Wed, 29 Nov 2023 16:38:43 +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 4SgQ4g1zclz3KQq; Wed, 29 Nov 2023 16:38:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275923; 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=Y2RYJeQ2oAnO4eqpZBqp0pxI15QfigrTJN+tVjlZItw=; b=F3MYVpHJ+zDUq7YchDrsDltyhphoBiOblJXXX6JKFy6/y1bv/pvvfZ5h2yt2k9bMzgLwW7 JxIa3cTv748tqvzKa8QMwuhKpUij8I6BxmohCqlTjDkwyCgnrQtg1uHditWYwvARmiBR9u Hlf1WYtDLan7Zn2dW6KgqKBh4EL9qxtS0Y6lzPwH7hgakoYglDLySxokKFwhOT+L3doQUV E6aNIG9I+GQBXt/p4VPz/t9sdRCl/t2e9URAd7O9oEi+p8R6puGvxVPGdlua40vdEwKafe znPyOKUoG8o39rqRulfPaWLbrOX6AARqcr21Gvw12dkBi26g8MubEu2YARssSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275923; 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=Y2RYJeQ2oAnO4eqpZBqp0pxI15QfigrTJN+tVjlZItw=; b=ZLpCfRb7KFmQPlW2eI30mZgJZeTU0jfY5lVxfUvHDn6hxXnweUghjP5iwltkmEbQRduqdP tCZRMsuIG+dZb7VcPd0yh4U/lsxygF3UHkTiA/5+uUFKtq3qRQsir9VXr6eFeOAUpHQXTH qmtSFio9yz6/ix8AK7mMDi7i9pQO4ypJfRnY0KUfizUz11h7oouudmZ2r30/wPLIs4pJKv l/nwxpwb0s+unINfi2IaDB8c/RdIDtD/ub6EDg4X6uvDGUv1SO4enE2bq7FXFKs6ld3CjF zm6iuJ7kadGNUVQpjE1Uwcg7pbLe9xDRUyMcPrwy/cDRjL6vvZ6y+ilBYm8cBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275923; a=rsa-sha256; cv=none; b=vbyu0RCvSXksY+hQlrsZuuDfq4rfe/T49OtUNiewydEB8SINrnwQ+uaJ4lexpAQiMKyDt5 5ntNJ/Nq5JZM2ojU9K5o69ETlsG4ntftd4+UdbUl6/TsPEYq3aUZGRPv0qAj/UQazsWh8C +ZyrxmWmm4bo1xDrVgo1loYAiuw2iDnO0oBion7kiLUkWIwaQXWImU2R6W17whsNUYX+5D j2IpHYhp/izhvs6Sd9isA51gD9vnhG9N+exgDYLnGy6dXSnqs86uZleXaAecw9Rj+e38dc SfkuvRVO7bLhCwogeSsnUfaKiLO/v4v8NQkcbMyPnviUTGz0XvOvG3zu7fcV2g== 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 4SgQ4g15Gsz1C2K; Wed, 29 Nov 2023 16:38:43 +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 3ATGchJj046601; Wed, 29 Nov 2023 16:38:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGchGe046598; Wed, 29 Nov 2023 16:38:43 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:43 GMT Message-Id: <202311291638.3ATGchGe046598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b37fa3e1392 - stable/13 - rtw88: Use RF_CFGCH instead of hard coded 0x18 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b37fa3e13928424abe60b6abb79f2162bf0aeed Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b37fa3e13928424abe60b6abb79f2162bf0aeed commit 6b37fa3e13928424abe60b6abb79f2162bf0aeed Author: Bjoern A. Zeeb AuthorDate: 2023-10-05 14:01:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +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. (cherry picked from commit 4f3b2bba240b6e0603b5cbb47155fd8215bcbcb3) --- 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,