mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 07:01:32 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
385 lines
9.2 KiB
C
385 lines
9.2 KiB
C
/*
|
|
* acpi_utils.c - ACPI Utility Functions ($Revision: 10 $)
|
|
*
|
|
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
|
|
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/init.h>
|
|
#include <linux/types.h>
|
|
#include <acpi/acpi_bus.h>
|
|
#include <acpi/acpi_drivers.h>
|
|
|
|
#include "internal.h"
|
|
|
|
#define _COMPONENT ACPI_BUS_COMPONENT
|
|
ACPI_MODULE_NAME("utils");
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Object Evaluation Helpers
|
|
-------------------------------------------------------------------------- */
|
|
static void
|
|
acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
|
|
{
|
|
#ifdef ACPI_DEBUG_OUTPUT
|
|
char prefix[80] = {'\0'};
|
|
struct acpi_buffer buffer = {sizeof(prefix), prefix};
|
|
acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",
|
|
(char *) prefix, p, acpi_format_exception(s)));
|
|
#else
|
|
return;
|
|
#endif
|
|
}
|
|
|
|
acpi_status
|
|
acpi_extract_package(union acpi_object *package,
|
|
struct acpi_buffer *format, struct acpi_buffer *buffer)
|
|
{
|
|
u32 size_required = 0;
|
|
u32 tail_offset = 0;
|
|
char *format_string = NULL;
|
|
u32 format_count = 0;
|
|
u32 i = 0;
|
|
u8 *head = NULL;
|
|
u8 *tail = NULL;
|
|
|
|
|
|
if (!package || (package->type != ACPI_TYPE_PACKAGE)
|
|
|| (package->package.count < 1)) {
|
|
printk(KERN_WARNING PREFIX "Invalid package argument\n");
|
|
return AE_BAD_PARAMETER;
|
|
}
|
|
|
|
if (!format || !format->pointer || (format->length < 1)) {
|
|
printk(KERN_WARNING PREFIX "Invalid format argument\n");
|
|
return AE_BAD_PARAMETER;
|
|
}
|
|
|
|
if (!buffer) {
|
|
printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
|
|
return AE_BAD_PARAMETER;
|
|
}
|
|
|
|
format_count = (format->length / sizeof(char)) - 1;
|
|
if (format_count > package->package.count) {
|
|
printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
|
|
" than exist in package [%d].\n",
|
|
format_count, package->package.count);
|
|
return AE_BAD_DATA;
|
|
}
|
|
|
|
format_string = format->pointer;
|
|
|
|
/*
|
|
* Calculate size_required.
|
|
*/
|
|
for (i = 0; i < format_count; i++) {
|
|
|
|
union acpi_object *element = &(package->package.elements[i]);
|
|
|
|
if (!element) {
|
|
return AE_BAD_DATA;
|
|
}
|
|
|
|
switch (element->type) {
|
|
|
|
case ACPI_TYPE_INTEGER:
|
|
switch (format_string[i]) {
|
|
case 'N':
|
|
size_required += sizeof(u64);
|
|
tail_offset += sizeof(u64);
|
|
break;
|
|
case 'S':
|
|
size_required +=
|
|
sizeof(char *) + sizeof(u64) +
|
|
sizeof(char);
|
|
tail_offset += sizeof(char *);
|
|
break;
|
|
default:
|
|
printk(KERN_WARNING PREFIX "Invalid package element"
|
|
" [%d]: got number, expecing"
|
|
" [%c]\n",
|
|
i, format_string[i]);
|
|
return AE_BAD_DATA;
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case ACPI_TYPE_STRING:
|
|
case ACPI_TYPE_BUFFER:
|
|
switch (format_string[i]) {
|
|
case 'S':
|
|
size_required +=
|
|
sizeof(char *) +
|
|
(element->string.length * sizeof(char)) +
|
|
sizeof(char);
|
|
tail_offset += sizeof(char *);
|
|
break;
|
|
case 'B':
|
|
size_required +=
|
|
sizeof(u8 *) +
|
|
(element->buffer.length * sizeof(u8));
|
|
tail_offset += sizeof(u8 *);
|
|
break;
|
|
default:
|
|
printk(KERN_WARNING PREFIX "Invalid package element"
|
|
" [%d] got string/buffer,"
|
|
" expecing [%c]\n",
|
|
i, format_string[i]);
|
|
return AE_BAD_DATA;
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case ACPI_TYPE_PACKAGE:
|
|
default:
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
|
"Found unsupported element at index=%d\n",
|
|
i));
|
|
/* TBD: handle nested packages... */
|
|
return AE_SUPPORT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Validate output buffer.
|
|
*/
|
|
if (buffer->length < size_required) {
|
|
buffer->length = size_required;
|
|
return AE_BUFFER_OVERFLOW;
|
|
} else if (buffer->length != size_required || !buffer->pointer) {
|
|
return AE_BAD_PARAMETER;
|
|
}
|
|
|
|
head = buffer->pointer;
|
|
tail = buffer->pointer + tail_offset;
|
|
|
|
/*
|
|
* Extract package data.
|
|
*/
|
|
for (i = 0; i < format_count; i++) {
|
|
|
|
u8 **pointer = NULL;
|
|
union acpi_object *element = &(package->package.elements[i]);
|
|
|
|
if (!element) {
|
|
return AE_BAD_DATA;
|
|
}
|
|
|
|
switch (element->type) {
|
|
|
|
case ACPI_TYPE_INTEGER:
|
|
switch (format_string[i]) {
|
|
case 'N':
|
|
*((u64 *) head) =
|
|
element->integer.value;
|
|
head += sizeof(u64);
|
|
break;
|
|
case 'S':
|
|
pointer = (u8 **) head;
|
|
*pointer = tail;
|
|
*((u64 *) tail) =
|
|
element->integer.value;
|
|
head += sizeof(u64 *);
|
|
tail += sizeof(u64);
|
|
/* NULL terminate string */
|
|
*tail = (char)0;
|
|
tail += sizeof(char);
|
|
break;
|
|
default:
|
|
/* Should never get here */
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case ACPI_TYPE_STRING:
|
|
case ACPI_TYPE_BUFFER:
|
|
switch (format_string[i]) {
|
|
case 'S':
|
|
pointer = (u8 **) head;
|
|
*pointer = tail;
|
|
memcpy(tail, element->string.pointer,
|
|
element->string.length);
|
|
head += sizeof(char *);
|
|
tail += element->string.length * sizeof(char);
|
|
/* NULL terminate string */
|
|
*tail = (char)0;
|
|
tail += sizeof(char);
|
|
break;
|
|
case 'B':
|
|
pointer = (u8 **) head;
|
|
*pointer = tail;
|
|
memcpy(tail, element->buffer.pointer,
|
|
element->buffer.length);
|
|
head += sizeof(u8 *);
|
|
tail += element->buffer.length * sizeof(u8);
|
|
break;
|
|
default:
|
|
/* Should never get here */
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case ACPI_TYPE_PACKAGE:
|
|
/* TBD: handle nested packages... */
|
|
default:
|
|
/* Should never get here */
|
|
break;
|
|
}
|
|
}
|
|
|
|
return AE_OK;
|
|
}
|
|
|
|
EXPORT_SYMBOL(acpi_extract_package);
|
|
|
|
acpi_status
|
|
acpi_evaluate_integer(acpi_handle handle,
|
|
acpi_string pathname,
|
|
struct acpi_object_list *arguments, unsigned long long *data)
|
|
{
|
|
acpi_status status = AE_OK;
|
|
union acpi_object element;
|
|
struct acpi_buffer buffer = { 0, NULL };
|
|
|
|
if (!data)
|
|
return AE_BAD_PARAMETER;
|
|
|
|
buffer.length = sizeof(union acpi_object);
|
|
buffer.pointer = &element;
|
|
status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
|
|
if (ACPI_FAILURE(status)) {
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
return status;
|
|
}
|
|
|
|
if (element.type != ACPI_TYPE_INTEGER) {
|
|
acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
|
|
return AE_BAD_DATA;
|
|
}
|
|
|
|
*data = element.integer.value;
|
|
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data));
|
|
|
|
return AE_OK;
|
|
}
|
|
|
|
EXPORT_SYMBOL(acpi_evaluate_integer);
|
|
|
|
acpi_status
|
|
acpi_evaluate_reference(acpi_handle handle,
|
|
acpi_string pathname,
|
|
struct acpi_object_list *arguments,
|
|
struct acpi_handle_list *list)
|
|
{
|
|
acpi_status status = AE_OK;
|
|
union acpi_object *package = NULL;
|
|
union acpi_object *element = NULL;
|
|
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
|
|
u32 i = 0;
|
|
|
|
|
|
if (!list) {
|
|
return AE_BAD_PARAMETER;
|
|
}
|
|
|
|
/* Evaluate object. */
|
|
|
|
status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
|
|
if (ACPI_FAILURE(status))
|
|
goto end;
|
|
|
|
package = buffer.pointer;
|
|
|
|
if ((buffer.length == 0) || !package) {
|
|
printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
|
|
(unsigned)buffer.length, package);
|
|
status = AE_BAD_DATA;
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
goto end;
|
|
}
|
|
if (package->type != ACPI_TYPE_PACKAGE) {
|
|
printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
|
|
package->type);
|
|
status = AE_BAD_DATA;
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
goto end;
|
|
}
|
|
if (!package->package.count) {
|
|
printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
|
|
package);
|
|
status = AE_BAD_DATA;
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
goto end;
|
|
}
|
|
|
|
if (package->package.count > ACPI_MAX_HANDLES) {
|
|
return AE_NO_MEMORY;
|
|
}
|
|
list->count = package->package.count;
|
|
|
|
/* Extract package data. */
|
|
|
|
for (i = 0; i < list->count; i++) {
|
|
|
|
element = &(package->package.elements[i]);
|
|
|
|
if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
|
|
status = AE_BAD_DATA;
|
|
printk(KERN_ERR PREFIX
|
|
"Expecting a [Reference] package element, found type %X\n",
|
|
element->type);
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
break;
|
|
}
|
|
|
|
if (!element->reference.handle) {
|
|
printk(KERN_WARNING PREFIX "Invalid reference in"
|
|
" package %s\n", pathname);
|
|
status = AE_NULL_ENTRY;
|
|
break;
|
|
}
|
|
/* Get the acpi_handle. */
|
|
|
|
list->handles[i] = element->reference.handle;
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found reference [%p]\n",
|
|
list->handles[i]));
|
|
}
|
|
|
|
end:
|
|
if (ACPI_FAILURE(status)) {
|
|
list->count = 0;
|
|
//kfree(list->handles);
|
|
}
|
|
|
|
kfree(buffer.pointer);
|
|
|
|
return status;
|
|
}
|
|
|
|
EXPORT_SYMBOL(acpi_evaluate_reference);
|