From nobody Wed Sep 30 16:27:39 2026 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 4hw0nm1dNLz6tn7J for ; Wed, 30 Sep 2026 16:27:40 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw0nl5cCbz4bbJ for ; Wed, 30 Sep 2026 16:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790785659; 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=kxyAupe8iE/fznM947MDU6lGmTfxBKNjT1cBZZYflOg=; b=bcs6yyzTOcl45RwgWprfc6JPM9ta9QcB319Xyp4GJiEh+iIa/pb+vlAIdfaA2ULc2EhstZ Gd2GU3Ag+CirHnmLIBRjZYKIVUdXkG2+Ffi331/fDzitgdYh+zWexkmoa0th2IYctV6wAH 1IChoR0NEF9fCk1G5tbDhSiFNmO43xyRscOuNzThFaLZKdP5R0+/lNOfYC1LJBpwOcNYMp RuVmKoU3H5cXyw/wwg7Ija30g7bMwcetReqIwliTpiFiy8w71oTWPsX+YMPFWcqqyiL3Ss f8fNm+wZEZN5Ppv3PCDvLeT3Pjhr8Nzs0MsjtVNViglPs9s6m/Rum2ZzOSjvjQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790785659; b=tatc16/PL9f6C/r76nnfF8b/lZgfp0zxreO4IYrbl3RKK60jbApgSp/yuotGLpziBrf28J qJRftb9jM1LoiKx7AwgOFw7T3g0N9PCKUUs+/xZalrLeEGM8BzFESXrPcyoH/VAyPsGFCT bQv/wbOUVhyZ29HI0RPDO4+Qq/kfF9gYSSks31xjs+ahZkblRBe+RqeX7WzucoiR60XBJT MaQTMwigyCzQdL/c50A3NMvzIdRewrcPfoIMiYJ/NY+e/B6rWMIVMMYdqmRS3S8KXkpSkx ZU4WvXX/153QafqCD6E6Xh1QvMn1L3fpIwI+dTKK1mXuWGLLoEvV0QELbkXlFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790785659; 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=kxyAupe8iE/fznM947MDU6lGmTfxBKNjT1cBZZYflOg=; b=Tq9nC4EuOrMuknsphIxU0fr1wfElPDpI2RPadaRUEUqeyQVYCIlwY2MJH0jxRtgWzbq6/3 2Bcj6ZiZTbMc880G2ouZlfp4jz0P5dLxDbhYZEeBeKJ+uIWM+lPazrMsqnklKVLFa2OD88 XUIbA54R0tJ6q2XvYenH5P1eKcC2Kku2e4vgOR3oaBcnSAp1n6OIYgus/B7MrKShMo8pq/ W0gTLFbncnuzkwZSdJne/dh4ZRDEe18Eb7xRM9meZH9C07ntXnC9vxMYKzX8b1JWLmVHg9 UdlApvNYc2EsE1e/mRjy5vQ1RT+uk7In9TXntlyzRqC7pTX78H9Aox4xMni1Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hw0nl4PdnztKT for ; Wed, 30 Sep 2026 16:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 16:27:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8cf4fe39e8ec - main - acpi/apm: Store the ACPI softc in si_drv1 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cf4fe39e8ec301e582b63099252b4adab740c60 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 16:27:39 +0000 Message-Id: <6abd387b.35c7e.51eb90d8@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8cf4fe39e8ec301e582b63099252b4adab740c60 commit 8cf4fe39e8ec301e582b63099252b4adab740c60 Author: John Baldwin AuthorDate: 2026-09-30 16:21:34 +0000 Commit: John Baldwin CommitDate: 2026-09-30 16:21:34 +0000 acpi/apm: Store the ACPI softc in si_drv1 This avoids looking it up via a slower path in apmopen. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D59940 --- sys/x86/acpica/acpi_apm.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index b314f5e5e705..e1addc46c38c 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -252,10 +252,9 @@ apmdtor(void *data) static int apmopen(struct cdev *dev, int flag, int fmt, struct thread *td) { - struct acpi_softc *acpi_sc; + struct acpi_softc *acpi_sc = dev->si_drv1; struct apm_clone_data *clone; - acpi_sc = devclass_get_softc(devclass_find("acpi"), 0); clone = apm_create_clone(dev, acpi_sc); devfs_set_cdevpriv(clone, apmdtor); @@ -271,14 +270,13 @@ apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td { int error; struct apm_clone_data *clone; - struct acpi_softc *acpi_sc; + struct acpi_softc *acpi_sc = dev->si_drv1; struct apm_info info; struct apm_event_info *ev_info; apm_info_old_t aiop; error = 0; devfs_get_cdevpriv((void **)&clone); - acpi_sc = clone->acpi_sc; switch (cmd) { case APMIO_SUSPEND: @@ -436,11 +434,20 @@ apmreadfilt(struct knote *kn, long hint) void acpi_apm_init(struct acpi_softc *sc) { + struct make_dev_args args; + struct cdev *dev; /* Create a clone for /dev/acpi also. */ STAILQ_INIT(&sc->apm_cdevs); sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc); - make_dev(&apm_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0660, "apmctl"); - make_dev(&apm_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0664, "apm"); + make_dev_args_init(&args); + args.mda_devsw = &apm_cdevsw; + args.mda_uid = UID_ROOT; + args.mda_gid = GID_OPERATOR; + args.mda_mode = 0664; + args.mda_si_drv1 = sc; + args.mda_flags = MAKEDEV_ETERNAL; + make_dev_s(&args, &dev, "apmctl"); + make_dev_s(&args, &dev, "apm"); }