From nobody Thu Jun 26 21:27:46 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 4bSsGq4TBMz5yp71; Thu, 26 Jun 2025 21:27:47 +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 4bSsGq0dWFz3sCV; Thu, 26 Jun 2025 21:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750973267; 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=6xVrkHpmKyZ/YeZ8GJL/dCaBvhSVMglkIXkb9wuvEDo=; b=NFGhm54/6Ekz8535auQLuIDzGmN/u2FUoEXUeMi0u9aql2k1DwUMH8sW02YDSkbu2Sl+5F H0UJx8cv9mCBfKMpn66e3ZyllobBMBAXbjThm3KS4CtRnsHCUpCNUP8jy/gTs/4tR6Ffk3 rQZAXM22WI1OwhbpQbe5dC1aBYZqfPXdwV+5MGU1v2LE99wUZ9RGlWLnXSbX1qI2d/7I9S XrOPNHTf+asAMqYh+YAlfRAuvEqnX9+4fnrAP87NvJZ1MEecvenR+UjhbBqPxXhUocyBi0 Er72LShHtp9bCC+FoSfSUxaQ+BX73affCjl3eVgberFVuZibbeLrUD+g14Uq1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750973267; 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=6xVrkHpmKyZ/YeZ8GJL/dCaBvhSVMglkIXkb9wuvEDo=; b=DwdVEdfiO4kVaYE7X6YVT7LauXFcUvyKJNGYuYAZ/6D2V7s74oUnrV7FApQ3WfORejYnBK MvLfYvjfoPqUfrt5xRYyTRV+KojOCnwZLlxI6hdHeoaxlc0qT207DjqUarjj7vJtuUz2/v /m0Ec37A43giQERYN0IFd71s2g6dGh40s452bUrxTr4SmU6zd39/Pm/YsHUBUSJPl1N5V4 oI8oci/t81cu2zpPt/d/4mjZFj/0SQE41KtYJCTEAFud9golwl+dasibxGpxyG3KGkCRox Qrt9AgUBMYVjPQziVJHkllyeVNVPRQ3n6CH1mrO00PTNEKiOt/njwXDyeTFWhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750973267; a=rsa-sha256; cv=none; b=mVLdBwwIZKLASgi49b66zocAPKqu0idSlHtI6TikhM+cgJfAWqTp/93TYKORnQWJPGhmIW PuZMdmM9/IRZe9dMzLoj8LDixmnjYmyCBOs5cVJ7O0f4Gaj10ay7ILrzJS6fzZJjn2W9AN 0PW1i6XPaJZ0A9JakzFN9IvCQMuqiBgtkJL+18vdmZPvvEMD2m2OqHU24xBc3bzjhnZ8tP 1fF8EbqFO/ZjL8QmUphIwFpSzjfvEpxcQxQrGRWgo0WneKvHEsfxxb7ws6anKzxNkRGVdd acgxGWymGTdjaYITFc3d8ParkBos0rWh3iPTwAWpFr9LDMP6Oyg3ejlxFasVvg== 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 4bSsGp6brnz4g8; Thu, 26 Jun 2025 21:27:46 +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 55QLRkMM048936; Thu, 26 Jun 2025 21:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QLRkFO048933; Thu, 26 Jun 2025 21:27:46 GMT (envelope-from git) Date: Thu, 26 Jun 2025 21:27:46 GMT Message-Id: <202506262127.55QLRkFO048933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b93063c84e4e - main - 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/main X-Git-Reftype: branch X-Git-Commit: b93063c84e4e792ede844d30452d82c4fe12bdd2 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b93063c84e4e792ede844d30452d82c4fe12bdd2 commit b93063c84e4e792ede844d30452d82c4fe12bdd2 Author: Vladimir Kondratyev AuthorDate: 2025-06-26 21:27:10 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-06-26 21:27:10 +0000 psm(4): Add kqueue support MFC after: 2 weeks --- 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 1a02dbcec020..4a84a0cb6bcb 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -607,6 +607,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 *); @@ -759,6 +760,7 @@ static struct cdevsw psm_cdevsw = { .d_write = psmwrite, .d_ioctl = psmioctl, .d_poll = psmpoll, + .d_kqfilter = psmkqfilter, .d_name = PSM_DRIVER_NAME, }; @@ -1955,6 +1957,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; @@ -2066,6 +2069,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); @@ -5221,6 +5226,7 @@ next: wakeup(sc); } selwakeuppri(&sc->rsel, PZERO); + KNOTE_LOCKED(&sc->rsel.si_note, 0); if (sc->async != NULL) { pgsigio(&sc->async, SIGIO, 0); } @@ -5258,6 +5264,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)