From nobody Tue Dec 31 19:13:31 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 4YN2gc04csz5jtYS; Tue, 31 Dec 2024 19:13:32 +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 4YN2gb6cQxz4phM; Tue, 31 Dec 2024 19:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672411; 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=sT3TwWJXxA0vTHcv7gsB+qkZ4RpbvqFK7aK0DrRCp90=; b=Fp98ucZD+aV7iossDFyXp56Ak+ANHsHURotvg2RPWRDYX/ZHZrPE7N0L9E+qolXSjCN3QQ qcqIaktglNzjY2y1CvJ31t6dVwZsOldSTCUpZYlOx8LWOUAuBDUcadPZvNLwQTj1YlUJaf OBMiHgM13HIJDN3Wddh/iIgfA/1b/nSczFKPkkb9pMAO9hlCh+HQufaXrXyOx78vhTtlTr 64KnpUkTr1CQp+eu9Zu5Fl+A3hR0MYSS3dDwpwGBd1VEsr69E4j+2neodju8MOXH1GyOk8 O4F2g6ENjWMsxw7rZhK9gt+VEqw4kpPkH9rJseaPmnlfxWhT1ZlcJYmDpZI6MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735672411; 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=sT3TwWJXxA0vTHcv7gsB+qkZ4RpbvqFK7aK0DrRCp90=; b=q91Iui/FracRL02tG6MjGklhODKrp4QlN6hMFo9B/FnmvpSldRufP9EaN/A6VR02goYUah JcrpxAgC10X867D0mJXYFp7N49a3dalPwPar2lyhCZeIrRf7+s4pYStX+GwnGvRALtDVPa 9P9fSw30spAScnrSO4KzG+E3NKQwr3XdHWak8kDgOCOO18zJY+MIVNA6Dig5kOPYnxzEFa ppBOOaWnV6Mba2KcXs/1eKupFTUTC9OqW+bGExcVt0f/l60QywgJ8JjEf5RwV3KY9cdQXG 0x8ePG//RfLPAb/3os87F1vknnsw1+DHDJ/99qrx+vuVlk4zoDEOFHf2K7LULw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735672411; a=rsa-sha256; cv=none; b=SL0eb+Aandv7hHVMAXbK+hWjyJVr/DIXiyw9zFaARtB9zPAewYNyLPDbok4YIw3E8MUbfO n5JCbyAy2AkTgVD2huSZtRps0h1Cc406pohNjI8/vWd0u7gTmMWKwIeh7yW3Ooi6Kf57d2 oyQt9PN2OstD+K2dFqSwrXkd6eA13aAscPI06ZY2pfFxlYxKM4m0/SCY7lCnM9nrymWdl5 6WeWIO4KpkpJshsgCouI/2VkgOZLUNvZmZ9d4WT8/8P346OdDfN+eExE1osmtl2D6A+vWs C2I9tX8XSOpnTLvloUnJu0k6PMS3iGAqklh5D13/ioAvWGAdRIebYL5bmEqNSA== 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 4YN2gb6CY5zsHJ; Tue, 31 Dec 2024 19:13:31 +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 4BVJDVuQ060023; Tue, 31 Dec 2024 19:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVJDVl8060020; Tue, 31 Dec 2024 19:13:31 GMT (envelope-from git) Date: Tue, 31 Dec 2024 19:13:31 GMT Message-Id: <202412311913.4BVJDVl8060020@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: 7ddf19492cd9 - main - rtwn: add support for register IO debugging 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: 7ddf19492cd930e8b3df970b2cab0909d227dc6a Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7ddf19492cd930e8b3df970b2cab0909d227dc6a commit 7ddf19492cd930e8b3df970b2cab0909d227dc6a Author: Adrian Chadd AuthorDate: 2024-12-14 19:37:15 +0000 Commit: Adrian Chadd CommitDate: 2024-12-31 19:11:07 +0000 rtwn: add support for register IO debugging Add support to read/write the MAC/PHY registers. Hide it behind RTWN_DEBUG. This doesn't cover the RF registers as they require a different IO path, but I haven't yet debugged the RF paths. Locally tested: * RTL8192CU, STA * RTL8188EU, STA * RTL8812AU / RTL8821AU, STA Differential Revision: https://reviews.freebsd.org/D48084 Reviewed by: bz --- sys/dev/rtwn/if_rtwn.c | 34 ++++++++++++++++++++++++++++++++++ sys/dev/rtwn/if_rtwnvar.h | 1 + 2 files changed, 35 insertions(+) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index 46fa8e2de840..d7dd97a3fe18 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -321,12 +321,46 @@ rtwn_radiotap_attach(struct rtwn_softc *sc) &rxtap->wr_ihdr, sizeof(*rxtap), RTWN_RX_RADIOTAP_PRESENT); } +#ifdef RTWN_DEBUG +static int +rtwn_sysctl_reg_readwrite(SYSCTL_HANDLER_ARGS) +{ + struct rtwn_softc *sc = arg1; + int error; + uint32_t val; + + if (sc->sc_reg_addr > 0xffff) + return (EINVAL); + + RTWN_LOCK(sc); + val = rtwn_read_4(sc, sc->sc_reg_addr); + RTWN_UNLOCK(sc); + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return (error); + RTWN_LOCK(sc); + rtwn_write_4(sc, sc->sc_reg_addr, val); + RTWN_UNLOCK(sc); + return (0); +} +#endif /* RTWN_DEBUG */ + void rtwn_sysctlattach(struct rtwn_softc *sc) { struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev); struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); + sc->sc_reg_addr = 0; +#ifdef RTWN_DEBUG + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "reg_addr", CTLFLAG_RW, &sc->sc_reg_addr, + sc->sc_reg_addr, "debug register address"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "reg_val", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + rtwn_sysctl_reg_readwrite, "I", "debug register read/write"); +#endif /* RTWN_DEBUG */ + sc->sc_ht40 = 0; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ht40", CTLFLAG_RDTUN, &sc->sc_ht40, diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h index 8c52ad7ff482..570403747392 100644 --- a/sys/dev/rtwn/if_rtwnvar.h +++ b/sys/dev/rtwn/if_rtwnvar.h @@ -178,6 +178,7 @@ struct rtwn_softc { int sc_hwcrypto; int sc_ratectl_sysctl; int sc_ratectl; + uint32_t sc_reg_addr; uint8_t sc_detached; uint8_t sc_flags;