diff options
author | Zhang Rui <rui.zhang@intel.com> | 2011-11-16 04:03:54 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-01-17 03:36:32 -0500 |
commit | 25169b77f7c33b363db7d099d67491e977cdefc7 (patch) | |
tree | 5bbe9138831fc64918ed595c94163372d15b60bb | |
parent | 7fce7a4b0db7d90db553faf568853d56cd908c39 (diff) |
ACPI 5.0: Allow _AEI method in walk resources
_AEI contains a resource template, this change adds support for
the walk resources function.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/acpi/acpica/rsxface.c | 10 | ||||
-rw-r--r-- | include/acpi/acnames.h | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c index 45a9e5e4e4db..f6cceaccc3e9 100644 --- a/drivers/acpi/acpica/rsxface.c +++ b/drivers/acpi/acpica/rsxface.c | |||
@@ -526,8 +526,9 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context) | |||
526 | * | 526 | * |
527 | * PARAMETERS: device_handle - Handle to the device object for the | 527 | * PARAMETERS: device_handle - Handle to the device object for the |
528 | * device we are querying | 528 | * device we are querying |
529 | * Name - Method name of the resources we want | 529 | * Name - Method name of the resources we want. |
530 | * (METHOD_NAME__CRS or METHOD_NAME__PRS) | 530 | * (METHOD_NAME__CRS, METHOD_NAME__PRS, or |
531 | * METHOD_NAME__AEI) | ||
531 | * user_function - Called for each resource | 532 | * user_function - Called for each resource |
532 | * Context - Passed to user_function | 533 | * Context - Passed to user_function |
533 | * | 534 | * |
@@ -554,11 +555,12 @@ acpi_walk_resources(acpi_handle device_handle, | |||
554 | 555 | ||
555 | if (!device_handle || !user_function || !name || | 556 | if (!device_handle || !user_function || !name || |
556 | (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) && | 557 | (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) && |
557 | !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) { | 558 | !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) && |
559 | !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) { | ||
558 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 560 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
559 | } | 561 | } |
560 | 562 | ||
561 | /* Get the _CRS or _PRS resource list */ | 563 | /* Get the _CRS/_PRS/_AEI resource list */ |
562 | 564 | ||
563 | buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; | 565 | buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; |
564 | status = acpi_rs_get_method_data(device_handle, name, &buffer); | 566 | status = acpi_rs_get_method_data(device_handle, name, &buffer); |
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index fc1575fd4596..5b5af0d30a97 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h | |||
@@ -58,6 +58,7 @@ | |||
58 | #define METHOD_NAME__PRT "_PRT" | 58 | #define METHOD_NAME__PRT "_PRT" |
59 | #define METHOD_NAME__CRS "_CRS" | 59 | #define METHOD_NAME__CRS "_CRS" |
60 | #define METHOD_NAME__PRS "_PRS" | 60 | #define METHOD_NAME__PRS "_PRS" |
61 | #define METHOD_NAME__AEI "_AEI" | ||
61 | #define METHOD_NAME__PRW "_PRW" | 62 | #define METHOD_NAME__PRW "_PRW" |
62 | #define METHOD_NAME__SRS "_SRS" | 63 | #define METHOD_NAME__SRS "_SRS" |
63 | 64 | ||