From nobody Fri Sep 04 23:07:25 2026 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 4hcBv66sZrz6qSG1 for ; Fri, 04 Sep 2026 23:07:30 +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 4hcBv63MSTz3mXX for ; Fri, 04 Sep 2026 23:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788563250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4M65Cv91Pbc0hGbM3MHwq/g0gHz29XuN9/OZ+d93wk=; b=r6WFsyYPnTIBZHawmTb1MLKgtrqIUa6b24Oct3Jutx42c3qU0JzTxcg1B9gj6eaANArHE2 qmYtDzLm4V3F/LwUU6xb3v2onJSQPkOXuEadRZUxv1VCJOKXhnJDE3xWT2ab/rHUIDQ95u 8OrKNV5hzL1VrKGzxm8REjzHkMR7aU9SIzfuZQ2ah5crk3w/ay0u65uJifcsE44eA2a+W6 NW31WpEHXl9fgWGQ22K0DT+VUipCWszgZx794tDMBoKz+1m2Nw4wxDbUuu4K7tYOuYdvZC Z9ofN/4lnYH/xfhW4GAWJ+cdjMKydGwYo9Zra8qNZ1hpBWKoPlfEvCb928Wsuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788563250; a=rsa-sha256; cv=none; b=eGxDvYqvObNQhnbe2nLVe7zBjjItrFfBcaBpEvYnVnPvrBosVCtD14Kz1D9ESiCQf1y1Lr btVo96bPy+ObtsaaaEtfw8XWKL7ROloludkxaKgXiqaCgvpRl10wisnKxJsrbIes+zdvur qyOXzH/q+kx3n3+DcTUUO8zXX4VE4zHuTnzZhv6we90LGMgcC1/fVegNLAChfxKdjJdVrF y0DdTtrOxHBUovqDGPqbWP8J04ilk8nkUeC/nf7ssysSt4E9infQ8xRlVZGMtSPgefaSa3 b7YuIfKYq3aWt+myOp8p6/BwVzenxZgfNyajACrw4OoLxwqkL/fEiFfROW9EFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788563250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/4M65Cv91Pbc0hGbM3MHwq/g0gHz29XuN9/OZ+d93wk=; b=OkMOfaZgBsqwNXiKb9rPG3xE9SMMmCPkJ3p4WEutuXdlyxgyDW0g65fkjWMCDZE0lTUKii 6eBRjVsRg81rQ209qZI5owdEAB3DM7igunHDvHehfz+AnEWN+g/wSPkATVZMJJ8zOAbDjO bgsQDutdR+Y+hGJkrZk410jg4KLL2ugybnEdYp2VQnnjU4EXq6FYQoKttguU9AzWHItUeY GVPFVTKS55ULZNfxFODNezU2CMW9sbV/beB0OGQwHk1YfhKdPU25cJ4iNuR4Lk/lvq0L5Z LDSTPUi1vNEAW87nnQUWoJHykMc/6flrilUtwjOVx4D/YXYxTv3HJ1cHVdjPMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcBv61fZ1z4kR for ; Fri, 04 Sep 2026 23:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43672 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 23:07:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Vladimir Kondratyev From: Enji Cooper Subject: git: 7b3d39ef34c2 - stable/15 - asmc(4): Add support for backlight(9) interface 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 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7b3d39ef34c24a25b782a6898ca4501f78de9134 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 23:07:25 +0000 Message-Id: <6a9b4f2d.43672.50fd5dca@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7b3d39ef34c24a25b782a6898ca4501f78de9134 commit 7b3d39ef34c24a25b782a6898ca4501f78de9134 Author: Vladimir Kondratyev AuthorDate: 2026-03-29 19:00:59 +0000 Commit: Enji Cooper CommitDate: 2026-09-04 23:06:45 +0000 asmc(4): Add support for backlight(9) interface MFC after: 1 month (cherry picked from commit 5d7862fb998f48ba71dac7e34106aaad350db348) --- share/man/man4/asmc.4 | 11 +++++++- sys/dev/asmc/asmc.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/asmc/asmcvar.h | 2 ++ sys/modules/asmc/Makefile | 3 ++- 4 files changed, 80 insertions(+), 2 deletions(-) diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4 index 4bc2a040bbce..f3eddcaf965e 100644 --- a/share/man/man4/asmc.4 +++ b/share/man/man4/asmc.4 @@ -79,7 +79,9 @@ On systems, you can control the keyboard brightness by writing a value to the .Va dev.asmc.%d.light.control -sysctl MIB. +sysctl MIB or with +.Xr backlight 8 +utility. .Pp The following sysctl MIBs contains the raw value returned by the left and right light sensors: @@ -143,8 +145,15 @@ dramatically reduce your hard drive's life span. Do not rely solely on the SMS to protect your hard drive: good care and common sense can increase your hard drive's life. +.Sh FILES +.Bl -tag -width ".Pa /dev/backlight/asmc0" -compact +.It Pa /dev/backlight/asmc0 +Keyboard +.Xr backlight 8 +device node. .Sh SEE ALSO .Xr ataidle 8 Pq Pa ports/sysutils/ataidle , +.Xr backlight 8 , .Xr devd 8 , .Xr sysctl 8 .Sh HISTORY diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index f39eef63aef4..4a6734e22786 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -58,6 +58,9 @@ #include #include +#include +#include "backlight_if.h" + /* * Device interface. */ @@ -66,6 +69,15 @@ static int asmc_attach(device_t dev); static int asmc_detach(device_t dev); static int asmc_resume(device_t dev); +/* + * Backlight interface. + */ +static int asmc_backlight_update_status(device_t dev, + struct backlight_props *props); +static int asmc_backlight_get_status(device_t dev, + struct backlight_props *props); +static int asmc_backlight_get_info(device_t dev, struct backlight_info *info); + /* * SMC functions. */ @@ -581,6 +593,12 @@ static device_method_t asmc_methods[] = { DEVMETHOD(device_attach, asmc_attach), DEVMETHOD(device_detach, asmc_detach), DEVMETHOD(device_resume, asmc_resume), + + /* Backlight interface */ + DEVMETHOD(backlight_update_status, asmc_backlight_update_status), + DEVMETHOD(backlight_get_status, asmc_backlight_get_status), + DEVMETHOD(backlight_get_info, asmc_backlight_get_info), + DEVMETHOD_END }; @@ -609,6 +627,7 @@ static unsigned int light_control = 0; ACPI_PNP_INFO(asmc_ids); DRIVER_MODULE(asmc, acpi, asmc_driver, NULL, NULL); MODULE_DEPEND(asmc, acpi, 1, 1, 1); +MODULE_DEPEND(asmc, backlight, 1, 1, 1); static const struct asmc_model * asmc_match(device_t dev) @@ -800,6 +819,13 @@ asmc_attach(device_t dev) CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, dev, 0, model->smc_light_control, "I", "Keyboard backlight brightness control"); + + sc->sc_kbd_bkl = backlight_register("asmc", dev); + if (sc->sc_kbd_bkl == NULL) { + device_printf(dev, "Can not register backlight\n"); + ret = ENXIO; + goto err; + } } if (model->smc_sms_x == NULL) @@ -882,6 +908,9 @@ asmc_detach(device_t dev) { struct asmc_softc *sc = device_get_softc(dev); + if (sc->sc_kbd_bkl != NULL) + backlight_destroy(sc->sc_kbd_bkl); + if (sc->sc_sms_tq) { taskqueue_drain(sc->sc_sms_tq, &sc->sc_sms_task); taskqueue_free(sc->sc_sms_tq); @@ -1739,6 +1768,7 @@ static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; + struct asmc_softc *sc = device_get_softc(dev); uint8_t buf[2]; int error; int v; @@ -1750,6 +1780,7 @@ asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS) if (v < 0 || v > 255) return (EINVAL); light_control = v; + sc->sc_kbd_bkl_level = v * 100 / 255; buf[0] = light_control; buf[1] = 0x00; asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); @@ -1817,3 +1848,38 @@ asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) return (0); } + +static int +asmc_backlight_update_status(device_t dev, struct backlight_props *props) +{ + struct asmc_softc *sc = device_get_softc(dev); + uint8_t buf[2]; + + sc->sc_kbd_bkl_level = props->brightness; + light_control = props->brightness * 255 / 100; + buf[0] = light_control; + buf[1] = 0x00; + asmc_key_write(dev, ASMC_KEY_LIGHTVALUE, buf, sizeof(buf)); + + return (0); +} + +static int +asmc_backlight_get_status(device_t dev, struct backlight_props *props) +{ + struct asmc_softc *sc = device_get_softc(dev); + + props->brightness = sc->sc_kbd_bkl_level; + props->nlevels = 0; + + return (0); +} + +static int +asmc_backlight_get_info(device_t dev, struct backlight_info *info) +{ + info->type = BACKLIGHT_TYPE_KEYBOARD; + strlcpy(info->name, "Apple MacBook Keyboard", BACKLIGHTMAXNAMELENGTH); + + return (0); +} diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 95a117f59533..cfc176559ed9 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -51,6 +51,8 @@ struct asmc_softc { struct taskqueue *sc_sms_tq; struct task sc_sms_task; uint8_t sc_sms_intr_works; + struct cdev *sc_kbd_bkl; + uint32_t sc_kbd_bkl_level; }; /* diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index 4ba45a4625d8..17f6c7eec731 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,6 +1,7 @@ .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc -SRCS= asmc.c opt_acpi.h opt_asmc.h acpi_if.h bus_if.h device_if.h +SRCS= asmc.c opt_acpi.h opt_asmc.h +SRCS+= acpi_if.h backlight_if.h bus_if.h device_if.h .include