From nobody Fri Feb 04 00:56:02 2022 X-Original-To: dev-commits-src-branches@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 CCD4A19A0C2A; Fri, 4 Feb 2022 00:56:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JqcXy3yy4z4bMR; Fri, 4 Feb 2022 00:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643936162; 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=loG2/WXBG2l7h7D3ivgZzSxfAH4mvtm805YpByJgL/I=; b=CDovSoegPtp/zg/B/AK3KpkHpRxr2avcQ89uZQfv8IIGoPsGyc4tTcGUFv5R72LuZOLUr2 35nuazuXYDHsE4dSIvnHJQRzr7WhOFGRxsoPDqM1zBKSG9IfnJC30tV8QAu0EvWpne8xzA xr7YNivYKqiOULgvsEW07P1ONcX5KAzmWpdvWfRsYvzXudkDi87LqxDvUJKaQVrmyfXe7C 98fDLY10i0U7PUN1QYVAuEzFiLFK/TyYUZCchlnLcldpGnvlcg8uBtkH1RKDXAoDVBGTNK qnZGJxBDjM0mjcVX7Eu/POuB7Re1t/mkX7StLl+bvQlbDwiy8Qb5jMJc8vKDsQ== 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 64891221E3; Fri, 4 Feb 2022 00:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2140u2d5070057; Fri, 4 Feb 2022 00:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2140u2Yu070056; Fri, 4 Feb 2022 00:56:02 GMT (envelope-from git) Date: Fri, 4 Feb 2022 00:56:02 GMT Message-Id: <202202040056.2140u2Yu070056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 35f0bf2d37a4 - stable/13 - atkbd: Reduce polling rate from 10Hz to ~1Hz. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35f0bf2d37a49a25a81e25de2ffbd7cba850be36 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643936162; 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=loG2/WXBG2l7h7D3ivgZzSxfAH4mvtm805YpByJgL/I=; b=axdcn9BiM7QlAVP/SxEJuME1Za5/hkJctSfrz7ucUv5FQuaFw1MbT0jy+bW911juzdjMPO GJuFNtPXu9fx0nJZXq21dKxXIb/9AttqapzcB4oh15lj7ALcGLx+heC614rerXIdyJLbRb NiZVEb4Hpgar1InadRcdZGxSBsjePG34VDbKg7ZuRJWhd3+JQh4mDPl/ka8+QC1wfrRGwv gHewWdSQ0pZs0KpwC2RG7g32MBPOI88YR1HpOiK/6CGYe8H02w9oQ2twNpbP6tpzEwR54E C1KABB1PhMJHoEGI6vyska5oxvcBq85ejhwm/xT7Lkyt5FL8V+h9uGCg7yiJ9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643936162; a=rsa-sha256; cv=none; b=oKmqpAZZNdZP7lKH7TF95f7YU2npGH7Ad5BUMjbVeUkRnO9OtBL9cN8Ji5JZUFIXSqa6jB HB+XC+63MJvhscZo7npsVm6PiIPZlZ+mVD0ijuQtidUYFTGkWpsl0NlexGBDXPYQ2cSnCQ wASQILiY5uV1XWBt07Onw6lS+MwxHbQhdMsi01Dk6Ck40In4qTBuqpWHUEP4nbsrLZMj+f hMnjwdD7xsu7KeQbjz4Ph6CZau8RXYr2aP1MFDiP5wlPBI30yqRZ6WgkjVHGBnp915XE6Z 3jwa2x9b5ru3CCNFseBPWbsyeyCw1iCAWm47EU8kvxYwQNmvgdNyxZwwCghz5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=35f0bf2d37a49a25a81e25de2ffbd7cba850be36 commit 35f0bf2d37a49a25a81e25de2ffbd7cba850be36 Author: Alexander Motin AuthorDate: 2022-01-05 16:32:44 +0000 Commit: Alexander Motin CommitDate: 2022-02-04 00:55:44 +0000 atkbd: Reduce polling rate from 10Hz to ~1Hz. In my understanding this is only needed to workaround lost interrupts. I was thinking to remove it completely, but the comment about edge- triggered interrupt may be true and needs deeper investigation. ~1Hz should be often enough to handle the supposedly rare loss cases, but rare enough to not appear in top. Add sysctl hw.atkbd.hz to tune it. MFC after: 1 month (cherry picked from commit 9e007a88d65ba0d23e73c3c052d474a78260d503) --- sys/dev/atkbdc/atkbd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 40dd698984e3..cee1207df973 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -73,6 +74,13 @@ typedef struct atkbd_state { #endif } atkbd_state_t; +static SYSCTL_NODE(_hw, OID_AUTO, atkbd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "AT keyboard"); + +static int atkbdhz = 1; +SYSCTL_INT(_hw_atkbd, OID_AUTO, hz, CTLFLAG_RWTUN, &atkbdhz, 0, + "Polling frequency (in hz)"); + static void atkbd_timeout(void *arg); static int atkbd_reset(KBDC kbdc, int flags, int c); @@ -198,8 +206,11 @@ atkbd_timeout(void *arg) kbdd_intr(kbd, NULL); } splx(s); - state = (atkbd_state_t *)kbd->kb_data; - callout_reset(&state->ks_timer, hz / 10, atkbd_timeout, arg); + if (atkbdhz > 0) { + state = (atkbd_state_t *)kbd->kb_data; + callout_reset_sbt(&state->ks_timer, SBT_1S / atkbdhz, 0, + atkbd_timeout, arg, C_PREL(1)); + } } /* LOW-LEVEL */