hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/include/acpi/acpixf.h
....@@ -3,7 +3,7 @@
33 *
44 * Name: acpixf.h - External interfaces to the ACPI subsystem
55 *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
77 *
88 *****************************************************************************/
99
....@@ -12,7 +12,7 @@
1212
1313 /* Current ACPICA subsystem version in YYYYMMDD format */
1414
15
-#define ACPI_CA_VERSION 0x20180810
15
+#define ACPI_CA_VERSION 0x20200925
1616
1717 #include <acpi/acconfig.h>
1818 #include <acpi/actypes.h>
....@@ -157,21 +157,6 @@
157157 ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
158158
159159 /*
160
- * Optionally support group module level code.
161
- * NOTE, this is essentially obsolete and will be removed soon
162
- * (01/2018).
163
- */
164
-ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE);
165
-
166
-/*
167
- * Optionally support module level code by parsing an entire table as
168
- * a method as it is loaded. Default is TRUE.
169
- * NOTE, this is essentially obsolete and will be removed soon
170
- * (01/2018).
171
- */
172
-ACPI_INIT_GLOBAL(u8, acpi_gbl_execute_tables_as_methods, TRUE);
173
-
174
-/*
175160 * Optionally use 32-bit FADT addresses if and when there is a conflict
176161 * (address mismatch) between the 32-bit and 64-bit versions of the
177162 * address. Although ACPICA adheres to the ACPI specification which
....@@ -312,6 +297,9 @@
312297 #define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
313298 ACPI_EXTERNAL_RETURN_OK(prototype)
314299
300
+#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \
301
+ ACPI_EXTERNAL_RETURN_UINT32(prototype)
302
+
315303 #define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
316304 ACPI_EXTERNAL_RETURN_VOID(prototype)
317305
....@@ -321,6 +309,9 @@
321309
322310 #define ACPI_HW_DEPENDENT_RETURN_OK(prototype) \
323311 static ACPI_INLINE prototype {return(AE_OK);}
312
+
313
+#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \
314
+ static ACPI_INLINE prototype {return(0);}
324315
325316 #define ACPI_HW_DEPENDENT_RETURN_VOID(prototype) \
326317 static ACPI_INLINE prototype {return;}
....@@ -467,7 +458,11 @@
467458 u8 physical))
468459
469460 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
470
- acpi_load_table(struct acpi_table_header *table))
461
+ acpi_load_table(struct acpi_table_header *table,
462
+ u32 *table_idx))
463
+
464
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
465
+ acpi_unload_table(u32 table_index))
471466
472467 ACPI_EXTERNAL_RETURN_STATUS(acpi_status
473468 acpi_unload_parent_table(acpi_handle object))
....@@ -753,10 +748,12 @@
753748 u32 gpe_number,
754749 acpi_event_status
755750 *event_status))
756
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))
751
+ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_dispatch_gpe(acpi_handle gpe_device, u32 gpe_number))
757752 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))
758753 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))
759754 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))
755
+ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_any_gpe_status_set(u32 gpe_skip_number))
756
+ACPI_HW_DEPENDENT_RETURN_UINT32(u32 acpi_any_fixed_event_status_set(void))
760757
761758 ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
762759 acpi_get_gpe_device(u32 gpe_index,
....@@ -910,6 +907,12 @@
910907 acpi_bios_error(const char *module_name,
911908 u32 line_number,
912909 const char *format, ...))
910
+ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(4)
911
+ void ACPI_INTERNAL_VAR_XFACE
912
+ acpi_bios_exception(const char *module_name,
913
+ u32 line_number,
914
+ acpi_status status,
915
+ const char *format, ...))
913916 ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
914917 void ACPI_INTERNAL_VAR_XFACE
915918 acpi_bios_warning(const char *module_name,