[PATCH] acpi: enable & disable acpi tables for arm64

Alex Hung alex.hung at canonical.com
Thu Dec 17 20:27:33 UTC 2020


See https://www.kernel.org/doc/html/latest/arm64/acpi_object_usage.html

Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 src/acpi/boot/boot.c | 2 +-
 src/acpi/dbgp/dbgp.c | 2 +-
 src/acpi/lpit/lpit.c | 2 +-
 src/acpi/mcfg/mcfg.c | 3 ---
 src/acpi/msdm/msdm.c | 2 +-
 src/acpi/rsdt/rsdt.c | 2 +-
 src/acpi/slic/slic.c | 2 +-
 src/acpi/waet/waet.c | 2 +-
 src/acpi/wdat/wdat.c | 2 +-
 src/acpi/wpbt/wpbt.c | 2 +-
 10 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c
index 339619cc..ad063459 100644
--- a/src/acpi/boot/boot.c
+++ b/src/acpi/boot/boot.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c
index 68e7bc46..c6a69869 100644
--- a/src/acpi/dbgp/dbgp.c
+++ b/src/acpi/dbgp/dbgp.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c
index f09f158a..5b5e45f5 100644
--- a/src/acpi/lpit/lpit.c
+++ b/src/acpi/lpit/lpit.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c
index 7f92a2a3..c5295873 100644
--- a/src/acpi/mcfg/mcfg.c
+++ b/src/acpi/mcfg/mcfg.c
@@ -18,8 +18,6 @@
  */
 #include "fwts.h"
 
-#ifdef FWTS_ARCH_INTEL
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -254,4 +252,3 @@ static fwts_framework_ops mcfg_ops = {
 
 FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI)
 
-#endif
diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c
index d8368b3c..16402414 100644
--- a/src/acpi/msdm/msdm.c
+++ b/src/acpi/msdm/msdm.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/rsdt/rsdt.c b/src/acpi/rsdt/rsdt.c
index 37d52161..c57f697a 100644
--- a/src/acpi/rsdt/rsdt.c
+++ b/src/acpi/rsdt/rsdt.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
index dafd6784..3468e0ee 100644
--- a/src/acpi/slic/slic.c
+++ b/src/acpi/slic/slic.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c
index 91fcd73b..5efdce07 100644
--- a/src/acpi/waet/waet.c
+++ b/src/acpi/waet/waet.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c
index 399e5142..37466396 100644
--- a/src/acpi/wdat/wdat.c
+++ b/src/acpi/wdat/wdat.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/acpi/wpbt/wpbt.c b/src/acpi/wpbt/wpbt.c
index 9817e57c..b75b3f29 100644
--- a/src/acpi/wpbt/wpbt.c
+++ b/src/acpi/wpbt/wpbt.c
@@ -18,7 +18,7 @@
  */
 #include "fwts.h"
 
-#if defined(FWTS_HAS_ACPI)
+#if defined(FWTS_HAS_ACPI) && !(FWTS_ARCH_AARCH64)
 
 #include <stdlib.h>
 #include <stdio.h>
-- 
2.25.1




More information about the fwts-devel mailing list