From nobody Sat Dec 14 02:17:59 2024 X-Original-To: dev-commits-src-main@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 4Y98xg67dJz5gWLf; Sat, 14 Dec 2024 02:17:59 +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 4Y98xg584vz4X7b; Sat, 14 Dec 2024 02:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142679; 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=tGf3XC+V+8HmfT8ip82320v29oN58qgv58dZN4P7gAE=; b=v4kIujNx8EGbtBFFGCqJKs0SxNF/h+ahlflm+VvtXxKSVJ+5Wr6jWLFHIsyIYsemJVGEUS 1J5OXb1P86SXVweyfYUmbAjide0zQoOoBS7h1098z77qcvGCXrPnzmVAXVFOvGTeS1OaiT 02i1P4tW17P/gAG2T7s0PSEK69iWiyEFiXKUhvkOv92popJXWk2cY2hFOfGyYYAHijEFVU 4zgrHLG0RHsOASKUhQtYgDdiNkyvdvZfV3KfRxPX9clSz1SucZbGh7NjSbA2xCnC/G7wmT 0uZhwhGc1sK9CiEkBmKPUdZpeTbSfdmL8GCTQGAymsXgStkSlb9oacSwdAhc6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734142679; 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=tGf3XC+V+8HmfT8ip82320v29oN58qgv58dZN4P7gAE=; b=vkYVaXhCNJGc5IWKhC8tWnLR5D8bXdNsK0PJi1Xzd7C/SxoCUwRj3afwTw2KOorF8woJTR kM2CO8Qw8koq1nLGxz1qaKEn2gKAeObVppl9AS/5LLq+k2usYLllKiRE+YaQJuf/CU6r3R Wd1kezjUOYIt9LkjQyWbAQwOWz0fxM1nsnElIUnATSvS2ORdcepc4KdVExEbs2zgN6mTq8 YM4epmgj08Paog8c9YqM0kYoSlpVDpRx/KisX0T1fZvq2NlRjXIutrkzsNURXXe4r/juSq fRTSXkwW+iTbnvPGUmMO6cH9hStLgrBsKDgNj6gg48SvlEAQZmrviSkcl2VDow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734142679; a=rsa-sha256; cv=none; b=vJ5ah5cYAuliS2Ucm9H0enxBQrmQaj1c8uA7DwYUivNN6VJlK3UBt1yB5KhAzny38cTmDp zFH3DFSlbl9XcubmPIkKIITmkHZu4Cq7nyzXAp2RuFsHhVyaW7L441KKCG4v1Yh34VfoEQ FU9jt3QorDDpToechtCvo1e3BnyCSPeHB2WwJbD1/qwa/waTKz+FmcMghpadro2Jj5Pih5 ug59Xyh6zVkgj6HgDWJZ89Bvh6wkM4ABgdO4dwBN1y1YV88mrZlVl6hdy24NSAfGjTDOl1 xR1ejAkTQNnsO85pdvJ8nfdhS1YVsgP1FElovsAZS3MW3DbCf42qKmYICci3Eg== 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 4Y98xg40kFz13J0; Sat, 14 Dec 2024 02:17:59 +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 4BE2Hx1N085979; Sat, 14 Dec 2024 02:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE2HxFO085976; Sat, 14 Dec 2024 02:17:59 GMT (envelope-from git) Date: Sat, 14 Dec 2024 02:17:59 GMT Message-Id: <202412140217.4BE2HxFO085976@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: 35e63136a8c2 - main - rtwn: add a register value for R92C_FPGA0_POWER_SAVE, and other bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 35e63136a8c264b96cc07c1a2cd51e5894cfa67c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=35e63136a8c264b96cc07c1a2cd51e5894cfa67c commit 35e63136a8c264b96cc07c1a2cd51e5894cfa67c Author: Adrian Chadd AuthorDate: 2024-12-06 23:51:07 +0000 Commit: Adrian Chadd CommitDate: 2024-12-14 02:17:52 +0000 rtwn: add a register value for R92C_FPGA0_POWER_SAVE, and other bits * add a register value for the R92C_FPGA0_POWER_SAVE register * add the field names and mask * add a mask for the 40MHz upper/lower bits in R92C_RMRR; I think I need to debug and overhaul the 20/40MHz config path to get 40MHz working right. Local testing: * rtl8188eu, sta mode * rtl8192cu, sta mode --- sys/dev/rtwn/rtl8192c/r92c_chan.c | 3 ++- sys/dev/rtwn/rtl8192c/r92c_reg.h | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_chan.c b/sys/dev/rtwn/rtl8192c/r92c_chan.c index 55d73c934f1e..108fbbf16c59 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_chan.c +++ b/sys/dev/rtwn/rtl8192c/r92c_chan.c @@ -262,7 +262,8 @@ r92c_set_bw40(struct rtwn_softc *sc, uint8_t chan, int prichlo) rtwn_bb_setbits(sc, R92C_FPGA0_ANAPARAM2, R92C_FPGA0_ANAPARAM2_CBW20, 0); - rtwn_bb_setbits(sc, 0x818, 0x0c000000, (prichlo ? 2 : 1) << 26); + rtwn_bb_setbits(sc, R92C_FPGA0_POWER_SAVE, + R92C_FPGA0_POWER_SAVE_PS_MASK, (prichlo ? 2 : 1) << 26); /* Select 40MHz bandwidth. */ rtwn_rf_write(sc, 0, R92C_RF_CHNLBW, diff --git a/sys/dev/rtwn/rtl8192c/r92c_reg.h b/sys/dev/rtwn/rtl8192c/r92c_reg.h index e640b6b560b1..6ca4a4eca031 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_reg.h +++ b/sys/dev/rtwn/rtl8192c/r92c_reg.h @@ -520,6 +520,7 @@ #define R92C_RRSR_RATE_BITMAP_S 0 #define R92C_RRSR_RATE_CCK_ONLY_1M 0xffff1 #define R92C_RRSR_RATE_ALL 0xfffff +#define R92C_RRSR_RSC_SUBCHNL_MASK 0x00600000 #define R92C_RRSR_RSC_LOWSUBCHNL 0x00200000 #define R92C_RRSR_RSC_UPSUBCHNL 0x00400000 #define R92C_RRSR_SHORT 0x00800000 @@ -668,6 +669,7 @@ */ #define R92C_FPGA0_RFMOD 0x800 #define R92C_FPGA0_TXINFO 0x804 +#define R92C_FPGA0_POWER_SAVE 0x818 #define R92C_HSSI_PARAM1(chain) (0x820 + (chain) * 8) #define R92C_HSSI_PARAM2(chain) (0x824 + (chain) * 8) #define R92C_TXAGC_RATE18_06(i) (((i) == 0) ? 0xe00 : 0x830) @@ -725,6 +727,11 @@ #define R92C_RFMOD_CCK_EN 0x01000000 #define R92C_RFMOD_OFDM_EN 0x02000000 +/* Bits for R92C_FPGA0_POWER_SAVE. */ +#define R92C_FPGA0_POWER_SAVE_PS_MASK 0x0c000000 +#define R92C_FPGA0_POWER_SAVE_PS_LOWER_CHANNEL 0x04000000 +#define R92C_FPGA0_POWER_SAVE_PS_UPPER_CHANNEL 0x08000000 + /* Bits for R92C_HSSI_PARAM1(i). */ #define R92C_HSSI_PARAM1_PI 0x00000100