From nobody Thu Dec 19 16:08:37 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 4YDb7p4M1Nz5hPSR; Thu, 19 Dec 2024 16:08:38 +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 4YDb7p0sXZz4nt0; Thu, 19 Dec 2024 16:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734624518; 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=Ykz1hRg0ScHrPM9kEn3fyDrbdJhCykwQX0pDOoqe+fE=; b=tXyDVRLZAy7lUdG4GQwqeph7HqUXOOm4FmuByZVTyA7tDiNTLaAFdgruqPh6imgA3lFAXa kWEjIjSCcA3DKJdg9VjQkpd1w1cteJk+azIy57C0dCPVUq+qA/RNMLaIs+OFo5sC90te8P J+p8ocYw0h0SVdzccUE83ewXdXImLlZF2mfDZ3EvMk0UsBZl58+/Qof+uKcWRrieniHKCw g+Ap2xgp/fZY5DyEOBF7WHNBgKhcLKvWDki9DGwy8Z0+wHvqO3f/zHqed0f1srXBIqIP/B VhnARf27hGJp+bWbyoMzLKfN6tDVUemxAxOYjQhxb6ucXars/mVaUgznUlPm1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734624518; 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=Ykz1hRg0ScHrPM9kEn3fyDrbdJhCykwQX0pDOoqe+fE=; b=DYITPmOwzUESXTHwn+qgyDlL4FdkgvDmjsz90P5XpVz8jW8yr1ImGv7KjPdphOZfY0ikQU ALaD7WJSaMVEeOc9NcLBjB/0g1dUaCqV6avhg7ApFFAmyuwr9GCaDspHXN//99wDuajJhF arGsOXaMJ52SIeuNOtltfQk7FnpSJfNE/dBnkV818rfhNhPsE9ycTncfwAn5dbmrKskXYN KCcrymi5YmaswQ0dEx+FHkAvmmPXEn3aAKqH2vfYJxKf+/ba75WTkhZYAvdzocR+S3tzyq MiETRzGd8C54ZwnBR8jUlHemprtz623MiuFE0Qy3/HjA7lrqnVnDBkQh0/9SOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734624518; a=rsa-sha256; cv=none; b=gePsb0cL4M82+ZRmNH8+5BzJBP4a5NbW2hlSD2oeGaprsXRzuGZHhJWQOnrvY917ikUPI4 HXuniXCfT4T2T6wivQkemzM+ejsWHNwmV/eWkzNINklzSbGahIJpEuHckEI6dxPkLBKGUl wOwEtgXEmZRlJQu6s0oqmxaUwL3XkkRZSa4y1Pnzm1iicgytW5qcCQe6HQ4x1D+yIcJt6M KQ8R8HnQtnLQyXQWnHtl7JxCTzctl/Di1oB8vjDmzOtXWvMeq/XauBJj6lQcqbkpzIGR6f ZMR8QjgTnx7KfxY7Dr7RyfLCGcKCDELnIgqOuzwLSsnVmUVRcUuzS+u31iVy4g== 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 4YDb7p0Tlbz11G6; Thu, 19 Dec 2024 16:08:38 +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 4BJG8bvC073104; Thu, 19 Dec 2024 16:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJG8bUs073101; Thu, 19 Dec 2024 16:08:37 GMT (envelope-from git) Date: Thu, 19 Dec 2024 16:08:37 GMT Message-Id: <202412191608.4BJG8bUs073101@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: eb6314510c88 - main - rtwn: disable a workaround introduced earlier for RTL8192CU TX performance 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: eb6314510c882472628984e6190e39a6ab70687e Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=eb6314510c882472628984e6190e39a6ab70687e commit eb6314510c882472628984e6190e39a6ab70687e Author: Adrian Chadd AuthorDate: 2024-12-11 05:16:54 +0000 Commit: Adrian Chadd CommitDate: 2024-12-19 16:07:28 +0000 rtwn: disable a workaround introduced earlier for RTL8192CU TX performance I'm unable to reproduce the original problem with my RTL8192CU USB devices with the current codebase and I can't find any reference to what this power register is doing - I see it defined in drivers, but it's not described or used anywhere. This reverts 7f740971658d71c1ee95ee68032b4696c1684845 - rtwn_usb(4): fix Tx instability with RTL8192CU chipsets In any case being able to do higher rate RTS/CTS is beneficial. Local testing: * rtl8192cu, STA mode, TX/RX testing PR: 233949 Differential Revision: https://reviews.freebsd.org/D48026 Reviewed by: imp --- sys/dev/rtwn/rtl8192c/r92c_tx.c | 6 ------ sys/dev/rtwn/rtl8192c/usb/r92cu_init.c | 2 -- 2 files changed, 8 deletions(-) diff --git a/sys/dev/rtwn/rtl8192c/r92c_tx.c b/sys/dev/rtwn/rtl8192c/r92c_tx.c index 9583a7e1119e..313f79e216e6 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_tx.c +++ b/sys/dev/rtwn/rtl8192c/r92c_tx.c @@ -212,12 +212,6 @@ r92c_tx_setup_macid(void *buf, int id) struct r92c_tx_desc *txd = (struct r92c_tx_desc *)buf; txd->txdw1 |= htole32(SM(R92C_TXDW1_MACID, id)); - - /* XXX does not belong here */ - /* XXX temporary (I hope) */ - /* Force CCK1 for RTS / CTS frames (driver bug) */ - txd->txdw4 &= ~htole32(SM(R92C_TXDW4_RTSRATE, R92C_TXDW4_RTSRATE_M)); - txd->txdw4 &= ~htole32(R92C_TXDW4_RTS_SHORT); } static int diff --git a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c index 42e50ff9f8bd..10d812dd7a80 100644 --- a/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c +++ b/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c @@ -354,8 +354,6 @@ void r92cu_post_init(struct rtwn_softc *sc) { - rtwn_write_4(sc, R92C_POWER_STATUS, 0x5); - /* Perform LO and IQ calibrations. */ r92c_iq_calib(sc); /* Perform LC calibration. */