From nobody Tue Dec 31 19:13:34 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 4YN2gf2MFDz5jtyh; Tue, 31 Dec 2024 19:13:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YN2gf1YVRz4pPr; Tue, 31 Dec 2024 19:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672414; 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=GPFkQKYEYbGlVx44cRVnqDLnBFpmdVwq3jQzL7X+W2U=; b=LJiqmS3F84BEqSU7eSxcTEVsnPdgkA/2HG9apzy8+yb9jOyN7nY3zjM3FfCtBFLMmEbkaE cL9Kb0yjCGIBmzHeusUW7kFXzE3gHjtgdxxy9dPTJSUBHQzKhKsk4kdI0K1S/tuRTlZzol bifAKbl8ernOseBt1ExzD1VcO3o/e7PgnNIJHLcmZQyPtT/PWFH8gmrius2hqxJmIIHSiy BeJj/wzTXidsYBgXEyGRcb/6cEXSdjviVt2/1+3/QlWMxFPbcLlfcJW498dlkHEfxPk7lO 8bspTgUJgdeZOGotHNPhp1Gc6KAjbRt8S0bSl6gmlqz/APmFsIyF+R514t3EYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672414; 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=GPFkQKYEYbGlVx44cRVnqDLnBFpmdVwq3jQzL7X+W2U=; b=fW32mu+namO6tM5VGPYRlock9JNuEEyaFtiq2Z9iWpdMR10hncjDWYY7rcbjkGHS8sFOZB Xc83XeXqbOkWSyzYcRI40UrB0NQEeAtFCtQEPVjkqDDBv2HMNon3153brqOQGHHoO+vscc v1NU2ZFenz+VbicuQBAjfGzwW72QOHtzNJmI4WHiIS5bczIyotZPi8T3mh+1vzJ5AunBTv MM0MFSb/JvVe8YNaS02G8Lc+vSiYK0BL9DkhwiEcV+xtO4n/KzsQOuBjaI5oMda0kXZsGW ++6JFEq1PpVG/R65yGbyTsSyWhfysa/VOSQ24Ih0Vr5086YwwB4VxUEzKOy+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735672414; a=rsa-sha256; cv=none; b=coB28a5K8xwrDkma6l48LK0ladBrhE4sJeehxvwwlzdWpLtzSGhwDQcANyxnGw9FF9wkA+ pcBWF6lB3HEhEDJ+UTRVvsWTvkRQPKC4FC5VwxgOeVGIlnocgdhEW0wVynZ1oc6rlAI60+ RPxUOnfVFy5m0avZJIVZr/k/XjCx7nwuVVpndgRjoFa14fcdOfB7r8HlTVrAYSyJuIeh86 BWJ1RPMcazjFwhf3CuxcYskl+kaitpuEDhvJUewxiHhEgY3CSJeIvz1KbxhT1tzodRtx+l Vd3VzoecFmiQg7WS3oXO8tWzT7MdKjqWlzJUqAyPEKGj5zUiT/GT3c00KhIpHw== 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 4YN2gf190tzsHK; Tue, 31 Dec 2024 19:13:34 +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 4BVJDYVF060148; Tue, 31 Dec 2024 19:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJDYBX060145; Tue, 31 Dec 2024 19:13:34 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:13:34 GMT Message-Id: <202412311913.4BVJDYBX060145@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: 307f9c351588 - main - rtwn: only set INIRATE if we're not doing firmware rate control. 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: 307f9c351588fcfe5a170c61754a5b1394b7dc0a Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=307f9c351588fcfe5a170c61754a5b1394b7dc0a commit 307f9c351588fcfe5a170c61754a5b1394b7dc0a Author: Adrian Chadd AuthorDate: 2024-12-15 21:04:28 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 19:12:57 +0000 rtwn: only set INIRATE if we're not doing firmware rate control. This register (array) controls the initial rate to use for each MACID. There's no need to set it if firmware rate control is enabled - it'll actually be under firmware control (and we can read it back to see what choices the firmware is making.) Locally tested: * RTL8188EU, STA * RTL8192CU, STA * RTL8192EU, STA Differential Revision: https://reviews.freebsd.org/D48094 Reviewed by: bz --- sys/dev/rtwn/rtl8192c/r92c_fw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_fw.c b/sys/dev/rtwn/rtl8192c/r92c_fw.c index 384cd50e901a..58584b3cd020 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_fw.c +++ b/sys/dev/rtwn/rtl8192c/r92c_fw.c @@ -239,7 +239,12 @@ r92c_init_ra(struct rtwn_softc *sc, int macid) } #endif - rtwn_write_1(sc, R92C_INIDATA_RATE_SEL(macid), maxrate); + /* + * There's no need to set this if firmware rate control is + * enabled - the firmware will be controlling this per MACID. + */ + if (sc->sc_ratectl != RTWN_RATECTL_FW) + rtwn_write_1(sc, R92C_INIDATA_RATE_SEL(macid), maxrate); ieee80211_free_node(ni); }