From nobody Tue Jul 29 22:16:58 2025 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 4bs8pL4rx6z63SKq; Tue, 29 Jul 2025 22:16:58 +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 4bs8pL3F1sz4Cvj; Tue, 29 Jul 2025 22:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753827418; 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=7kyi02tRPiXDnH2/EPNM3OME91kyo86qJK9p0zIC0Yg=; b=vZp+XgvSQzF1BFxxCZjKf3uYcgMJXlixLKfEKHMse8wL8IisWdI1iiG0+OdY6g6xruhlU5 lUUIJeEnXAzuQJOqJE7ZfNfPc3FPbK0JmS3XDZyet3roahvvHnIpJPhVetH+DaJd7qieZM 1v4sCy6ZmuEhvcDBVt9JylzMgptPd1fTLiCSf+VUJS5sSb/iOaObebqCsxyc/09mNxS+HH yelDYmxI3ww/Mlo+VRDUw0qEKV/ZVmdarXrSEK92sqNssAb1pXp/qodtJ0SsQTK9sgmK+D BiKBW0WH0SgDNv5B7vXoWdURbejFtmAplTASTuNeNesK5GS8G5r0qWKQP8JBOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753827418; 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=7kyi02tRPiXDnH2/EPNM3OME91kyo86qJK9p0zIC0Yg=; b=wosXFpdPedc7DfP6lWQU4W3zDLo8zXlOgIDn2VhdOISHxDCl0whoWSp1RBEEJWTInL1H70 WqT7FaFPhf4sc0vgMmsz5sOP6h7ZEPmmqMNARlBeu9nBv3CeiQkwH6V32y5Ij6akj3bFsC ihlTYHDRpL9rwlXXMZxFw75kjCRayVygyMC8ZEIkWpS+RooCd7FVszOHUJfSLWrMM6Bsce 5oJMIsk6iB46IbTAZlnUGzM3dp8UyEMfglYud5SrRpYR0SC9EddnPSt3L+vosFuAvQRCPI W6zQVG6koeLmhE9CnDLmGojiQRQZWnrm4dly1oXgaOFr1zYSNjt8I9L1/KSPtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753827418; a=rsa-sha256; cv=none; b=L0OqjN8kQsWo+CnhtB+NF1/oK0BIPOgBh0m7qja7WMAPMHAoelCcmaAT8yLlRbQa936vAM a7c1MQZUXCysx8/T6eLBmZXhoEljnYMDSKDUHKtKtPRTXoDwoEr2PG9A9Bmbb7wH0txL3R WvBYPuB99xmiB2fuxA+/beE/9CQVkBMGCrfrgdLzJnXiZqFVPJwGI/AFBjf+PFnV3RD2fD XVhbOenQyuD/np3ckeIwcLsxvLs6Ri3c3UoW3qnyc/JObEdW7SOadu4CBBC3oKGPZSRaeS DvU91gQjCrBHrEZOiouHVmMuRBSvcpdxB7NlSlzX/BCf4J+QeASoaOkYecLPwA== 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 4bs8pL2r0VzqPB; Tue, 29 Jul 2025 22:16:58 +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 56TMGw8Q009314; Tue, 29 Jul 2025 22:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TMGwGQ009311; Tue, 29 Jul 2025 22:16:58 GMT (envelope-from git) Date: Tue, 29 Jul 2025 22:16:58 GMT Message-Id: <202507292216.56TMGwGQ009311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 6a11b6aed8a9 - stable/14 - psm(4): Add kqueue support 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a11b6aed8a9d4dee44a151317e3c8fd0d7d6763 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=6a11b6aed8a9d4dee44a151317e3c8fd0d7d6763 commit 6a11b6aed8a9d4dee44a151317e3c8fd0d7d6763 Author: Vladimir Kondratyev AuthorDate: 2025-06-26 21:27:10 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-07-29 22:13:32 +0000 psm(4): Add kqueue support MFC after: 2 weeks (cherry picked from commit b93063c84e4e792ede844d30452d82c4fe12bdd2) --- sys/dev/atkbdc/psm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 318112e2e3e5..6b6a24ba7f31 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -598,6 +598,7 @@ static d_read_t psmread; static d_write_t psmwrite; static d_ioctl_t psmioctl; static d_poll_t psmpoll; +static d_kqfilter_t psmkqfilter; static int psmopen(struct psm_softc *); static int psmclose(struct psm_softc *); @@ -750,6 +751,7 @@ static struct cdevsw psm_cdevsw = { .d_write = psmwrite, .d_ioctl = psmioctl, .d_poll = psmpoll, + .d_kqfilter = psmkqfilter, .d_name = PSM_DRIVER_NAME, }; @@ -1946,6 +1948,7 @@ psmattach(device_t dev) sc->state = PSM_VALID; callout_init(&sc->callout, 0); callout_init(&sc->softcallout, 0); + knlist_init_mtx(&sc->rsel.si_note, &Giant); /* Setup our interrupt handler */ rid = KBDC_RID_AUX; @@ -2057,6 +2060,8 @@ psmdetach(device_t dev) destroy_dev(sc->cdev); destroy_dev(sc->bdev); + knlist_clear(&sc->rsel.si_note, 1); + knlist_destroy(&sc->rsel.si_note); callout_drain(&sc->callout); callout_drain(&sc->softcallout); @@ -5212,6 +5217,7 @@ next: wakeup(sc); } selwakeuppri(&sc->rsel, PZERO); + KNOTE_LOCKED(&sc->rsel.si_note, 0); if (sc->async != NULL) { pgsigio(&sc->async, SIGIO, 0); } @@ -5249,6 +5255,45 @@ psmpoll(struct cdev *dev, int events, struct thread *td) return (revents); } +static void +psmfilter_detach(struct knote *kn) +{ + struct psm_softc *sc = kn->kn_hook; + + knlist_remove(&sc->rsel.si_note, kn, 0); +} + +static int +psmfilter(struct knote *kn, long hint) +{ + struct psm_softc *sc = kn->kn_hook; + + GIANT_REQUIRED; + + return (sc->queue.count != 0 ? 1 : 0); +} + +static const struct filterops psmfiltops = { + .f_isfd = 1, + .f_detach = psmfilter_detach, + .f_event = psmfilter, +}; + +static int +psmkqfilter(struct cdev *dev, struct knote *kn) +{ + struct psm_softc *sc = dev->si_drv1; + + if (kn->kn_filter != EVFILT_READ) + return(EOPNOTSUPP); + + kn->kn_fop = &psmfiltops; + kn->kn_hook = sc; + knlist_add(&sc->rsel.si_note, kn, 1); + + return (0); +} + /* vendor/model specific routines */ static int mouse_id_proc1(KBDC kbdc, int res, int scale, int *status)