From nobody Thu Oct 08 20:44:24 2026 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 4j126K0Kwdz4n37C for ; Thu, 08 Oct 2026 20:44:25 +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 4j126J2zm1z4cVF for ; Thu, 08 Oct 2026 20:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492264; 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=qvd2LJQWxFzV4j2pC+PIhv3Jw0xcTIJ+dInc/If9hSo=; b=BsVarHJK7h6x/aMEvurRyIO4qCktF1lO2ahh8aGGA1WIGjadpMmIElopmehsx6pHhdrpVj b5xtXykdIauJyEYRYFiUFIbi4Fe7lVCIU0g2mLksEqGGIRB4LpaX37B5M93arG0/s67dY2 cIjr6sxuf4TPjC+542WTGbxj3EQKQN8Hs9eSB6d7iQx6o7L8mLlV9TXlIB5aKboMhg0ohR ZklXWyS9NO4aVnGHugGlpyF3vOnNiRbkAGAAaO3hXjh1TUiydCL07P0+qOXaycS0/U5Ts8 vy3AcY/VTt0q4z77JsyF7PPlUHxVqF/NKXrQX2+iusBYymsLiXo/5lDdh8VVog== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492264; b=QwTB5NWAYHVgOktE9feBbalFZnPe9/CcZzIWR2JLBPSM2zvAZE1UFVkOjoozG9s7ORejZx N6ygYibZyagXDpt6ntwcAv26l7EhJwKeIOiRhUGwk/sb9oirrAi9dHMgYiVb9rcRpZHG2b vs+hs7Wk9I50O0ibFSShOMCqm6nD4bJkNzwlsViyV1qLV0qJw7b0FN2XUtusxdXWDf32lL SD87BBHyS5Xw1wNqfUupUvM18f1q/h0pskt0IgsE+gDZGTpV8eck2IkstgpHFDEKcO1x+/ C1y81oxR9thCImuIjcaiY4UAU5QY+8hHtQn7xQB1zP8E/8W5f/fPkiuInb3HqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492264; 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=qvd2LJQWxFzV4j2pC+PIhv3Jw0xcTIJ+dInc/If9hSo=; b=Jvry8+ngYd5gjxRowx2sENSUm6W/zZGz0GaVsVAQm9EPnIqNiwMhrn5Ai5Gt12FNxOF2Bm QaiWq2rDNY46lztqORXOUwvx5TjevL5KjzJ1pdXyO57skfkXEeT8jsMlziyxHeWAiVic1F /S+dfKmMEyWlyZS9KL5euY0kN/k2PUlmMxyrMDX8s2cqRNOKYvOOCldmq/O7UjrAQp2UtC Qgdjl1VupgTRdmlMk6/6Awsi2BI6No4bw6e37EdWlF+qeeOA4CIJtxxUzCb8w+nkNBCj1Y 21++43kvLGxAgBCnLWgsuBJPISDDyYqseZ48JhPjMEUCXMX8PWZLSzu+G4X2qQ== 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 4j126J1gqFzwZL for ; Thu, 08 Oct 2026 20:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 319e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9530d4e997fa - stable/15 - acpi/apm: Store the ACPI softc in si_drv1 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9530d4e997fade452cfce596a5dac0dc5be6257f Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:24 +0000 Message-Id: <6ac800a8.319e0.41c12725@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9530d4e997fade452cfce596a5dac0dc5be6257f commit 9530d4e997fade452cfce596a5dac0dc5be6257f Author: John Baldwin AuthorDate: 2026-09-30 16:21:34 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:33 +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 (cherry picked from commit 8cf4fe39e8ec301e582b63099252b4adab740c60) --- 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 318f83d8d922..3a8053726228 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: @@ -435,11 +433,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"); }