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
b8a848ed
Commit
b8a848ed
authored
Aug 02, 2009
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugzilla-13620-revert' into release
parents
ed680c4a
7cb7f45c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
0 deletions
+35
-0
drivers/acpi/acpica/acobject.h
drivers/acpi/acpica/acobject.h
+1
-0
drivers/acpi/acpica/dsopcode.c
drivers/acpi/acpica/dsopcode.c
+24
-0
drivers/acpi/acpica/exfldio.c
drivers/acpi/acpica/exfldio.c
+6
-0
include/acpi/acpiosxf.h
include/acpi/acpiosxf.h
+4
-0
No files found.
drivers/acpi/acpica/acobject.h
View file @
b8a848ed
...
@@ -97,6 +97,7 @@
...
@@ -97,6 +97,7 @@
#define AOPOBJ_OBJECT_INITIALIZED 0x08
#define AOPOBJ_OBJECT_INITIALIZED 0x08
#define AOPOBJ_SETUP_COMPLETE 0x10
#define AOPOBJ_SETUP_COMPLETE 0x10
#define AOPOBJ_SINGLE_DATUM 0x20
#define AOPOBJ_SINGLE_DATUM 0x20
#define AOPOBJ_INVALID 0x40
/* Used if host OS won't allow an op_region address */
/******************************************************************************
/******************************************************************************
*
*
...
...
drivers/acpi/acpica/dsopcode.c
View file @
b8a848ed
...
@@ -397,6 +397,30 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
...
@@ -397,6 +397,30 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc)
status
=
acpi_ds_execute_arguments
(
node
,
acpi_ns_get_parent_node
(
node
),
status
=
acpi_ds_execute_arguments
(
node
,
acpi_ns_get_parent_node
(
node
),
extra_desc
->
extra
.
aml_length
,
extra_desc
->
extra
.
aml_length
,
extra_desc
->
extra
.
aml_start
);
extra_desc
->
extra
.
aml_start
);
if
(
ACPI_FAILURE
(
status
))
{
return_ACPI_STATUS
(
status
);
}
/* Validate the region address/length via the host OS */
status
=
acpi_os_validate_address
(
obj_desc
->
region
.
space_id
,
obj_desc
->
region
.
address
,
(
acpi_size
)
obj_desc
->
region
.
length
,
acpi_ut_get_node_name
(
node
));
if
(
ACPI_FAILURE
(
status
))
{
/*
* Invalid address/length. We will emit an error message and mark
* the region as invalid, so that it will cause an additional error if
* it is ever used. Then return AE_OK.
*/
ACPI_EXCEPTION
((
AE_INFO
,
status
,
"During address validation of OpRegion [%4.4s]"
,
node
->
name
.
ascii
));
obj_desc
->
common
.
flags
|=
AOPOBJ_INVALID
;
status
=
AE_OK
;
}
return_ACPI_STATUS
(
status
);
return_ACPI_STATUS
(
status
);
}
}
...
...
drivers/acpi/acpica/exfldio.c
View file @
b8a848ed
...
@@ -113,6 +113,12 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
...
@@ -113,6 +113,12 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
}
}
}
}
/* Exit if Address/Length have been disallowed by the host OS */
if
(
rgn_desc
->
common
.
flags
&
AOPOBJ_INVALID
)
{
return_ACPI_STATUS
(
AE_AML_ILLEGAL_ADDRESS
);
}
/*
/*
* Exit now for SMBus address space, it has a non-linear address space
* Exit now for SMBus address space, it has a non-linear address space
* and the request cannot be directly validated
* and the request cannot be directly validated
...
...
include/acpi/acpiosxf.h
View file @
b8a848ed
...
@@ -242,6 +242,10 @@ acpi_os_derive_pci_id(acpi_handle rhandle,
...
@@ -242,6 +242,10 @@ acpi_os_derive_pci_id(acpi_handle rhandle,
acpi_status
acpi_os_validate_interface
(
char
*
interface
);
acpi_status
acpi_os_validate_interface
(
char
*
interface
);
acpi_status
acpi_osi_invalidate
(
char
*
interface
);
acpi_status
acpi_osi_invalidate
(
char
*
interface
);
acpi_status
acpi_os_validate_address
(
u8
space_id
,
acpi_physical_address
address
,
acpi_size
length
,
char
*
name
);
u64
acpi_os_get_timer
(
void
);
u64
acpi_os_get_timer
(
void
);
acpi_status
acpi_os_signal
(
u32
function
,
void
*
info
);
acpi_status
acpi_os_signal
(
u32
function
,
void
*
info
);
...
...
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