From nobody Sat Dec 14 02:17:57 2024 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 4Y98xd3ZWJz5gWNF; Sat, 14 Dec 2024 02:17:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y98xd2qf9z4X5s; Sat, 14 Dec 2024 02:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142677; 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=xighsT3paNQ4BBIzQnxL5eFKCFQwkf3TK02GborEoJQ=; b=iFayCAnSulh2PeQFwIAnOtmDV08wFvGr0btzfjqyUVXXhW4He1bfZ/sJm6uzgEHZfXKggl pU8L78X4vHBC363I6Jaw8u7CTcKkHhki3pD1WvOiOFBKuM2DvD2zIsLdqMMz5vMiLKAKts Qujqj98zdUnBHRDrtxY99xb0GZrvk6MxzAJmKR0Ha5tOfFLVmdqpYJiKTj6gY256FQSnuy FB6+GCib09PIkXFxSPx22ddAsd2BuPQMtrfikC74Z0TIOl0Ebi6YPXaqGUBb0klEPmX8c4 a9ZjdVJFITBGkvtxyn/SqC3ktDJrSPibdDfMAZMKzppSSVaw4AFNnMjijGwS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142677; 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=xighsT3paNQ4BBIzQnxL5eFKCFQwkf3TK02GborEoJQ=; b=kxrXsnzKiFi6t5NPSqpx00UWtru33jL1IoNiRJyBCnonCSp2PPKWEW/k822psdV+7577/5 QrZGa+5TiAxAE+Xv/M4F0g+p/NDH2aXASd6kjhsvhZYuKw4Pc+F8tbAYXYGcD0SUCQD8Sc KQCDrfT11wl5q4jSrVuY1Onux5N95uLOjqBGnR4vq1cT7EbdXLEN+4tROzQ3U3cjIGs46r jgBPsse9oLbFZIawut8RkH510csKt8vkLnqsdfBnf1KYY3xN4vFAlWlBiVC+kt++I3kEiO Fz4pqbwJnzY3USDINwJ9JpGRpLwKdavIrGSZ7TiAPbqcIm1Ek29AEpQ0J58Cfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734142677; a=rsa-sha256; cv=none; b=KfgaOg+qPpzKFLUqUCT7KsDyjh5R+ZwvuslYE6B5I0gg3zGa36fryobiCM1yE8BYuLFd1V U3pdy+gzpvO0kfqhq6nsBQplkU5HpUYcInoQs/e7XsaGHiMfMD39/QFdYTFTl7QdS6OW4M cbIrkCU+2S1AeTvYrrjVItjAsdY2s2Eqz3UX0C8WO8bsnDce2AJAZmRf5Wqo5lcKAIVUyW qbiY7C2aGpEwDz8TUSua6szvZ0UoQZMoPvKoqW8kVSc2aGfpIBodzTwoEaR70lON3gJIZL uD12y5MhiyteehzrU0KYySiQFxBrquYc6WnS1SNlxPxt9yFoNOXC2o37B4PqUw== 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 4Y98xd2Bmyz13C2; Sat, 14 Dec 2024 02:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BE2Hv0V085868; Sat, 14 Dec 2024 02:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE2Hv5D085866; Sat, 14 Dec 2024 02:17:57 GMT (envelope-from git) Date: Sat, 14 Dec 2024 02:17:57 GMT Message-Id: <202412140217.4BE2Hv5D085866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7722d5e21477 - main - rtwn: add RTL8812/RTL8821 VHT80 channel programming, spur management 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7722d5e214772be22ef20bee46afeed2e9f78858 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7722d5e214772be22ef20bee46afeed2e9f78858 commit 7722d5e214772be22ef20bee46afeed2e9f78858 Author: Adrian Chadd AuthorDate: 2024-12-04 05:58:05 +0000 Commit: Adrian Chadd CommitDate: 2024-12-14 02:17:27 +0000 rtwn: add RTL8812/RTL8821 VHT80 channel programming, spur management * add VHT80 channel programming * add VHT80 spur management, sync with Linux rtw88 Obtained from: Linux rtw88 Differential Revision: https://reviews.freebsd.org/D47901 --- sys/dev/rtwn/rtl8812a/r12a_chan.c | 81 ++++++++++++++++++++++++++++++++++----- sys/dev/rtwn/rtl8812a/r12a_reg.h | 4 ++ 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/sys/dev/rtwn/rtl8812a/r12a_chan.c b/sys/dev/rtwn/rtl8812a/r12a_chan.c index 789a14b0e1d6..749f0e09e831 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_chan.c +++ b/sys/dev/rtwn/rtl8812a/r12a_chan.c @@ -374,12 +374,20 @@ r12a_fix_spur(struct rtwn_softc *sc, struct ieee80211_channel *c) } else { rtwn_bb_setbits(sc, R12A_RFMOD, 0x400, 0x800); - if (!IEEE80211_IS_CHAN_HT40(c) && /* 20 MHz */ + if ((IEEE80211_IS_CHAN_B(c) || + IEEE80211_IS_CHAN_ANYG(c) || + IEEE80211_IS_CHAN_HT20(c)) && /* 2GHz, 20 MHz */ (chan == 13 || chan == 14)) { rtwn_bb_setbits(sc, R12A_RFMOD, 0, 0x300); rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0, 0x40000000); - } else { /* !80 Mhz */ + } else if (IEEE80211_IS_CHAN_HT40(c) || + IEEE80211_IS_CHAN_VHT40(c)) { + /* XXX double check! */ + rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, + 0, 0x40000000); + } else if (IEEE80211_IS_CHAN_VHT80(c)) { + /* XXX double check! */ rtwn_bb_setbits(sc, R12A_RFMOD, 0x100, 0x200); rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0x40000000, 0); @@ -387,7 +395,9 @@ r12a_fix_spur(struct rtwn_softc *sc, struct ieee80211_channel *c) } } else { /* Set ADC clock to 160M to resolve 2480 MHz spur. */ - if (!IEEE80211_IS_CHAN_HT40(c) && /* 20 MHz */ + if ((IEEE80211_IS_CHAN_B(c) || + IEEE80211_IS_CHAN_ANYG(c) || + IEEE80211_IS_CHAN_HT20(c)) && /* 2GHz, 20 MHz */ (chan == 13 || chan == 14)) rtwn_bb_setbits(sc, R12A_RFMOD, 0, 0x300); else if (IEEE80211_IS_CHAN_2GHZ(c)) @@ -489,16 +499,67 @@ r12a_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c) rtwn_rf_setbits(sc, i, R92C_RF_CHNLBW, 0xff, chan); } -#ifdef notyet - if (IEEE80211_IS_CHAN_HT80(c)) { /* 80 MHz */ - rtwn_setbits_2(sc, R92C_WMAC_TRXPTCL_CTL, 0x80, 0x100); + if (IEEE80211_IS_CHAN_VHT80(c)) { /* 80 MHz */ + uint8_t ext20 = 0, ext40 = 0; + uint8_t txsc; + /* calculate ext20/ext40 */ + if (c->ic_ieee > c->ic_vht_ch_freq1) { + if (c->ic_ieee - c->ic_vht_ch_freq1 == 2) { + ext20 = R12A_DATA_SEC_PRIM_UP_20; + ext40 = R12A_DATA_SEC_PRIM_UP_40; + } else { + ext20 = R12A_DATA_SEC_PRIM_UPPER_20; + ext40 = R12A_DATA_SEC_PRIM_UP_40; + } + } else { + if (c->ic_vht_ch_freq1 - c->ic_ieee == 2) { + ext20 = R12A_DATA_SEC_PRIM_DOWN_20; + ext40 = R12A_DATA_SEC_PRIM_DOWN_40; + } else { + ext20 = R12A_DATA_SEC_PRIM_LOWER_20; + ext40 = R12A_DATA_SEC_PRIM_DOWN_40; + } + } + /* Form txsc from sec20/sec40 config */ + txsc = SM(R12A_DATA_SEC_TXSC_20M, ext20); + txsc |= SM(R12A_DATA_SEC_TXSC_40M, ext40); + + rtwn_setbits_2(sc, R92C_WMAC_TRXPTCL_CTL, 0x180, 0x100); - /* TODO */ + /* DATA_SEC, for ext20/ext40 */ + rtwn_write_1(sc, R12A_DATA_SEC, txsc); + + /* ADCCLK */ + rtwn_bb_setbits(sc, R12A_RFMOD, 0x003003c3, 0x00300202); + + /* ADC160 - Set bit 30 */ + rtwn_bb_setbits(sc, R12A_ADC_BUF_CLK, 0, 0x40000000); + + /* ADCCLK, ext20 */ + /* discard high 4 bits */ + val = rtwn_bb_read(sc, R12A_RFMOD); + val = RW(val, R12A_RFMOD_EXT_CHAN, ext20); + rtwn_bb_write(sc, R12A_RFMOD, val); + /* CCA2ND, ext20 */ + val = rtwn_bb_read(sc, R12A_CCA_ON_SEC); + val = RW(val, R12A_CCA_ON_SEC_EXT_CHAN, ext20); + rtwn_bb_write(sc, R12A_CCA_ON_SEC, val); + + /* PEAK_TH */ + if (rtwn_read_1(sc, 0x837) & 0x04) + val = 0x01400000; + else if (sc->nrxchains == 2 && sc->ntxchains == 2) + val = 0x01800000; + else + val = 0x01c00000; + + rtwn_bb_setbits(sc, R12A_L1_PEAK_TH, 0x03c00000, val); + /* BWMASK */ val = 0x0; - } else -#endif - if (IEEE80211_IS_CHAN_HT40(c)) { /* 40 MHz */ + + } else if (IEEE80211_IS_CHAN_HT40(c) || + IEEE80211_IS_CHAN_VHT40(c)) { /* 40 MHz */ uint8_t ext_chan; if (IEEE80211_IS_CHAN_HT40U(c)) diff --git a/sys/dev/rtwn/rtl8812a/r12a_reg.h b/sys/dev/rtwn/rtl8812a/r12a_reg.h index 4f5f6f28c11a..13867fb76973 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_reg.h +++ b/sys/dev/rtwn/rtl8812a/r12a_reg.h @@ -45,6 +45,10 @@ #define R12A_AMPDU_MAX_TIME 0x456 #define R12A_AMPDU_MAX_LENGTH R92C_AGGLEN_LMT #define R12A_DATA_SEC 0x483 +#define R12A_DATA_SEC_TXSC_20M_M 0x0000000f +#define R12A_DATA_SEC_TXSC_20M_S 0 +#define R12A_DATA_SEC_TXSC_40M_M 0x000000f0 +#define R12A_DATA_SEC_TXSC_40M_S 4 #define R12A_ARFR_2G(i) (0x48c + (i) * 8) #define R12A_HT_SINGLE_AMPDU 0x4c7