lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI hotplug: clean up acpi_run_hpp()

Browse Source 
This patch cleans up acpi_run_hpp() and follows the style of acpi_run_hpx():
    - remove unnecessary METHOD_NAME__HPP #define
    - use ACPI_ALLOCATE_BUFFER rather than evaluating _HPP twice
    - validate _HPP package length (defined as 4 by the spec)
    - avoid ref to undefined data if FW provides < 4 elements
    - remove temporary nui[] array

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Alex Chiang <achiang@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas
2009-09-14 16:35:40 -06:00
committed by Jesse Barnes
parent e81995bb1c
commit 5e3573db2b
1 changed files with 22 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/pci/hotplug/acpi_pcihp.c
View File

@@ -41,7 +41,6 @@
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
#define METHOD_NAME__SUN "_SUN" #define METHOD_NAME__SUN "_SUN"
#define METHOD_NAME__HPP "_HPP"
#define METHOD_NAME_OSHP "OSHP" #define METHOD_NAME_OSHP "OSHP"
static int debug_acpi; static int debug_acpi;
@@ -215,80 +214,41 @@ acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
static acpi_status static acpi_status
acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp) acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
{ {
acpi_status status; acpi_status status;
u8 nui[4]; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer ret_buf = { 0, NULL}; union acpi_object *package, *fields;
struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; int i;
union acpi_object *ext_obj, *package;
int i, len = 0;
acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
/* Clear the return buffer with zeros */
memset(hpp, 0, sizeof(struct hotplug_params)); memset(hpp, 0, sizeof(struct hotplug_params));
/* get _hpp */ status = acpi_evaluate_object(handle, "_HPP", NULL, &buffer);
status = acpi_evaluate_object(handle, METHOD_NAME__HPP, NULL, &ret_buf); if (ACPI_FAILURE(status))
switch (status) { return status;
case AE_BUFFER_OVERFLOW:
ret_buf.pointer = kmalloc (ret_buf.length, GFP_KERNEL);
if (!ret_buf.pointer) {
printk(KERN_ERR "%s:%s alloc for _HPP fail\n",
__func__, (char *)string.pointer);
kfree(string.pointer);
return AE_NO_MEMORY;
}
status = acpi_evaluate_object(handle, METHOD_NAME__HPP,
NULL, &ret_buf);
if (ACPI_SUCCESS(status))
break;
default:
if (ACPI_FAILURE(status)) {
pr_debug("%s:%s _HPP fail=0x%x\n", __func__,
(char *)string.pointer, status);
kfree(string.pointer);
return status;
}
}
ext_obj = (union acpi_object *) ret_buf.pointer; package = (union acpi_object *) buffer.pointer;
if (ext_obj->type != ACPI_TYPE_PACKAGE) { if (package->type != ACPI_TYPE_PACKAGE ||
printk(KERN_ERR "%s:%s _HPP obj not a package\n", __func__, package->package.count != 4) {
(char *)string.pointer);
status = AE_ERROR; status = AE_ERROR;
goto free_and_return; goto exit;
} }
len = ext_obj->package.count; fields = package->package.elements;
package = (union acpi_object *) ret_buf.pointer; for (i = 0; i < 4; i++) {
for ( i = 0; (i < len) || (i < 4); i++) { if (fields[i].type != ACPI_TYPE_INTEGER) {
ext_obj = (union acpi_object *) &package->package.elements[i];
switch (ext_obj->type) {
case ACPI_TYPE_INTEGER:
nui[i] = (u8)ext_obj->integer.value;
break;
default:
printk(KERN_ERR "%s:%s _HPP obj type incorrect\n",
__func__, (char *)string.pointer);
status = AE_ERROR; status = AE_ERROR;
goto free_and_return; goto exit;
} }
} }
hpp->t0 = &hpp->type0_data; hpp->t0 = &hpp->type0_data;
hpp->t0->cache_line_size = nui[0]; hpp->t0->revision = 1;
hpp->t0->latency_timer = nui[1]; hpp->t0->cache_line_size = fields[0].integer.value;
hpp->t0->enable_serr = nui[2]; hpp->t0->latency_timer = fields[1].integer.value;
hpp->t0->enable_perr = nui[3]; hpp->t0->enable_serr = fields[2].integer.value;
hpp->t0->enable_perr = fields[3].integer.value;
pr_debug(" _HPP: cache_line_size=0x%x\n", hpp->t0->cache_line_size); exit:
pr_debug(" _HPP: latency timer =0x%x\n", hpp->t0->latency_timer); kfree(buffer.pointer);
pr_debug(" _HPP: enable SERR =0x%x\n", hpp->t0->enable_serr);
pr_debug(" _HPP: enable PERR =0x%x\n", hpp->t0->enable_perr);
free_and_return:
kfree(string.pointer);
kfree(ret_buf.pointer);
return status; return status;
} }