On 22. 12. 6., Cy Schubert wrote:
In message <202210280205.29s25mz5011...@gitrepo.freebsd.org>, Jung-uk Kim
write
s:
The branch main has been updated by jkim:

URL: https://cgit.FreeBSD.org/src/commit/?id=9a4bc5208fad4d69360dbbe769e28a37
419c4e21

commit 9a4bc5208fad4d69360dbbe769e28a37419c4e21
Author:     Jung-uk Kim <j...@freebsd.org>
AuthorDate: 2022-10-27 21:34:40 +0000
Commit:     Jung-uk Kim <j...@freebsd.org>
CommitDate: 2022-10-28 02:03:50 +0000

     acpica: Import ACPICA 20221020
(cherry picked from commit a799bdd9d50e84cd6a36e8f1d2ac4301b2a6b374)
---
  sys/contrib/dev/acpica/common/acfileio.c           | 131 ++++++--
  sys/contrib/dev/acpica/common/adisasm.c            |   4 +-
  sys/contrib/dev/acpica/common/ahtable.c            |   2 +
  sys/contrib/dev/acpica/common/ahuuids.c            |   3 +
  sys/contrib/dev/acpica/common/dmtable.c            | 116 ++++---
  sys/contrib/dev/acpica/common/dmtables.c           |   2 +-
  sys/contrib/dev/acpica/common/dmtbdump.c           |   4 +-
  sys/contrib/dev/acpica/common/dmtbdump1.c          | 205 ++++++++++++-
  sys/contrib/dev/acpica/common/dmtbdump2.c          | 100 ++++--
  sys/contrib/dev/acpica/common/dmtbinfo1.c          | 110 +++++++
  sys/contrib/dev/acpica/common/dmtbinfo2.c          |  33 +-
  sys/contrib/dev/acpica/common/dmtbinfo3.c          |  17 ++
  sys/contrib/dev/acpica/compiler/aslcodegen.c       |  75 ++++-
  sys/contrib/dev/acpica/compiler/aslcompile.c       |  12 +-
  sys/contrib/dev/acpica/compiler/aslerror.c         |   1 -
  sys/contrib/dev/acpica/compiler/aslhelp.c          |   1 +
  sys/contrib/dev/acpica/compiler/asloptions.c       |  30 +-
  sys/contrib/dev/acpica/compiler/aslpredef.c        |   2 +-
  sys/contrib/dev/acpica/compiler/aslprune.c         |   8 +
  sys/contrib/dev/acpica/compiler/aslstartup.c       |   2 +-
  sys/contrib/dev/acpica/compiler/dtcompile.c        |  42 +++
  sys/contrib/dev/acpica/compiler/dtcompiler.h       |  10 +
  sys/contrib/dev/acpica/compiler/dtio.c             |   2 +-
  sys/contrib/dev/acpica/compiler/dttable1.c         | 128 +++++++-
  sys/contrib/dev/acpica/compiler/dttable2.c         | 169 +++++++++--
  sys/contrib/dev/acpica/compiler/dttemplate.h       |  63 +++-
  sys/contrib/dev/acpica/compiler/dtutils.c          |   3 +-
  .../dev/acpica/components/debugger/dbutils.c       | 192 ++++++++++++
  sys/contrib/dev/acpica/components/events/evevent.c |  11 +-
  .../dev/acpica/components/events/evregion.c        |   8 +
  .../dev/acpica/components/executer/exfield.c       |   6 +-
  .../dev/acpica/components/executer/exserial.c      |   6 +
  .../dev/acpica/components/hardware/hwsleep.c       |  10 +
  sys/contrib/dev/acpica/components/tables/tbdata.c  |   2 +-
  sys/contrib/dev/acpica/components/tables/tbfadt.c  |   2 +-
  sys/contrib/dev/acpica/components/tables/tbprint.c |  90 +-----
  sys/contrib/dev/acpica/components/tables/tbutils.c |   2 +-
  .../dev/acpica/components/tables/tbxfroot.c        |  32 +-
  .../dev/acpica/components/utilities/utcksum.c      | 335 +++++++++++++++++++
++
  .../dev/acpica/components/utilities/utglobal.c     |   1 +
  .../dev/acpica/components/utilities/utstring.c     |  10 +-
  sys/contrib/dev/acpica/include/acconfig.h          |   2 +
  sys/contrib/dev/acpica/include/acdisasm.h          |  19 ++
  sys/contrib/dev/acpica/include/acglobal.h          |   1 +
  sys/contrib/dev/acpica/include/acpixf.h            |   2 +-
  sys/contrib/dev/acpica/include/actables.h          |  10 -
  sys/contrib/dev/acpica/include/actbinfo.h          |  10 +
  sys/contrib/dev/acpica/include/actbl1.h            | 179 ++++++++++-
  sys/contrib/dev/acpica/include/actbl2.h            | 163 +++++++++-
  sys/contrib/dev/acpica/include/actypes.h           |   9 +-
  sys/contrib/dev/acpica/include/acutils.h           |  25 ++
  sys/contrib/dev/acpica/include/acuuid.h            |   3 +-
  52 files changed, 2121 insertions(+), 284 deletions(-)

This broke Wake-on-LAN on my Acer laptop. Sending a WOL signal to the
laptop fails to wake the machine. However, pulling the power cord, plugging
it back in, and then sending a WOL signal does wake it. This led me to
believe this commit was the cause of the problem.

To remediate I applied the following patch, essentially reverting two small
patches within this commit. This fixes my WOL problem.

diff --git a/sys/contrib/dev/acpica/components/events/evevent.c
b/sys/contrib/dev/acpica/components/events/evevent.c
index 07c06c7c7839..1eb1262b92ea 100644
--- a/sys/contrib/dev/acpica/components/events/evevent.c
+++ b/sys/contrib/dev/acpica/components/events/evevent.c
@@ -312,8 +312,7 @@ AcpiEvFixedEventInitialize (
          {
              Status = AcpiWriteBitRegister (
                  AcpiGbl_FixedEventInfo[i].EnableRegisterId,
-                (i == ACPI_EVENT_PCIE_WAKE) ?
-                ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT);
+                ACPI_DISABLE_EVENT);
              if (ACPI_FAILURE (Status))
              {
                  return (Status);
@@ -437,8 +436,7 @@ AcpiEvFixedEventDispatch (
      {
          (void) AcpiWriteBitRegister (
              AcpiGbl_FixedEventInfo[Event].EnableRegisterId,
-            (Event == ACPI_EVENT_PCIE_WAKE) ?
-           ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT);
+           ACPI_DISABLE_EVENT);
ACPI_ERROR ((AE_INFO,
              "No installed handler for fixed event - %s (%u), disabling",

Sorry to hear.  It was added by the following commit.

https://github.com/acpica/acpica/commit/32d875705c8ee8f99fd8b78dbed48633486a7640

Can you please file an upstream PR?

https://github.com/acpica/acpica/issues

Thanks!

Jung-uk Kim

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to