From nobody Fri Mar 07 16:01:03 2025 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 4Z8WH40g2Tz5pWsT; Fri, 07 Mar 2025 16:01:04 +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 4Z8WH338Vrz3fC5; Fri, 07 Mar 2025 16:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741363263; 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=36PFfkLPakNStPxDENd4fcacZjBv41TDTdYicLJABpo=; b=ElHrR6b2EBsxKDO0PWeCPw4AFTt7aqjLlnUe3DSwU8oEJt8bUPraN6TWiWIFs0AdDiZnHs gS9Kn+ug4wfj0RkEbnkBwVjMYTinnvddItIhNmbbJ2P/0g7kW0Mk/Xcl33QOgoZowQCYe/ XBsZioE7x1ZfIyViZU01NjesKkWXZu5UdtcpHoNKkrlzgEpXqHSXTkT7RCk1+T9MJdqGNP tJs42JU6EJykojaRjbxXiDk6jFDr4Y40kSFiuyGWs4+40xkTn5VUBH3EgkxO2wzpF54424 eEzixBYR/NkKOw3rcEFwpp5cAsfEHfBVbaKu3mI0UlQu7wEG1gdHTx0PTG0kXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741363263; a=rsa-sha256; cv=none; b=gV4p5lojyCDkSflQqq+pAKlrYxZYzVoMV7gPkMb752B36v5BL7+XENgkzhFfDaPw8k8tgk zK1fcHvafuGuyC45hbp6sJ+mC+Q466++sPqRrFadOV4Jia/OSVChdqxDyHvqYhnsdcQC4p 1/LiHbX/ETFzmZoUYtffmg+mi0k+FsPfCW9+Eci2zFdbsiuY+AfliZYTXh/z9qxzTbEy9F JcEy3u6HoPOc7ZgOMcnur2IBjJOcv2uKx4bxh4SjzimkWY9lc529Qy/B4cReajTpxf+/nv X1C+O4udDUdcHy7p+xZEhWyy6nqoJuPv47Fh21uWlc/8Ez8CWf+Z7qeDVMEzXw== 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=1741363263; 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=36PFfkLPakNStPxDENd4fcacZjBv41TDTdYicLJABpo=; b=Yg61TNllc69jHHcUTdgKRK10nTSql5WCZbOSdl6WBCaBYnWr/fFb9JlYFnZ5SYKuAbKr74 fmM9FPzOXUljvSxHxwid3+NJrN00fariF3SJXkCjfYLKvVyu1LHYtRbZb0+xpNvQ/wywex 6wIeTzHumcm5ODsSMFa+WDcyMUTtNdXC3suHZZZig7r4Kpg1bnSuknWL+jr9YFIxnmJmP1 2olI5IJqShCkjjGncTeGKOThl2ookSB5bjHvmKQJ+2Tm4PCkPtNj7YlAetkHmTH+o/aA1S NSgCZVzfHWydHDxMAAE3WTrubHTdih6f21NP5WJRxMYlWNl/lfoxUQY64P0jXQ== 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 4Z8WH32mF1zkjG; Fri, 07 Mar 2025 16:01:03 +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 527G13Lg070737; Fri, 7 Mar 2025 16:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527G13of070734; Fri, 7 Mar 2025 16:01:03 GMT (envelope-from git) Date: Fri, 7 Mar 2025 16:01:03 GMT Message-Id: <202503071601.527G13of070734@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: adc2c156acb5 - main - gpioaei: Add support for ACPI _EVT method 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 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: adc2c156acb50bac6e8ec66b72cadc8910ce4975 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=adc2c156acb50bac6e8ec66b72cadc8910ce4975 commit adc2c156acb50bac6e8ec66b72cadc8910ce4975 Author: Vladimir Kondratyev AuthorDate: 2025-03-07 15:59:12 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-07 15:59:12 +0000 gpioaei: Add support for ACPI _EVT method This method is often used to process GPIO "Power on" button press on modern x86 laptops with S0ix sleep mode. Tested with patch from https://reviews.freebsd.org/D26407 Sponsored by: Future Crew LLC MFC after: 2 month --- sys/dev/gpio/gpioaei.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index 050f259a2127..f43674b53c7d 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -39,9 +39,16 @@ #include #include +enum gpio_aei_type { + ACPI_AEI_TYPE_UNKNOWN, + ACPI_AEI_TYPE_ELX, + ACPI_AEI_TYPE_EVT +}; + struct gpio_aei_softc { ACPI_HANDLE handle; - char objname[5]; /* "_EXX" or "_LXX" */ + enum gpio_aei_type type; + int pin; struct resource * intr_res; int intr_rid; void * intr_cookie; @@ -60,8 +67,11 @@ gpio_aei_intr(void * arg) { struct gpio_aei_softc * sc = arg; - /* Ask ACPI to run the appropriate _Exx or _Lxx method. */ - AcpiEvaluateObject(sc->handle, sc->objname, NULL, NULL); + /* Ask ACPI to run the appropriate _EVT, _Exx or _Lxx method. */ + if (sc->type == ACPI_AEI_TYPE_EVT) + acpi_SetInteger(sc->handle, NULL, sc->pin); + else + AcpiEvaluateObject(sc->handle, NULL, NULL, NULL); } static int @@ -69,23 +79,35 @@ gpio_aei_attach(device_t dev) { struct gpio_aei_softc * sc = device_get_softc(dev); gpio_pin_t pin; + ACPI_HANDLE handle; int err; /* This is us. */ device_set_desc(dev, "ACPI Event Information Device"); /* Store parameters needed by gpio_aei_intr. */ - sc->handle = acpi_gpiobus_get_handle(dev); + handle = acpi_gpiobus_get_handle(dev); if (gpio_pin_get_by_acpi_index(dev, 0, &pin) != 0) { device_printf(dev, "Unable to get the input pin\n"); return (ENXIO); } - sprintf(sc->objname, "_%c%02X", - (pin->flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin->pin); - /* Support for GPIO pins > 255 is not implemented. */ - if (pin->pin > 255) { - device_printf(dev, "ACPI Event Information Device does not support pins > 255"); + sc->type = ACPI_AEI_TYPE_UNKNOWN; + sc->pin = pin->pin; + if (pin->pin <= 255) { + char objname[5]; /* "_EXX" or "_LXX" */ + sprintf(objname, "_%c%02X", + (pin->flags & GPIO_INTR_EDGE_MASK) ? 'E' : 'L', pin->pin); + if (ACPI_SUCCESS(AcpiGetHandle(handle, objname, &sc->handle))) + sc->type = ACPI_AEI_TYPE_ELX; + } + if (sc->type == ACPI_AEI_TYPE_UNKNOWN) { + if (ACPI_SUCCESS(AcpiGetHandle(handle, "_EVT", &sc->handle))) + sc->type = ACPI_AEI_TYPE_EVT; + } + + if (sc->type == ACPI_AEI_TYPE_UNKNOWN) { + device_printf(dev, "ACPI Event Information Device type is unknown"); return (ENOTSUP); }