From: Lv Zheng <lv.zheng@intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Robert Moore <robert.moore@intel.com>,
Len Brown <len.brown@intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>, linux-acpi@vger.kernel.org
Subject: [PATCH 18/20] ACPICA: Add support to allow host to redefine individual OSL prototypes.
Date: Tue, 29 Oct 2013 09:30:35 +0800 [thread overview]
Message-ID: <ded8977aa40199c2f1e301e13f08eda5428f865e.1383009405.git.lv.zheng@intel.com> (raw)
In-Reply-To: <cover.1383009405.git.lv.zheng@intel.com>
This change enables the host to redefine OSL prototypes found in the
acpiosxf.h file. This allows the host to implement OSL interfaces with
a macro or inlined function. Further, it allows the host to add any
additional required modifiers such as __iomem, __init, __exit, etc.,
as necessary on a per-interface basis. Enables maximum flexibility
for the OSL interfaces. Lv Zheng.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
include/acpi/acpiosxf.h | 139 ++++++++++++++++++++++++++++++++++++++-
include/acpi/platform/aclinux.h | 1 +
2 files changed, 137 insertions(+), 3 deletions(-)
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 7f95215..55165fc 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -77,54 +77,80 @@ struct acpi_signal_fatal_info {
/*
* OSL Initialization and shutdown primitives
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize
acpi_status __init acpi_os_initialize(void);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate
acpi_status acpi_os_terminate(void);
+#endif
/*
* ACPI Table interfaces
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_root_pointer
acpi_physical_address acpi_os_get_root_pointer(void);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override
acpi_status
acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
acpi_string * new_val);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override
acpi_status
acpi_os_table_override(struct acpi_table_header *existing_table,
struct acpi_table_header **new_table);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_physical_table_override
acpi_status
acpi_os_physical_table_override(struct acpi_table_header *existing_table,
acpi_physical_address * new_address,
u32 *new_table_length);
+#endif
/*
* Spinlock primitives
*/
-#ifndef acpi_os_create_lock
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
acpi_status acpi_os_create_lock(acpi_spinlock * out_handle);
#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_delete_lock
void acpi_os_delete_lock(acpi_spinlock handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_acquire_lock
acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_release_lock
void acpi_os_release_lock(acpi_spinlock handle, acpi_cpu_flags flags);
+#endif
/*
* Semaphore primitives
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_semaphore
acpi_status
acpi_os_create_semaphore(u32 max_units,
u32 initial_units, acpi_semaphore * out_handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_delete_semaphore
acpi_status acpi_os_delete_semaphore(acpi_semaphore handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_semaphore
acpi_status
acpi_os_wait_semaphore(acpi_semaphore handle, u32 units, u16 timeout);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_signal_semaphore
acpi_status acpi_os_signal_semaphore(acpi_semaphore handle, u32 units);
+#endif
/*
* Mutex primitives. May be configured to use semaphores instead via
@@ -132,63 +158,98 @@ acpi_status acpi_os_signal_semaphore(acpi_semaphore handle, u32 units);
*/
#if (ACPI_MUTEX_TYPE != ACPI_BINARY_SEMAPHORE)
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_mutex
acpi_status acpi_os_create_mutex(acpi_mutex * out_handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_delete_mutex
void acpi_os_delete_mutex(acpi_mutex handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_acquire_mutex
acpi_status acpi_os_acquire_mutex(acpi_mutex handle, u16 timeout);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_release_mutex
void acpi_os_release_mutex(acpi_mutex handle);
#endif
+#endif
+
/*
* Memory allocation and mapping
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_allocate
void *acpi_os_allocate(acpi_size size);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_allocate_zeroed
void *acpi_os_allocate_zeroed(acpi_size size);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_free
void acpi_os_free(void *memory);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_map_memory
void __iomem *acpi_os_map_memory(acpi_physical_address where,
acpi_size length);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_unmap_memory
void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
+#endif
void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
#ifdef ACPI_FUTURE_USAGE
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_physical_address
acpi_status
acpi_os_get_physical_address(void *logical_address,
acpi_physical_address * physical_address);
#endif
+#endif
/*
* Memory/Object Cache
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_cache
acpi_status
acpi_os_create_cache(char *cache_name,
u16 object_size,
u16 max_depth, acpi_cache_t ** return_cache);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_delete_cache
acpi_status acpi_os_delete_cache(acpi_cache_t * cache);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_purge_cache
acpi_status acpi_os_purge_cache(acpi_cache_t * cache);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_acquire_object
void *acpi_os_acquire_object(acpi_cache_t * cache);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_release_object
acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object);
+#endif
/*
* Interrupt handlers
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_install_interrupt_handler
acpi_status
acpi_os_install_interrupt_handler(u32 interrupt_number,
acpi_osd_handler service_routine,
void *context);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_remove_interrupt_handler
acpi_status
acpi_os_remove_interrupt_handler(u32 interrupt_number,
acpi_osd_handler service_routine);
+#endif
void acpi_os_gpe_count(u32 gpe_number);
void acpi_os_fixed_event_count(u32 fixed_event_number);
@@ -196,86 +257,158 @@ void acpi_os_fixed_event_count(u32 fixed_event_number);
/*
* Threads and Scheduling
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_thread_id
acpi_thread_id acpi_os_get_thread_id(void);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_execute
acpi_status
acpi_os_execute(acpi_execute_type type,
acpi_osd_exec_callback function, void *context);
+#endif
acpi_status
acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_events_complete
void acpi_os_wait_events_complete(void);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_sleep
void acpi_os_sleep(u64 milliseconds);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_stall
void acpi_os_stall(u32 microseconds);
+#endif
/*
* Platform and hardware-independent I/O interfaces
*/
-acpi_status acpi_os_read_port(acpi_io_address address, u32 * value, u32 width);
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_port
+acpi_status acpi_os_read_port(acpi_io_address address, u32 *value, u32 width);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_write_port
acpi_status acpi_os_write_port(acpi_io_address address, u32 value, u32 width);
+#endif
/*
* Platform and hardware-independent physical memory interfaces
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_memory
acpi_status
acpi_os_read_memory(acpi_physical_address address, u64 *value, u32 width);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_write_memory
acpi_status
acpi_os_write_memory(acpi_physical_address address, u64 value, u32 width);
+#endif
/*
* Platform and hardware-independent PCI configuration space access
* Note: Can't use "Register" as a parameter, changed to "Reg" --
* certain compilers complain.
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_read_pci_configuration
acpi_status
acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id,
u32 reg, u64 *value, u32 width);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_write_pci_configuration
acpi_status
acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,
u32 reg, u64 value, u32 width);
+#endif
/*
* Miscellaneous
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable
+u8 acpi_os_readable(void *pointer, acpi_size length);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable
+u8 acpi_os_writable(void *pointer, acpi_size length);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_timer
u64 acpi_os_get_timer(void);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_signal
acpi_status acpi_os_signal(u32 function, void *info);
+#endif
/*
* Debug print routines
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_printf
void ACPI_INTERNAL_VAR_XFACE acpi_os_printf(const char *format, ...);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_vprintf
void acpi_os_vprintf(const char *format, va_list args);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_redirect_output
void acpi_os_redirect_output(void *destination);
+#endif
#ifdef ACPI_FUTURE_USAGE
/*
* Debug input
*/
-u32 acpi_os_get_line(char *buffer);
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_line
+acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read);
+#endif
+#endif
+
+/*
+ * Obtain ACPI table(s)
+ */
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_name
+acpi_status
+acpi_os_get_table_by_name(char *signature,
+ u32 instance,
+ struct acpi_table_header **table,
+ acpi_physical_address * address);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_index
+acpi_status
+acpi_os_get_table_by_index(u32 index,
+ struct acpi_table_header **table,
+ u32 *instance, acpi_physical_address * address);
+#endif
+
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_table_by_address
+acpi_status
+acpi_os_get_table_by_address(acpi_physical_address address,
+ struct acpi_table_header **table);
#endif
/*
* Directory manipulation
*/
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_open_directory
void *acpi_os_open_directory(char *pathname,
char *wildcard_spec, char requested_file_type);
+#endif
/* requeste_file_type values */
#define REQUEST_FILE_ONLY 0
#define REQUEST_DIR_ONLY 1
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_next_filename
char *acpi_os_get_next_filename(void *dir_handle);
+#endif
+#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_close_directory
void acpi_os_close_directory(void *dir_handle);
+#endif
#endif /* __ACPIOSXF_H__ */
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 0e6e73c..04e87a3 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -182,6 +182,7 @@ static inline void acpi_os_free(void *a)
} \
lock ? AE_OK : AE_NO_MEMORY; \
})
+#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
#ifdef EXPORT_ACPI_INTERFACES
#include <linux/export.h>
--
1.7.10
next prev parent reply other threads:[~2013-10-29 1:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 1:28 [PATCH 00/20] ACPICA: 20130927 Release Lv Zheng
2013-10-29 1:28 ` [PATCH 01/20] ACPICA: Ensure that debug output is immediately disabled on termination Lv Zheng
2013-10-29 1:28 ` [PATCH 02/20] ACPICA: Table print header function: Increase default width for table length Lv Zheng
2013-10-29 1:29 ` [PATCH 03/20] ACPICA: Add a check for a null node during namespace walk Lv Zheng
2013-10-29 1:29 ` [PATCH 04/20] ACPICA: Add history/line-editing for Unix/Linux systems Lv Zheng
2013-10-29 1:29 ` [PATCH 05/20] ACPICA: Fix a macro for the hardware-reduced case Lv Zheng
2013-10-29 1:29 ` [PATCH 06/20] ACPICA: Add safe versions of common string functions Lv Zheng
2013-10-29 1:29 ` [PATCH 07/20] ACPICA: Cleanup memory allocation macros and configurability Lv Zheng
2013-10-29 1:29 ` [PATCH 08/20] ACPICA: Predefine name macros: Sort list Lv Zheng
2013-10-29 1:29 ` [PATCH 09/20] ACPICA: Fix possible memory leaks in the GPE handling Lv Zheng
2013-10-29 1:29 ` [PATCH 10/20] ACPICA: Hardcode access width for the reset register Lv Zheng
2013-10-29 1:29 ` [PATCH 11/20] ACPICA: Add EXPORT_ACPI_INTERFACES macro to external interface modules Lv Zheng
2013-10-29 1:29 ` [PATCH 12/20] ACPICA: Update comment: no functional change Lv Zheng
2013-10-29 1:30 ` [PATCH 13/20] ACPICA: Linuxize: Change indentation of C labels Lv Zheng
2013-10-29 1:30 ` [PATCH 14/20] ACPICA: Deploy ACPI_EXPORT_SYMBOL_INIT for main ACPICA initialization interfaces Lv Zheng
2013-10-29 1:30 ` [PATCH 15/20] ACPICA: Prevent possible build issues for use of ACPI_PRINTF_LIKE macro Lv Zheng
2013-10-29 1:30 ` [PATCH 16/20] ACPICA: AcpiSrc: Fix indentation issues for macro invocations Lv Zheng
2013-10-29 1:30 ` [PATCH 17/20] ACPICA: Simplify configuration of global ACPI_REDUCED_HARDWARE macro Lv Zheng
2013-10-29 1:30 ` Lv Zheng [this message]
2013-10-29 1:30 ` [PATCH 19/20] ACPICA: Update aclinux.h for new OSL override mechanism Lv Zheng
2013-10-29 1:30 ` [PATCH 20/20] ACPICA: Update version to 20130927 Lv Zheng
2013-10-31 1:29 ` [PATCH 00/15] ACPICA: Update ACPICA files to reduce source code differences between Linux and ACPICA Lv Zheng
2013-10-31 1:29 ` [PATCH 01/15] ACPICA: Update default space handlers Lv Zheng
2013-10-31 1:30 ` [PATCH 02/15] ACPICA: Update ANOBJ_IS_EXTERNAL flag Lv Zheng
2013-10-31 1:30 ` [PATCH 03/15] ACPICA: Update namespace dump code Lv Zheng
2013-10-31 1:30 ` [PATCH 04/15] ACPICA: Update RSDP table definitions Lv Zheng
2013-10-31 1:30 ` [PATCH 05/15] ACPICA: Update DMAR " Lv Zheng
2013-10-31 1:30 ` [PATCH 06/15] ACPICA: Add new statistics interface Lv Zheng
2013-10-31 1:30 ` [PATCH 07/15] ACPICA: Fix wrong object length returned by acpi_ut_get_simple_object_size() Lv Zheng
2013-10-31 1:30 ` [PATCH 08/15] ACPICA: Fix an ACPI_ALLOCATE_ZEROED() reversal Lv Zheng
2013-10-31 1:30 ` [PATCH 09/15] ACPICA: Cleanup useless memset invocations Lv Zheng
2013-10-31 1:30 ` [PATCH 10/15] ACPICA: Remove dead AOPOBJ_INVALID check Lv Zheng
2013-10-31 1:31 ` [PATCH 11/15] ACPICA: Fix cached object deletion code Lv Zheng
2013-10-31 1:31 ` [PATCH 12/15] ACPICA: Update compilation environment settings Lv Zheng
2013-10-31 1:31 ` [PATCH 13/15] ACPICA: Update acpidump related header file changes Lv Zheng
2013-10-31 1:31 ` [PATCH 14/15] ACPICA: Cleanup asmlinkage for ACPICA APIs Lv Zheng
2013-10-31 1:31 ` [PATCH 15/15] ACPICA: Add __init for ACPICA initializers/finalizers Lv Zheng
2013-10-31 13:54 ` [PATCH 00/15] ACPICA: Update ACPICA files to reduce source code differences between Linux and ACPICA Rafael J. Wysocki
2013-11-01 0:39 ` Zheng, Lv
2013-10-31 13:53 ` [PATCH 00/20] ACPICA: 20130927 Release Rafael J. Wysocki
2013-11-01 0:39 ` Zheng, Lv
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ded8977aa40199c2f1e301e13f08eda5428f865e.1383009405.git.lv.zheng@intel.com \
--to=lv.zheng@intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).