Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d0ab6714
Commit
d0ab6714
authored
Dec 01, 2016
by
Rafael J. Wysocki
Browse files
Options
Browse Files
Download
Plain Diff
Merge back earlier ACPICA material for v4.10.
parents
e2174b0c
69d4e425
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
18 deletions
+36
-18
drivers/acpi/acpica/acglobal.h
drivers/acpi/acpica/acglobal.h
+1
-4
drivers/acpi/acpica/aclocal.h
drivers/acpi/acpica/aclocal.h
+10
-9
drivers/acpi/acpica/tbxfload.c
drivers/acpi/acpica/tbxfload.c
+5
-1
include/acpi/acconfig.h
include/acpi/acconfig.h
+1
-1
include/acpi/acpixf.h
include/acpi/acpixf.h
+8
-1
tools/power/acpi/os_specific/service_layers/osunixxf.c
tools/power/acpi/os_specific/service_layers/osunixxf.c
+11
-2
No files found.
drivers/acpi/acpica/acglobal.h
View file @
d0ab6714
...
...
@@ -240,10 +240,6 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0);
ACPI_GLOBAL
(
struct
acpi_thread_state
*
,
acpi_gbl_current_walk_list
);
/* Maximum number of While() loop iterations before forced abort */
ACPI_GLOBAL
(
u16
,
acpi_gbl_max_loop_iterations
);
/* Control method single step flag */
ACPI_GLOBAL
(
u8
,
acpi_gbl_cm_single_step
);
...
...
@@ -318,6 +314,7 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_cstyle_disassembly, TRUE);
ACPI_INIT_GLOBAL
(
u8
,
acpi_gbl_force_aml_disassembly
,
FALSE
);
ACPI_INIT_GLOBAL
(
u8
,
acpi_gbl_dm_opt_verbose
,
TRUE
);
ACPI_INIT_GLOBAL
(
u8
,
acpi_gbl_dm_emit_external_opcodes
,
FALSE
);
ACPI_INIT_GLOBAL
(
u8
,
acpi_gbl_do_disassembler_optimizations
,
TRUE
);
ACPI_GLOBAL
(
u8
,
acpi_gbl_dm_opt_disasm
);
ACPI_GLOBAL
(
u8
,
acpi_gbl_dm_opt_listing
);
...
...
drivers/acpi/acpica/aclocal.h
View file @
d0ab6714
...
...
@@ -765,7 +765,7 @@ union acpi_parse_value {
union acpi_parse_value value;
/* Value or args associated with the opcode */
\
u8 arg_list_length;
/* Number of elements in the arg list */
\
ACPI_DISASM_ONLY_MEMBERS (\
u
8
disasm_flags;
/* Used during AML disassembly */
\
u
16
disasm_flags;
/* Used during AML disassembly */
\
u8 disasm_opcode;
/* Subtype used for disassembly */
\
char *operator_symbol;
/* Used for C-style operator name strings */
\
char aml_op_name[16])
/* Op name (debug only) */
...
...
@@ -868,14 +868,15 @@ struct acpi_parse_state {
/* Parse object disasm_flags */
#define ACPI_PARSEOP_IGNORE 0x01
#define ACPI_PARSEOP_PARAMETER_LIST 0x02
#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04
#define ACPI_PARSEOP_PREDEFINED_CHECKED 0x08
#define ACPI_PARSEOP_CLOSING_PAREN 0x10
#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x20
#define ACPI_PARSEOP_ASSIGNMENT 0x40
#define ACPI_PARSEOP_ELSEIF 0x80
#define ACPI_PARSEOP_IGNORE 0x0001
#define ACPI_PARSEOP_PARAMETER_LIST 0x0002
#define ACPI_PARSEOP_EMPTY_TERMLIST 0x0004
#define ACPI_PARSEOP_PREDEFINED_CHECKED 0x0008
#define ACPI_PARSEOP_CLOSING_PAREN 0x0010
#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x0020
#define ACPI_PARSEOP_ASSIGNMENT 0x0040
#define ACPI_PARSEOP_ELSEIF 0x0080
#define ACPI_PARSEOP_LEGACY_ASL_ONLY 0x0100
/*****************************************************************************
*
...
...
drivers/acpi/acpica/tbxfload.c
View file @
d0ab6714
...
...
@@ -239,7 +239,7 @@ acpi_status acpi_tb_load_namespace(void)
}
if
(
!
tables_failed
)
{
ACPI_INFO
((
"%u ACPI AML tables successfully acquired and loaded
\n
"
,
tables_loaded
));
ACPI_INFO
((
"%u ACPI AML tables successfully acquired and loaded"
,
tables_loaded
));
}
else
{
ACPI_ERROR
((
AE_INFO
,
"%u table load failures, %u successful"
,
...
...
@@ -250,6 +250,10 @@ acpi_status acpi_tb_load_namespace(void)
status
=
AE_CTRL_TERMINATE
;
}
#ifdef ACPI_APPLICATION
ACPI_DEBUG_PRINT_RAW
((
ACPI_DB_INIT
,
"
\n
"
));
#endif
unlock_and_exit:
(
void
)
acpi_ut_release_mutex
(
ACPI_MTX_TABLES
);
return_ACPI_STATUS
(
status
);
...
...
include/acpi/acconfig.h
View file @
d0ab6714
...
...
@@ -146,7 +146,7 @@
/* Maximum number of While() loops before abort */
#define ACPI_MAX_LOOP_COUNT 0xFFFF
#define ACPI_MAX_LOOP_COUNT 0x
000F
FFFF
/******************************************************************************
*
...
...
include/acpi/acpixf.h
View file @
d0ab6714
...
...
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20160
831
#define ACPI_CA_VERSION 0x20160
930
#include <acpi/acconfig.h>
#include <acpi/actypes.h>
...
...
@@ -258,6 +258,13 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0);
*/
ACPI_INIT_GLOBAL
(
u8
,
acpi_gbl_reduced_hardware
,
FALSE
);
/*
* Maximum number of While() loop iterations before forced method abort.
* This mechanism is intended to prevent infinite loops during interpreter
* execution within a host kernel.
*/
ACPI_INIT_GLOBAL
(
u32
,
acpi_gbl_max_loop_iterations
,
ACPI_MAX_LOOP_COUNT
);
/*
* This mechanism is used to trace a specified AML method. The method is
* traced each time it is executed.
...
...
tools/power/acpi/os_specific/service_layers/osunixxf.c
View file @
d0ab6714
...
...
@@ -646,8 +646,12 @@ acpi_os_create_semaphore(u32 max_units,
}
#ifdef __APPLE__
{
char
*
semaphore_name
=
tmpnam
(
NULL
);
static
int
semaphore_count
=
0
;
char
semaphore_name
[
32
];
snprintf
(
semaphore_name
,
sizeof
(
semaphore_name
),
"acpi_sem_%d"
,
semaphore_count
++
);
printf
(
"%s
\n
"
,
semaphore_name
);
sem
=
sem_open
(
semaphore_name
,
O_EXCL
|
O_CREAT
,
0755
,
initial_units
);
...
...
@@ -692,10 +696,15 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
if
(
!
sem
)
{
return
(
AE_BAD_PARAMETER
);
}
#ifdef __APPLE__
if
(
sem_close
(
sem
)
==
-
1
)
{
return
(
AE_BAD_PARAMETER
);
}
#else
if
(
sem_destroy
(
sem
)
==
-
1
)
{
return
(
AE_BAD_PARAMETER
);
}
#endif
return
(
AE_OK
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment