ACPICA Release 20091112 linuxized patches
Subsystems (9)
Hi, Len
ACPICA Release 20091112 linuxized patches attched. Applied on top of linux-acpi-2.6/test branch cleanly.
[PATCH 1/9] ACPICA: Reduce severity of predefined repair messages, Warning to Info [PATCH 2/9] ACPICA: Change package length error message to an info message [PATCH 3/9] ACPICA: Add post-order callback to acpi_walk_namespace [PATCH 4/9] ACPICA: Fix possible fault if return Package objects contain NULL elements [PATCH 5/9] ACPICA: Add repair for predefined methods that must return sorted lists [PATCH 6/9] ACPICA: New internal utility function to create Integer objects [PATCH 7/9] ACPICA: Deploy new create integer interface where appropriate [PATCH 8/9] ACPICA: Add additional module-level code support
[PATCH 9/9] ACPICA: Update version to 20091112.
Lin Ming
Quoted 1 line
From
752542e365879b94f04b0cc4c030eced01ffc489Mon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:18:45 +0800
Subject: [PATCH 1/9] ACPICA: Reduce severity of predefined repair messages, Warning to Info
Since the object was successfully repaired, a Warning is too severe. Reduced to Info for now. We may eventually change these messages to debug-only. ACPICA BZ 812.
http://www.acpica.org/bugzilla/show_bug.cgi?id=812
--- drivers/acpi/acpica/acmacros.h | 3 ++ drivers/acpi/acpica/acutils.h | 5 ++++ drivers/acpi/acpica/nsrepair.c | 8 +++--- drivers/acpi/acpica/utmisc.c | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 4 deletions(-)
drivers/acpi/acpica/acmacros.h +3 -0
@@ -341,6 +341,7 @@#define ACPI_ERROR_NAMESPACE (s, e) acpi_ns_report_error (AE_INFO, s, e);#define ACPI_ERROR_METHOD (s, n, p, e) acpi_ns_report_method_error (AE_INFO, s, n, p, e);#define ACPI_WARN_PREDEFINED (plist) acpi_ut_predefined_warning plist +#define ACPI_INFO_PREDEFINED (plist) acpi_ut_predefined_info plist#else
@@ -349,6 +350,8 @@#define ACPI_ERROR_NAMESPACE (s, e)#define ACPI_ERROR_METHOD (s, n, p, e)#define ACPI_WARN_PREDEFINED (plist) +#define ACPI_INFO_PREDEFINED (plist) +#endif /* ACPI_NO_ERROR_MESSAGES */ /*
drivers/acpi/acpica/acutils.h +5 -0
@@ -481,6 +481,11 @@ acpi_ut_predefined_warning(const char *module_name,char *pathname, u8 node_flags, const char *format, ...); +void ACPI_INTERNAL_VAR_XFACE +acpi_ut_predefined_info (const char *module_name, +u32 line_number, +char *pathname,u8 node_flags,const char *format, ...); +/* Values for Base above (16=Hex, 10=Decimal) */ #define ACPI_ANY_BASE 0
drivers/acpi/acpica/nsrepair.c +4 -4
@@ -185,14 +185,14 @@ acpi_ns_repair_object(struct acpi_predefined_data *data, return_object->common.reference_count--; } -ACPI_WARN_PREDEFINED ((AE_INFO , data->pathname, data->node_flags, +ACPI_INFO_PREDEFINED ((AE_INFO , data->pathname, data->node_flags,"Converted %s to expected %s at index %u" ,acpi_ut_get_object_type_name (return_object),acpi_ut_get_object_type_name (new_object), package_index)); }else { - ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags, + ACPI_INFO_PREDEFINED((AE_INFO, data->pathname, data->node_flags, "Converted %s to expected %s", acpi_ut_get_object_type_name (return_object),
@@ -254,8 +254,8 @@ acpi_ns_repair_package_list(struct acpi_predefined_data *data, *obj_desc_ptr = pkg_obj_desc; data->flags |=ACPI_OBJECT_REPAIRED ; -ACPI_WARN_PREDEFINED ((AE_INFO , data->pathname, data->node_flags, -"Incorrectly formed Package, attempting repair" )); +ACPI_INFO_PREDEFINED ((AE_INFO , data->pathname, data->node_flags, +"Repaired Incorrectly formed Package" ));return (AE_OK ); }
drivers/acpi/acpica/utmisc.c +42 -0
45 lines not on this page · raw message
Quoted 1 line
From
ea012c243a55449533804e283dccee2cb79b8a39Mon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:31:50 +0800
Subject: [PATCH 2/9] ACPICA: Change package length error message to an info message
This message happens when the package element list is longer than the declared length of the package. Changed to an info message because this condition is not actually an error. It is caused by the BIOS attempting to truncate the package on the fly by adjusting the package element count at the start of the package definition.
--- drivers/acpi/acpica/dsobject.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/acpi/acpica/dsobject.c +4 -4
@@ -486,7 +486,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,* * Note: technically, this is an error, from ACPI spec: "It is an error * for NumElements to be less than the number of elements in the -* PackageList". However, we just print an error message and +* PackageList". However, we just print a message and * no exception is returned. This provides Windows compatibility. Some * BIOSs will alter the num_elements on the fly, creating this type * of ill-formed package object.
@@ -510,9 +510,9 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, arg = arg->common.next; } -ACPI_WARNING ((AE_INFO , -"Package List length (0x%X) larger than NumElements count (0x%X), truncated\n" , - i, element_count)); +ACPI_INFO ((AE_INFO , +"Actual Package length (0x%X) is larger than NumElements field (0x%X), truncated\n" , + i, element_count)); }else if (i < element_count) {/* * Arg list (elements) was exhausted, but we did not reach num_elements count.
Quoted 1 line
From
bfb447d882cc94dea5a68ddaf4b21cfb582949e5Mon Sep 17 00:00:00 2001
From: Lin Ming <[email protected]>
Date: Fri, 13 Nov 2009 10:06:08 +0800
Subject: [PATCH 3/9] ACPICA: Add post-order callback to acpi_walk_namespace
The existing interface only has a pre-order callback. This change adds an additional parameter for a post-order callback which will be more useful for bus scans. ACPICA BZ 779.
Also update the external calls to acpi_walk_namespace.
http://www.acpica.org/bugzilla/show_bug.cgi?id=779
--- arch/ia64/sn/kernel/io_acpi_init.c | 2 +- arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- drivers/acpi/acpi_memhotplug.c | 4 +- drivers/acpi/acpica/acnamesp.h | 3 +- drivers/acpi/acpica/dsinit.c | 2 +- drivers/acpi/acpica/evgpeblk.c | 8 +- drivers/acpi/acpica/evregion.c | 6 +- drivers/acpi/acpica/nsdump.c | 4 +- drivers/acpi/acpica/nsdumpdv.c | 3 +- drivers/acpi/acpica/nsinit.c | 8 +- drivers/acpi/acpica/nswalk.c | 200 +++++++++++++++++++------------- drivers/acpi/acpica/nsxfeval.c | 32 +++-- drivers/acpi/container.c | 4 +- drivers/acpi/dock.c | 6 +- drivers/acpi/ec.c | 2 +- drivers/acpi/glue.c | 2 +- drivers/acpi/pci_slot.c | 8 +- drivers/acpi/processor_core.c | 4 +- drivers/acpi/scan.c | 2 +- drivers/acpi/video_detect.c | 6 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 2 +- drivers/pci/hotplug/acpiphp_glue.c | 22 ++-- drivers/pci/hotplug/acpiphp_ibm.c | 2 +- drivers/platform/x86/intel_menlow.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- include/acpi/acpixf.h | 3 +- 29 files changed, 196 insertions(+), 151 deletions(-)
arch/ia64/sn/kernel/io_acpi_init.c +1 -1
@@ -390,7 +390,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, pcidev_match.handle =NULL ;acpi_walk_namespace (ACPI_TYPE_DEVICE , rootbus_handle,ACPI_UINT32_MAX , - find_matching_device, &pcidev_match,NULL ); + find_matching_device,NULL , &pcidev_match,NULL );if (!pcidev_match.handle) { printk(KERN_ERR
arch/x86/kernel/cpu/cpufreq/longhaul.c +1 -1
@@ -885,7 +885,7 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)/* Find ACPI data for processor */ acpi_walk_namespace (ACPI_TYPE_PROCESSOR ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , &longhaul_walk_callback, +ACPI_UINT32_MAX , &longhaul_walk_callback,NULL ,NULL , (void *)&pr);/* Check ACPI support for C3 state */
drivers/acpi/acpi_memhotplug.c +2 -2
@@ -537,7 +537,7 @@ static int __init acpi_memory_device_init(void) status =acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - acpi_memory_register_notify_handler, + acpi_memory_register_notify_handler,NULL ,NULL ,NULL );if (ACPI_FAILURE (status)) {
@@ -561,7 +561,7 @@ static void __exit acpi_memory_device_exit(void)*/ status =acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - acpi_memory_deregister_notify_handler, + acpi_memory_deregister_notify_handler,NULL ,NULL ,NULL );if (ACPI_FAILURE (status))
drivers/acpi/acpica/acnamesp.h +2 -1
@@ -104,7 +104,8 @@ acpi_ns_walk_namespace(acpi_object_type type,acpi_handle start_object, u32 max_depth, u32 flags, - acpi_walk_callback user_function, + acpi_walk_callback pre_order_visit, + acpi_walk_callback post_order_visit, void *context, void **return_value); struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
drivers/acpi/acpica/dsinit.c +1 -1
@@ -192,7 +192,7 @@ acpi_ds_initialize_objects(u32 table_index, status =acpi_ns_walk_namespace (ACPI_TYPE_ANY , start_node,ACPI_UINT32_MAX ,ACPI_NS_WALK_UNLOCK , acpi_ds_init_one_object, - &info,NULL ); +NULL , &info,NULL );if (ACPI_FAILURE (status)) {ACPI_EXCEPTION ((AE_INFO , status,"During WalkNamespace" )); }
drivers/acpi/acpica/evgpeblk.c +4 -4
@@ -945,8 +945,8 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device, status =acpi_ns_walk_namespace (ACPI_TYPE_METHOD , gpe_device,ACPI_UINT32_MAX ,ACPI_NS_WALK_NO_UNLOCK , - acpi_ev_save_method_info, gpe_block, -NULL ); + acpi_ev_save_method_info,NULL , + gpe_block,NULL );/* Return the new block */
@@ -1022,8 +1022,8 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, status =acpi_ns_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX ,ACPI_NS_WALK_UNLOCK , - acpi_ev_match_prw_and_gpe, &gpe_info, -NULL ); + acpi_ev_match_prw_and_gpe,NULL , + &gpe_info,NULL ); }/*
drivers/acpi/acpica/evregion.c +3 -3
@@ -1025,8 +1025,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,*/ status =acpi_ns_walk_namespace (ACPI_TYPE_ANY , node,ACPI_UINT32_MAX ,ACPI_NS_WALK_UNLOCK , - acpi_ev_install_handler, handler_obj, -NULL ); + acpi_ev_install_handler,NULL , + handler_obj,NULL ); unlock_and_exit:return_ACPI_STATUS (status);
@@ -1062,7 +1062,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,*/ status =acpi_ns_walk_namespace (ACPI_TYPE_ANY , node,ACPI_UINT32_MAX ,ACPI_NS_WALK_UNLOCK , acpi_ev_reg_run, - &space_id,NULL ); +NULL , &space_id,NULL );return_ACPI_STATUS (status); }
drivers/acpi/acpica/nsdump.c +2 -2
@@ -634,8 +634,8 @@ acpi_ns_dump_objects(acpi_object_type type, (void )acpi_ns_walk_namespace (type, start_handle, max_depth,ACPI_NS_WALK_NO_UNLOCK |ACPI_NS_WALK_TEMP_NODES , - acpi_ns_dump_one_object, (void *)&info, - NULL); + acpi_ns_dump_one_object,NULL , + (void *)&info, NULL); }#endif /* ACPI_FUTURE_USAGE */
drivers/acpi/acpica/nsdumpdv.c +2 -1
@@ -131,7 +131,8 @@ void acpi_ns_dump_root_devices(void) status =acpi_ns_walk_namespace (ACPI_TYPE_DEVICE , sys_bus_handle,ACPI_UINT32_MAX ,ACPI_NS_WALK_NO_UNLOCK , - acpi_ns_dump_one_device, NULL, NULL); + acpi_ns_dump_one_device,NULL ,NULL , + NULL); }#endif
drivers/acpi/acpica/nsinit.c +5 -3
@@ -96,7 +96,7 @@ acpi_status acpi_ns_initialize_objects(void)/* Walk entire namespace from the supplied root */ status =acpi_walk_namespace (ACPI_TYPE_ANY ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , acpi_ns_init_one_object, +ACPI_UINT32_MAX , acpi_ns_init_one_object,NULL , &info,NULL );if (ACPI_FAILURE (status)) {ACPI_EXCEPTION ((AE_INFO , status,"During WalkNamespace" ));
@@ -156,7 +156,8 @@ acpi_status acpi_ns_initialize_devices(void) status =acpi_ns_walk_namespace (ACPI_TYPE_ANY ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , FALSE, - acpi_ns_find_ini_methods, &info,NULL ); + acpi_ns_find_ini_methods,NULL , &info, +NULL );if (ACPI_FAILURE (status)) { goto error_exit; }
@@ -189,7 +190,8 @@ acpi_status acpi_ns_initialize_devices(void) status =acpi_ns_walk_namespace (ACPI_TYPE_ANY ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , FALSE, - acpi_ns_init_one_device, &info,NULL ); + acpi_ns_init_one_device,NULL , &info, +NULL );ACPI_FREE (info.evaluate_info);if (ACPI_FAILURE (status)) {
drivers/acpi/acpica/nswalk.c +117 -83
269 lines not on this page · raw message
drivers/acpi/acpica/nsxfeval.c +19 -13
@@ -433,8 +433,11 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)* PARAMETERS: Type - acpi_object_type to search for * start_object - Handle in namespace where search begins * max_depth - Depth to which search is to reach -* user_function - Called when an object of "Type" is found -* Context - Passed to user function +* pre_order_visit - Called during tree pre-order visit +* when an object of "Type" is found +* post_order_visit - Called during tree post-order visit +* when an object of "Type" is found +* Context - Passed to user function(s) above * return_value - Location where return value of * user_function is put if terminated early *
@@ -443,16 +446,16 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info)* * DESCRIPTION: Performs a modified depth-first walk of the namespace tree, * starting (and ending) at the object specified by start_handle. -* The user_function is called whenever an object that matches -* the type parameter is found. If the user function returns +* The callback function is called whenever an object that matches +* the type parameter is found. If the callback function returns * a non-zero value, the search is terminated immediately and this * value is returned to the caller. * * The point of this procedure is to provide a generic namespace * walk routine that can be called from multiple places to -* provide multiple services; the User Function can be tailored -* to each task, whether it is a print function, a compare -* function, etc. +* provide multiple services; the callback function(s) can be +* tailored to each task, whether it is a print function, +* a compare function, etc. * ******************************************************************************/
@@ -460,7 +463,8 @@ acpi_status acpi_walk_namespace(acpi_object_type type, acpi_handle start_object, u32 max_depth, - acpi_walk_callback user_function, + acpi_walk_callback pre_order_visit, + acpi_walk_callback post_order_visit, void *context, void **return_value) { acpi_status status;
@@ -469,7 +473,8 @@ acpi_walk_namespace(acpi_object_type type,/* Parameter validation */ -if ((type >ACPI_TYPE_LOCAL_MAX ) || (!max_depth) || (!user_function)) { +if ((type >ACPI_TYPE_LOCAL_MAX ) || + (!max_depth) || (!pre_order_visit && !post_order_visit)) {return_ACPI_STATUS (AE_BAD_PARAMETER ); }
@@ -501,8 +506,9 @@ acpi_walk_namespace(acpi_object_type type, } status =acpi_ns_walk_namespace (type, start_object, max_depth, -ACPI_NS_WALK_UNLOCK , user_function, - context, return_value); +ACPI_NS_WALK_UNLOCK , pre_order_visit, + post_order_visit, context, + return_value); (void )acpi_ut_release_mutex (ACPI_MTX_NAMESPACE );
@@ -681,8 +687,8 @@ acpi_get_devices(const char *HID, status =acpi_ns_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX ,ACPI_NS_WALK_UNLOCK , - acpi_ns_get_device_callback, &info, - return_value); + acpi_ns_get_device_callback,NULL , + &info, return_value); (void )acpi_ut_release_mutex (ACPI_MTX_NAMESPACE );return_ACPI_STATUS (status);
drivers/acpi/container.c +2 -2
@@ -258,7 +258,7 @@ static int __init acpi_container_init(void)acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - container_walk_namespace_cb, &action,NULL ); + container_walk_namespace_cb,NULL , &action,NULL );return (0 ); }
@@ -271,7 +271,7 @@ static void __exit acpi_container_exit(void)acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - container_walk_namespace_cb, &action,NULL ); + container_walk_namespace_cb,NULL , &action,NULL );acpi_bus_unregister_driver (&acpi_container_driver);
drivers/acpi/dock.c +3 -3
@@ -968,7 +968,7 @@ static int dock_add(acpi_handle handle)/* Find dependent devices */ acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - find_dock_devices, dock_station,NULL ); + find_dock_devices,NULL , dock_station,NULL );/* add the dock station as a device dependent on itself */ ret =add_dock_dependent_device (dock_station, handle);
@@ -1048,11 +1048,11 @@ static int __init dock_init(void)/* look for a dock station */ acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , find_dock,NULL ,NULL ); +ACPI_UINT32_MAX , find_dock,NULL ,NULL ,NULL );/* look for bay */ acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , find_bay,NULL ,NULL ); +ACPI_UINT32_MAX , find_bay,NULL ,NULL ,NULL );if (!dock_station_count) { printk(KERN_INFO PREFIX "No dock devices found.\n");return 0 ;
drivers/acpi/ec.c +1 -1
@@ -820,7 +820,7 @@ static int acpi_ec_add(struct acpi_device *device)/* Find and register all query methods */ acpi_walk_namespace (ACPI_TYPE_METHOD , ec->handle,1 , - acpi_ec_register_query_methods, ec,NULL ); + acpi_ec_register_query_methods,NULL , ec,NULL );if (!first_ec) first_ec = ec;
drivers/acpi/glue.c +1 -1
@@ -113,7 +113,7 @@ acpi_handle acpi_get_child(acpi_handle parent, acpi_integer address)if (!parent)return NULL ;acpi_walk_namespace (ACPI_TYPE_DEVICE , parent, -1 , do_acpi_find_child, &find,NULL ); +1 , do_acpi_find_child,NULL , &find,NULL );return find.handle; }
drivers/acpi/pci_slot.c +4 -4
@@ -219,12 +219,12 @@ walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)dbg ("p2p bridge walk, pci_bus = %x\n" , dev->subordinate->number); status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - user_function, &child_context,NULL ); + user_function,NULL , &child_context,NULL );if (ACPI_FAILURE (status)) goto out; status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - walk_p2p_bridge, &child_context,NULL ); + walk_p2p_bridge,NULL , &child_context,NULL ); out:pci_dev_put (dev);return AE_OK ;
@@ -277,12 +277,12 @@ walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function)dbg ("root bridge walk, pci_bus = %x\n" , pci_bus->number); status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - user_function, &context,NULL ); + user_function,NULL , &context,NULL );if (ACPI_FAILURE (status))return status; status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - walk_p2p_bridge, &context,NULL ); + walk_p2p_bridge,NULL , &context,NULL );if (ACPI_FAILURE (status))err ("%s: walk_p2p_bridge failure - %d\n" , __func__, status);
drivers/acpi/processor_core.c +2 -2
@@ -1102,7 +1102,7 @@ void acpi_processor_install_hotplug_notify(void)acpi_walk_namespace (ACPI_TYPE_PROCESSOR ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - processor_walk_namespace_cb, &action,NULL ); + processor_walk_namespace_cb,NULL , &action,NULL );#endif register_hotcpu_notifier (&acpi_cpu_notifier); }
@@ -1115,7 +1115,7 @@ void acpi_processor_uninstall_hotplug_notify(void)acpi_walk_namespace (ACPI_TYPE_PROCESSOR ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - processor_walk_namespace_cb, &action,NULL ); + processor_walk_namespace_cb,NULL , &action,NULL );#endif unregister_hotcpu_notifier (&acpi_cpu_notifier); }
drivers/acpi/scan.c +1 -1
@@ -1332,7 +1332,7 @@ static int acpi_bus_scan(acpi_handle handle, struct acpi_bus_ops *ops, status =acpi_bus_check_add (handle,0 , ops, &device);if (ACPI_SUCCESS (status))acpi_walk_namespace (ACPI_TYPE_ANY , handle,ACPI_UINT32_MAX , - acpi_bus_check_add, ops, &device); + acpi_bus_check_add,NULL , ops, &device);if (child) *child = device;
drivers/acpi/video_detect.c +3 -3
@@ -101,7 +101,7 @@ long acpi_is_video_device(struct acpi_device *device)/* Only check for backlight functionality if one of the above hit. */ if (video_caps)acpi_walk_namespace (ACPI_TYPE_DEVICE , device->handle, -ACPI_UINT32_MAX , acpi_backlight_cap_match, +ACPI_UINT32_MAX , acpi_backlight_cap_match,NULL , &video_caps,NULL );return video_caps;
@@ -151,7 +151,7 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)if (!graphics_handle) {/* Only do the global walk through all graphics devices once */ acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , find_video, +ACPI_UINT32_MAX , find_video,NULL , &caps,NULL );/* There might be boot param flags set already... */ acpi_video_support |= caps;
@@ -173,7 +173,7 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle)return 0 ; }acpi_walk_namespace (ACPI_TYPE_DEVICE , graphics_handle, -ACPI_UINT32_MAX , find_video, +ACPI_UINT32_MAX , find_video,NULL , &caps,NULL ); } ACPI_DEBUG_PRINT((ACPI_DB_INFO, "We have 0x%lX video support %s %s\n",
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -899,7 +899,7 @@ static int intel_lid_present(void)acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - check_lid_device, &lid_present,NULL ); + check_lid_device,NULL , &lid_present,NULL );return lid_present; }
drivers/i2c/busses/i2c-scmi.c +1 -1
@@ -363,7 +363,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) smbus_cmi->cap_write =0 ;acpi_walk_namespace (ACPI_TYPE_METHOD , smbus_cmi->handle,1 , - acpi_smbus_cmi_query_methods, smbus_cmi,NULL ); + acpi_smbus_cmi_query_methods,NULL , smbus_cmi,NULL );if (smbus_cmi->cap_info ==0 ) goto err;
drivers/pci/hotplug/acpi_pcihp.c +1 -1
@@ -471,7 +471,7 @@ int acpi_pci_detect_ejectable(acpi_handle handle)return found;acpi_walk_namespace (ACPI_TYPE_DEVICE , handle,1 , - check_hotplug, (void *)&found,NULL ); + check_hotplug,NULL , (void *)&found,NULL );return found; }EXPORT_SYMBOL_GPL (acpi_pci_detect_ejectable);
drivers/pci/hotplug/acpiphp_glue.c +11 -11
@@ -266,7 +266,7 @@ static int detect_ejectable_slots(acpi_handle handle)int found =acpi_pci_detect_ejectable (handle);if (!found) {acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - is_pci_dock_device, (void *)&found,NULL ); + is_pci_dock_device,NULL , (void *)&found,NULL ); }return found; }
@@ -281,7 +281,7 @@ static void init_bridge_misc(struct acpiphp_bridge *bridge)/* register all slot objects under this bridge */ status =acpi_walk_namespace (ACPI_TYPE_DEVICE , bridge->handle, (u32 )1 , - register_slot, bridge,NULL ); + register_slot,NULL , bridge,NULL );if (ACPI_FAILURE (status)) {list_del (&bridge->list);return ;
@@ -447,7 +447,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)/* search P2P bridges under this p2p bridge */ status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - find_p2p_bridge,NULL ,NULL ); + find_p2p_bridge,NULL ,NULL ,NULL );if (ACPI_FAILURE (status))warn ("find_p2p_bridge failed (error code = 0x%x)\n" , status);
@@ -485,7 +485,7 @@ static int add_bridge(acpi_handle handle)/* search P2P bridges under this host bridge */ status =acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - find_p2p_bridge,NULL ,NULL ); + find_p2p_bridge,NULL ,NULL ,NULL );if (ACPI_FAILURE (status))warn ("find_p2p_bridge failed (error code = 0x%x)\n" , status);
@@ -573,7 +573,7 @@ cleanup_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)/* cleanup p2p bridges under this P2P bridge in a depth-first manner */ acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, (u32 )1 , - cleanup_p2p_bridge,NULL ,NULL ); + cleanup_p2p_bridge,NULL ,NULL ,NULL ); bridge =acpiphp_handle_to_bridge (handle);if (bridge)
@@ -589,7 +589,7 @@ static void remove_bridge(acpi_handle handle)/* cleanup p2p bridges under this host bridge in a depth-first manner */ acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, - (u32 )1 , cleanup_p2p_bridge,NULL ,NULL ); + (u32 )1 , cleanup_p2p_bridge,NULL ,NULL ,NULL );/* * On root bridges with hotplug slots directly underneath (ie,
@@ -778,7 +778,7 @@ static int acpiphp_configure_ioapics(acpi_handle handle) {ioapic_add (handle,0 ,NULL ,NULL );acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, -ACPI_UINT32_MAX , ioapic_add,NULL ,NULL ); +ACPI_UINT32_MAX , ioapic_add,NULL ,NULL ,NULL );return 0 ; }
@@ -786,7 +786,7 @@ static int acpiphp_unconfigure_ioapics(acpi_handle handle) {ioapic_remove (handle,0 ,NULL ,NULL );acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, -ACPI_UINT32_MAX , ioapic_remove,NULL ,NULL ); +ACPI_UINT32_MAX , ioapic_remove,NULL ,NULL ,NULL );return 0 ; }
@@ -1367,7 +1367,7 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont bridge =acpiphp_handle_to_bridge (handle);if (type ==ACPI_NOTIFY_BUS_CHECK ) {acpi_walk_namespace (ACPI_TYPE_DEVICE , handle,ACPI_UINT32_MAX , - count_sub_bridges, &num_sub_bridges,NULL ); + count_sub_bridges,NULL , &num_sub_bridges,NULL ); }if (!bridge && !num_sub_bridges) {
@@ -1388,7 +1388,7 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont }if (num_sub_bridges)acpi_walk_namespace (ACPI_TYPE_DEVICE , handle, -ACPI_UINT32_MAX , check_sub_bridges,NULL ,NULL ); +ACPI_UINT32_MAX , check_sub_bridges,NULL ,NULL ,NULL );break ;case ACPI_NOTIFY_DEVICE_CHECK :
@@ -1512,7 +1512,7 @@ int __init acpiphp_glue_init(void)int num =0 ;acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , find_root_bridges, &num,NULL ); +ACPI_UINT32_MAX , find_root_bridges,NULL , &num,NULL );if (num <=0 )return -1 ;
drivers/pci/hotplug/acpiphp_ibm.c +1 -1
@@ -434,7 +434,7 @@ static int __init ibm_acpiphp_init(void)dbg ("%s\n" , __func__);if (acpi_walk_namespace (ACPI_TYPE_DEVICE ,ACPI_ROOT_OBJECT , -ACPI_UINT32_MAX , ibm_find_acpi_device, +ACPI_UINT32_MAX , ibm_find_acpi_device,NULL , &ibm_acpi_handle,NULL ) !=FOUND_APCI ) {err ("%s: acpi_walk_namespace failed\n" , __func__); retval = -ENODEV ;
drivers/platform/x86/intel_menlow.c +1 -1
@@ -510,7 +510,7 @@ static int __init intel_menlow_module_init(void)/* Looking for sensors in each ACPI thermal zone */ status =acpi_walk_namespace (ACPI_TYPE_THERMAL ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , - intel_menlow_register_sensor,NULL ,NULL ); + intel_menlow_register_sensor,NULL ,NULL ,NULL );if (ACPI_FAILURE (status))return -ENODEV ;
drivers/platform/x86/sony-laptop.c +1 -1
@@ -1203,7 +1203,7 @@ static int sony_nc_add(struct acpi_device *device)if (debug) { status =acpi_walk_namespace (ACPI_TYPE_METHOD , sony_nc_acpi_handle, -1 , sony_walk_callback,NULL ,NULL ); +1 , sony_walk_callback,NULL ,NULL ,NULL );if (ACPI_FAILURE (status)) { printk(KERN_WARNING DRV_PFX "unable to walk acpi resources\n"); result = -ENODEV ;
drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -1087,7 +1087,7 @@ static int __init tpacpi_check_std_acpi_brightness_support(void)*/ status =acpi_walk_namespace (ACPI_TYPE_METHOD , vid_handle,3 , - tpacpi_acpi_walk_find_bcl,NULL , + tpacpi_acpi_walk_find_bcl,NULL ,NULL , &bcl_ptr);if (ACPI_SUCCESS (status) && bcl_levels >2 ) {
include/acpi/acpixf.h +2 -1
@@ -154,7 +154,8 @@ acpi_status acpi_walk_namespace(acpi_object_type type, acpi_handle start_object, u32 max_depth, - acpi_walk_callback user_function, + acpi_walk_callback pre_order_visit, + acpi_walk_callback post_order_visit, void *context, void **return_value); acpi_status
Quoted 1 line
From
7c725d5bd99a198a0b336931e5b698045862438fMon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:36:00 +0800
Subject: [PATCH 4/9] ACPICA: Fix possible fault if return Package objects contain NULL elements
For predefined name validation. Also adds a warning if a NULL element is followed by any non-null elements. ACPICA BZ 813, 814.
http://www.acpica.org/bugzilla/show_bug.cgi?id=813
http://www.acpica.org/bugzilla/show_bug.cgi?id=814
--- drivers/acpi/acpica/nspredef.c | 43 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-)
drivers/acpi/acpica/nspredef.c +42 -1
61 lines not on this page · raw message
Quoted 1 line
From
42ef79aa0a52b2ca57811318191ec66150b02dbeMon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:44:06 +0800
Subject: [PATCH 5/9] ACPICA: Add repair for predefined methods that must return sorted lists
This change will repair (by sorting) packages returned by _ALR, _PSS, and _TSS. Drivers can now assume that the packages are correctly sorted. Adds one new file, nsrepair2.c. ACPICA BZ 784.
http://www.acpica.org/bugzilla/show_bug.cgi?id=784
--- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acnamesp.h | 13 +- drivers/acpi/acpica/nspredef.c | 6 + drivers/acpi/acpica/nsrepair2.c | 540 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 559 insertions(+), 2 deletions(-)
drivers/acpi/acpica/Makefile +1 -1
@@ -28,7 +28,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o acpi-y += nsaccess.o nsload.o nssearch.o nsxfeval.o \ nsalloc.o nseval.o nsnames.o nsutils.o nsxfname.o \ nsdump.o nsinit.o nsobject.o nswalk.o nsxfobj.o \ - nsparse.o nspredef.o nsrepair.o + nsparse.o nspredef.o nsrepair.o nsrepair2.o acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
drivers/acpi/acpica/acnamesp.h +12 -1
@@ -273,7 +273,8 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node, acpi_object_handler handler, void **data);/* -* nsrepair - return object repair for predefined methods/objects +* nsrepair - General return object repair for all +* predefined methods/objects */ acpi_status acpi_ns_repair_object(struct acpi_predefined_data *data,
@@ -286,6 +287,16 @@ acpi_ns_repair_package_list(struct acpi_predefined_data *data, union acpi_operand_object **obj_desc_ptr);/* +* nsrepair2 - Return object repair for specific +* predefined methods/objects +*/ +acpi_status +acpi_ns_complex_repairs (struct acpi_predefined_data *data, +struct acpi_namespace_node *node, +acpi_status validate_status, +union acpi_operand_object **return_object_ptr); + +/* * nssearch - Namespace searching and entry */ acpi_status
drivers/acpi/acpica/nspredef.c +6 -0
@@ -232,6 +232,12 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, status =acpi_ns_check_package (data, return_object_ptr); } +/* +* Perform additional, more complicated repairs on a per-name +* basis. +*/ + status =acpi_ns_complex_repairs (data, node, status, return_object_ptr); + check_validation_status:/* * If the object validation failed or if we successfully repaired one
drivers/acpi/acpica/nsrepair2.c new file +540 -0
540 lines not on this page · raw message
Quoted 1 line
From
1754c0e2df77c095e713187967a7b048e20d48ccMon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:49:50 +0800
Subject: [PATCH 6/9] ACPICA: New internal utility function to create Integer objects
acpi_ut_create_integer_object. This function (when deployed) should simplify some of the object creation code. ACPICA BZ 823.
http://www.acpica.org/bugzilla/show_bug.cgi?id=823
--- drivers/acpi/acpica/acutils.h | 2 ++ drivers/acpi/acpica/utobject.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-)
drivers/acpi/acpica/acutils.h +2 -0
@@ -386,6 +386,8 @@ u8 acpi_ut_valid_internal_object(void *object);union acpi_operand_object *acpi_ut_create_package_object (u32 count); +union acpi_operand_object *acpi_ut_create_integer_object (u64 value); +union acpi_operand_object *acpi_ut_create_buffer_object (acpi_size buffer_size);union acpi_operand_object *acpi_ut_create_string_object (acpi_size string_size);
drivers/acpi/acpica/utobject.c +29 -0
@@ -190,6 +190,35 @@ union acpi_operand_object *acpi_ut_create_package_object(u32 count)/******************************************************************************* * +* FUNCTION: acpi_ut_create_integer_object +* +* PARAMETERS: initial_value - Initial value for the integer +* +* RETURN: Pointer to a new Integer object, null on failure +* +* DESCRIPTION: Create an initialized integer object +* +******************************************************************************/ + +union acpi_operand_object *acpi_ut_create_integer_object (u64 initial_value) +{ +union acpi_operand_object *integer_desc; + +ACPI_FUNCTION_TRACE (ut_create_integer_object); + +/* Create and initialize a new integer object */ + + integer_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); +if (!integer_desc) { +return_PTR (NULL ); + } + + integer_desc->integer.value = initial_value; +return_PTR (integer_desc); +} + +/******************************************************************************* +* * FUNCTION: acpi_ut_create_buffer_object * * PARAMETERS: buffer_size - Size of buffer to be created
Quoted 1 line
From
f081db99cc7b75333b9217c7fceed5a6a43fdcbfMon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Thu, 12 Nov 2009 09:52:45 +0800
Subject: [PATCH 7/9] ACPICA: Deploy new create integer interface where appropriate
Simplifies creation of simple integer objects.
ACPICA BZ 823.
http://www.acpica.org/bugzilla/show_bug.cgi?id=823
--- drivers/acpi/acpica/dsmthdat.c | 4 +--- drivers/acpi/acpica/evregion.c | 11 ++++------- drivers/acpi/acpica/exconfig.c | 4 +--- drivers/acpi/acpica/exconvrt.c | 3 +-- drivers/acpi/acpica/exfield.c | 3 +-- drivers/acpi/acpica/exoparg1.c | 38 +++++++++++++++++--------------------- drivers/acpi/acpica/exoparg6.c | 7 ++----- drivers/acpi/acpica/psparse.c | 8 ++------ drivers/acpi/acpica/psxface.c | 4 +--- 9 files changed, 30 insertions(+), 52 deletions(-)
drivers/acpi/acpica/dsmthdat.c +1 -3
@@ -409,13 +409,11 @@ acpi_ds_method_data_get_value(u8 type,/* If slack enabled, init the local_x/arg_x to an Integer of value zero */ if (acpi_gbl_enable_interpreter_slack) { - object = -acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + object =acpi_ut_create_integer_object ((u64 )0 );if (!object) {return_ACPI_STATUS (AE_NO_MEMORY ); } - object->integer.value =0 ; node->object = object; }
drivers/acpi/acpica/evregion.c +4 -7
@@ -289,23 +289,20 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)* connection status 1 for connecting the handler, 0 for disconnecting * the handler (Passed as a parameter) */ - args[0 ] =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + args[0 ] = +acpi_ut_create_integer_object ((u64 ) region_obj->region.space_id);if (!args[0 ]) { status =AE_NO_MEMORY ; goto cleanup1; } - args[1 ] =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + args[1 ] =acpi_ut_create_integer_object ((u64 ) function);if (!args[1 ]) { status =AE_NO_MEMORY ; goto cleanup2; } -/* Setup the parameter objects */ - - args[0 ]->integer.value = region_obj->region.space_id; - args[1 ]->integer.value = function; - args[2 ] =NULL ; + args[2 ] =NULL ;/* Terminate list */ /* Execute the method, no return value */
drivers/acpi/acpica/exconfig.c +1 -3
@@ -170,14 +170,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,/* Table not found, return an Integer=0 and AE_OK */ - ddb_handle =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + ddb_handle =acpi_ut_create_integer_object ((u64 )0 );if (!ddb_handle) {return_ACPI_STATUS (AE_NO_MEMORY ); } - ddb_handle->integer.value =0 ; *return_desc = ddb_handle; -return_ACPI_STATUS (AE_OK ); }
drivers/acpi/acpica/exconvrt.c +1 -2
@@ -167,7 +167,7 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,/* Create a new integer */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc =acpi_ut_create_integer_object (result);if (!return_desc) {return_ACPI_STATUS (AE_NO_MEMORY ); }
@@ -177,7 +177,6 @@ acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,/* Save the Result */ - return_desc->integer.value = result;acpi_ex_truncate_for32bit_table (return_desc); *result_desc = return_desc;return_ACPI_STATUS (AE_OK );
drivers/acpi/acpica/exfield.c +1 -2
@@ -162,13 +162,12 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state, }else {/* Field will fit within an Integer (normal case) */ - buffer_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + buffer_desc =acpi_ut_create_integer_object ((u64 )0 );if (!buffer_desc) {return_ACPI_STATUS (AE_NO_MEMORY ); } length = acpi_gbl_integer_byte_width; - buffer_desc->integer.value =0 ; buffer = &buffer_desc->integer.value; }
drivers/acpi/acpica/exoparg1.c +17 -21
@@ -100,12 +100,12 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)/* Create a return object of type Integer */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc = +acpi_ut_create_integer_object (acpi_os_get_timer ());if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup; } - return_desc->integer.value =acpi_os_get_timer ();break ;default :/* Unknown opcode */
@@ -599,7 +599,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)switch (walk_state->opcode) {case AML_LNOT_OP :/* LNot (Operand) */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc =acpi_ut_create_integer_object ((u64 )0 );if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup;
@@ -702,13 +702,11 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)/* Allocate a descriptor to hold the type. */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc =acpi_ut_create_integer_object ((u64 ) type);if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup; } - - return_desc->integer.value = type;break ;case AML_SIZE_OF_OP :/* size_of (source_object) */
@@ -777,13 +775,11 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)* Now that we have the size of the object, create a result * object to hold the value */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc =acpi_ut_create_integer_object (value);if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup; } - - return_desc->integer.value = value;break ;case AML_REF_OF_OP :/* ref_of (source_object) */
@@ -946,24 +942,24 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)* NOTE: index into a buffer is NOT a pointer to a * sub-buffer of the main buffer, it is only a pointer to a * single element (byte) of the buffer! +* +* Since we are returning the value of the buffer at the +* indexed location, we don't need to add an additional +* reference to the buffer itself. */ return_desc = -acpi_ut_create_internal_object - (ACPI_TYPE_INTEGER ); +acpi_ut_create_integer_object ((u64 ) + temp_desc-> + buffer. + pointer + [operand + [0 ]-> + reference. + value]);if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup; } - -/* -* Since we are returning the value of the buffer at the -* indexed location, we don't need to add an additional -* reference to the buffer itself. -*/ - return_desc->integer.value = - temp_desc->buffer. - pointer[operand[0 ]->reference. - value];break ;case ACPI_TYPE_PACKAGE :
drivers/acpi/acpica/exoparg6.c +2 -5
@@ -253,18 +253,15 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state) }/* Create an integer for the return value */ +/* Default return value is ACPI_INTEGER_MAX if no match found */ - return_desc =acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); + return_desc =acpi_ut_create_integer_object (ACPI_INTEGER_MAX );if (!return_desc) { status =AE_NO_MEMORY ; goto cleanup; } -/* Default return value if no match found */ - - return_desc->integer.value =ACPI_INTEGER_MAX ; -/* * Examine each element until a match is found. Both match conditions * must be satisfied for a match to occur. Within the loop,
drivers/acpi/acpica/psparse.c +2 -6
@@ -610,17 +610,13 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) implicit_return_obj) { previous_walk_state-> implicit_return_obj = -acpi_ut_create_internal_object - (ACPI_TYPE_INTEGER ); +acpi_ut_create_integer_object + ((u64 )0 );if (!previous_walk_state-> implicit_return_obj) {return_ACPI_STATUS (AE_NO_MEMORY ); } - - previous_walk_state-> - implicit_return_obj-> - integer.value =0 ; }/* Restart the calling control method */
drivers/acpi/acpica/psxface.c +1 -3
@@ -306,14 +306,12 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)*/ if (acpi_gbl_enable_interpreter_slack) { walk_state->implicit_return_obj = -acpi_ut_create_internal_object (ACPI_TYPE_INTEGER ); +acpi_ut_create_integer_object ((u64 )0 );if (!walk_state->implicit_return_obj) { status =AE_NO_MEMORY ;acpi_ds_delete_walk_state (walk_state); goto cleanup; } - - walk_state->implicit_return_obj->integer.value =0 ; }/* Parse the AML */
Quoted 1 line
From
88aa1bc0054f410b70ca7b106f08eef6230953afMon Sep 17 00:00:00 2001
From: Lin Ming <[email protected]>
Date: Thu, 12 Nov 2009 09:57:53 +0800
Subject: [PATCH 8/9] ACPICA: Add additional module-level code support
This change will execute module-level code that is not at the root of the namespace (under a Device object, etc.). ACPICA BZ 762.
http://www.acpica.org/bugzilla/show_bug.cgi?id=762
--- drivers/acpi/acpica/nseval.c | 50 +++++++++++++++++++++++++++++------------ drivers/acpi/acpica/psloop.c | 32 +++++++++++++++++++++----- 2 files changed, 61 insertions(+), 21 deletions(-)
drivers/acpi/acpica/nseval.c +35 -15
83 lines not on this page · raw message
drivers/acpi/acpica/psloop.c +26 -6
@@ -87,7 +87,8 @@ acpi_ps_complete_final_op(struct acpi_walk_state *walk_state, union acpi_parse_object *op, acpi_status status);static void -acpi_ps_link_module_code (u8 *aml_start,u32 aml_length,acpi_owner_id owner_id); +acpi_ps_link_module_code (union acpi_parse_object *parent_op, +u8 *aml_start,u32 aml_length,acpi_owner_id owner_id);/******************************************************************************* *
@@ -479,11 +480,14 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,*/ if (walk_state->pass_number ==ACPI_IMODE_LOAD_PASS1 ) { -acpi_ps_link_module_code (aml_op_start, - walk_state-> +acpi_ps_link_module_code (op->common. + parent, + aml_op_start, + (u32) + (walk_state-> parser_state. pkg_end - - aml_op_start, + aml_op_start), walk_state-> owner_id); }
@@ -598,7 +602,8 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,* * FUNCTION: acpi_ps_link_module_code * -* PARAMETERS: aml_start - Pointer to the AML +* PARAMETERS: parent_op - Parent parser op +* aml_start - Pointer to the AML * aml_length - Length of executable AML * owner_id - owner_id of module level code *
@@ -611,11 +616,13 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,******************************************************************************/ static void -acpi_ps_link_module_code (u8 *aml_start,u32 aml_length,acpi_owner_id owner_id) +acpi_ps_link_module_code (union acpi_parse_object *parent_op, +u8 *aml_start,u32 aml_length,acpi_owner_id owner_id) {union acpi_operand_object *prev;union acpi_operand_object *next;union acpi_operand_object *method_obj; +struct acpi_namespace_node *parent_node;/* Get the tail of the list */
@@ -639,11 +646,24 @@ acpi_ps_link_module_code(u8 *aml_start, u32 aml_length, acpi_owner_id owner_id)return ; } +if (parent_op->common.node) { + parent_node = parent_op->common.node; + }else { + parent_node = acpi_gbl_root_node; + } + method_obj->method.aml_start = aml_start; method_obj->method.aml_length = aml_length; method_obj->method.owner_id = owner_id; method_obj->method.flags |=AOPOBJ_MODULE_LEVEL ; +/* +* Save the parent node in next_object. This is cheating, but we +* don't want to expand the method object. +*/ + method_obj->method.next_object = + ACPI_CAST_PTR(union acpi_operand_object, parent_node); +if (!prev) { acpi_gbl_module_code_list = method_obj; }else {
Quoted 1 line
From
2192674eb11f072fb5c10550b3eff248556f8675Mon Sep 17 00:00:00 2001
From: Bob Moore <[email protected]>
Date: Fri, 13 Nov 2009 10:01:43 +0800
Subject: [PATCH 9/9] ACPICA: Update version to 20091112.
Version 20091112.
--- include/acpi/acpixf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/acpi/acpixf.h +1 -1
@@ -47,7 +47,7 @@/* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20091013 +#define ACPI_CA_VERSION 0x20091112#include "actypes.h" #include "actbl.h"