ACPI / TPM: replace open-coded _DSM code with helper functions

Use helper functions to simplify _DSM related code in TPM driver.

This patch also help to get rid of following warning messages:
[  163.509575] ACPI Error: Incorrect return type [Buffer] requested [Package]
(20130517/nsxfeval-135)

But there is still an warning left.
[  181.637366] ACPI Warning: \_SB_.IIO0.LPC0.TPM_._DSM: Argument #4 type
mismatch - Found [Buffer], ACPI requires [Package] (20130517/nsarguments-95)

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Jiang Liu 2013-12-19 20:38:17 +08:00 committed by Rafael J. Wysocki
parent 529139c973
commit 84b1667dea

View file

@ -2,15 +2,6 @@
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include "tpm.h" #include "tpm.h"
static const u8 tpm_ppi_uuid[] = {
0xA6, 0xFA, 0xDD, 0x3D,
0x1B, 0x36,
0xB4, 0x4E,
0xA4, 0x24,
0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
};
static char *tpm_device_name = "TPM";
#define TPM_PPI_REVISION_ID 1 #define TPM_PPI_REVISION_ID 1
#define TPM_PPI_FN_VERSION 1 #define TPM_PPI_FN_VERSION 1
#define TPM_PPI_FN_SUBREQ 2 #define TPM_PPI_FN_SUBREQ 2
@ -24,250 +15,185 @@ static char *tpm_device_name = "TPM";
#define PPI_VS_REQ_END 255 #define PPI_VS_REQ_END 255
#define PPI_VERSION_LEN 3 #define PPI_VERSION_LEN 3
static const u8 tpm_ppi_uuid[] = {
0xA6, 0xFA, 0xDD, 0x3D,
0x1B, 0x36,
0xB4, 0x4E,
0xA4, 0x24,
0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53
};
static char *tpm_device_name = "TPM";
static char tpm_ppi_version[PPI_VERSION_LEN + 1];
static acpi_handle tpm_ppi_handle;
static acpi_status ppi_callback(acpi_handle handle, u32 level, void *context, static acpi_status ppi_callback(acpi_handle handle, u32 level, void *context,
void **return_value) void **return_value)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer))) { status = acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
if (ACPI_FAILURE(status))
return AE_OK;
if (strstr(buffer.pointer, context) != NULL) { if (strstr(buffer.pointer, context) != NULL) {
union acpi_object *obj;
/* Cache version string */
obj = acpi_evaluate_dsm_typed(handle, tpm_ppi_uuid,
TPM_PPI_REVISION_ID, TPM_PPI_FN_VERSION,
NULL, ACPI_TYPE_STRING);
if (obj) {
strlcpy(tpm_ppi_version, obj->string.pointer,
PPI_VERSION_LEN + 1);
ACPI_FREE(obj);
}
*return_value = handle; *return_value = handle;
status = AE_CTRL_TERMINATE; status = AE_CTRL_TERMINATE;
} }
kfree(buffer.pointer); kfree(buffer.pointer);
}
return status; return status;
} }
static inline void ppi_assign_params(union acpi_object params[4], static inline union acpi_object *
u64 function_num) tpm_eval_dsm(int func, acpi_object_type type, union acpi_object *argv4)
{ {
params[0].type = ACPI_TYPE_BUFFER; BUG_ON(!tpm_ppi_handle);
params[0].buffer.length = sizeof(tpm_ppi_uuid); return acpi_evaluate_dsm_typed(tpm_ppi_handle, tpm_ppi_uuid,
params[0].buffer.pointer = (char *)tpm_ppi_uuid; TPM_PPI_REVISION_ID, func, argv4, type);
params[1].type = ACPI_TYPE_INTEGER;
params[1].integer.value = TPM_PPI_REVISION_ID;
params[2].type = ACPI_TYPE_INTEGER;
params[2].integer.value = function_num;
params[3].type = ACPI_TYPE_PACKAGE;
params[3].package.count = 0;
params[3].package.elements = NULL;
} }
static ssize_t tpm_show_ppi_version(struct device *dev, static ssize_t tpm_show_ppi_version(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
acpi_handle handle; return scnprintf(buf, PAGE_SIZE, "%s\n", tpm_ppi_version);
acpi_status status;
struct acpi_object_list input;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
union acpi_object *obj;
input.count = 4;
ppi_assign_params(params, TPM_PPI_FN_VERSION);
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_STRING);
if (ACPI_FAILURE(status))
return -ENOMEM;
obj = (union acpi_object *)output.pointer;
status = scnprintf(buf, PAGE_SIZE, "%s\n", obj->string.pointer);
kfree(output.pointer);
return status;
} }
static ssize_t tpm_show_ppi_request(struct device *dev, static ssize_t tpm_show_ppi_request(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
acpi_handle handle; ssize_t size = -EINVAL;
acpi_status status; union acpi_object *obj;
struct acpi_object_list input;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
union acpi_object *ret_obj;
input.count = 4; obj = tpm_eval_dsm(TPM_PPI_FN_GETREQ, ACPI_TYPE_PACKAGE, NULL);
ppi_assign_params(params, TPM_PPI_FN_GETREQ); if (!obj)
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO; return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_PACKAGE);
if (ACPI_FAILURE(status))
return -ENOMEM;
/* /*
* output.pointer should be of package type, including two integers. * output.pointer should be of package type, including two integers.
* The first is function return code, 0 means success and 1 means * The first is function return code, 0 means success and 1 means
* error. The second is pending TPM operation requested by the OS, 0 * error. The second is pending TPM operation requested by the OS, 0
* means none and >0 means operation value. * means none and >0 means operation value.
*/ */
ret_obj = ((union acpi_object *)output.pointer)->package.elements; if (obj->package.count == 2 &&
if (ret_obj->type == ACPI_TYPE_INTEGER) { obj->package.elements[0].type == ACPI_TYPE_INTEGER &&
if (ret_obj->integer.value) { obj->package.elements[1].type == ACPI_TYPE_INTEGER) {
status = -EFAULT; if (obj->package.elements[0].integer.value)
goto cleanup; size = -EFAULT;
}
ret_obj++;
if (ret_obj->type == ACPI_TYPE_INTEGER)
status = scnprintf(buf, PAGE_SIZE, "%llu\n",
ret_obj->integer.value);
else else
status = -EINVAL; size = scnprintf(buf, PAGE_SIZE, "%llu\n",
} else { obj->package.elements[1].integer.value);
status = -EINVAL;
} }
cleanup:
kfree(output.pointer); ACPI_FREE(obj);
return status;
return size;
} }
static ssize_t tpm_store_ppi_request(struct device *dev, static ssize_t tpm_store_ppi_request(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
acpi_status status;
struct acpi_object_list input;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
union acpi_object obj;
u32 req; u32 req;
u64 ret; u64 ret;
int func = TPM_PPI_FN_SUBREQ;
union acpi_object *obj, tmp;
union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
input.count = 4;
ppi_assign_params(params, TPM_PPI_FN_VERSION);
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_STRING);
if (ACPI_FAILURE(status))
return -ENOMEM;
strlcpy(version,
((union acpi_object *)output.pointer)->string.pointer,
PPI_VERSION_LEN + 1);
kfree(output.pointer);
output.length = ACPI_ALLOCATE_BUFFER;
output.pointer = NULL;
/* /*
* the function to submit TPM operation request to pre-os environment * the function to submit TPM operation request to pre-os environment
* is updated with function index from SUBREQ to SUBREQ2 since PPI * is updated with function index from SUBREQ to SUBREQ2 since PPI
* version 1.1 * version 1.1
*/ */
if (strcmp(version, "1.1") == -1) if (strcmp(tpm_ppi_version, "1.1") >= 0)
params[2].integer.value = TPM_PPI_FN_SUBREQ; func = TPM_PPI_FN_SUBREQ2;
else
params[2].integer.value = TPM_PPI_FN_SUBREQ2;
/* /*
* PPI spec defines params[3].type as ACPI_TYPE_PACKAGE. Some BIOS * PPI spec defines params[3].type as ACPI_TYPE_PACKAGE. Some BIOS
* accept buffer/string/integer type, but some BIOS accept buffer/ * accept buffer/string/integer type, but some BIOS accept buffer/
* string/package type. For PPI version 1.0 and 1.1, use buffer type * string/package type. For PPI version 1.0 and 1.1, use buffer type
* for compatibility, and use package type since 1.2 according to spec. * for compatibility, and use package type since 1.2 according to spec.
*/ */
if (strcmp(version, "1.2") == -1) { if (strcmp(tpm_ppi_version, "1.2") < 0) {
params[3].type = ACPI_TYPE_BUFFER; if (sscanf(buf, "%d", &req) != 1)
params[3].buffer.length = sizeof(req); return -EINVAL;
sscanf(buf, "%d", &req); argv4.type = ACPI_TYPE_BUFFER;
params[3].buffer.pointer = (char *)&req; argv4.buffer.length = sizeof(req);
argv4.buffer.pointer = (u8 *)&req;
} else { } else {
params[3].package.count = 1; tmp.type = ACPI_TYPE_INTEGER;
obj.type = ACPI_TYPE_INTEGER; if (sscanf(buf, "%llu", &tmp.integer.value) != 1)
sscanf(buf, "%llu", &obj.integer.value); return -EINVAL;
params[3].package.elements = &obj; }
obj = tpm_eval_dsm(func, ACPI_TYPE_INTEGER, &argv4);
if (!obj) {
return -ENXIO;
} else {
ret = obj->integer.value;
ACPI_FREE(obj);
} }
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_INTEGER);
if (ACPI_FAILURE(status))
return -ENOMEM;
ret = ((union acpi_object *)output.pointer)->integer.value;
if (ret == 0) if (ret == 0)
status = (acpi_status)count; return (acpi_status)count;
else if (ret == 1)
status = -EPERM; return (ret == 1) ? -EPERM : -EFAULT;
else
status = -EFAULT;
kfree(output.pointer);
return status;
} }
static ssize_t tpm_show_ppi_transition_action(struct device *dev, static ssize_t tpm_show_ppi_transition_action(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
acpi_status status;
struct acpi_object_list input;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
u32 ret; u32 ret;
char *info[] = { acpi_status status;
union acpi_object *obj = NULL;
union acpi_object tmp = {
.buffer.type = ACPI_TYPE_BUFFER,
.buffer.length = 0,
.buffer.pointer = NULL
};
static char *info[] = {
"None", "None",
"Shutdown", "Shutdown",
"Reboot", "Reboot",
"OS Vendor-specific", "OS Vendor-specific",
"Error", "Error",
}; };
input.count = 4;
ppi_assign_params(params, TPM_PPI_FN_VERSION);
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_STRING);
if (ACPI_FAILURE(status))
return -ENOMEM;
strlcpy(version,
((union acpi_object *)output.pointer)->string.pointer,
PPI_VERSION_LEN + 1);
/* /*
* PPI spec defines params[3].type as empty package, but some platforms * PPI spec defines params[3].type as empty package, but some platforms
* (e.g. Capella with PPI 1.0) need integer/string/buffer type, so for * (e.g. Capella with PPI 1.0) need integer/string/buffer type, so for
* compatibility, define params[3].type as buffer, if PPI version < 1.2 * compatibility, define params[3].type as buffer, if PPI version < 1.2
*/ */
if (strcmp(version, "1.2") == -1) { if (strcmp(tpm_ppi_version, "1.2") < 0)
params[3].type = ACPI_TYPE_BUFFER; obj = &tmp;
params[3].buffer.length = 0; obj = tpm_eval_dsm(TPM_PPI_FN_GETACT, ACPI_TYPE_INTEGER, obj);
params[3].buffer.pointer = NULL; if (!obj) {
return -ENXIO;
} else {
ret = obj->integer.value;
ACPI_FREE(obj);
} }
params[2].integer.value = TPM_PPI_FN_GETACT;
kfree(output.pointer);
output.length = ACPI_ALLOCATE_BUFFER;
output.pointer = NULL;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_INTEGER);
if (ACPI_FAILURE(status))
return -ENOMEM;
ret = ((union acpi_object *)output.pointer)->integer.value;
if (ret < ARRAY_SIZE(info) - 1) if (ret < ARRAY_SIZE(info) - 1)
status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret, info[ret]); status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret, info[ret]);
else else
status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret, status = scnprintf(buf, PAGE_SIZE, "%d: %s\n", ret,
info[ARRAY_SIZE(info)-1]); info[ARRAY_SIZE(info)-1]);
kfree(output.pointer);
return status; return status;
} }
@ -275,27 +201,14 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
acpi_handle handle; acpi_status status = -EINVAL;
acpi_status status; union acpi_object *obj, *ret_obj;
struct acpi_object_list input; u64 req, res;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
union acpi_object *ret_obj;
u64 req;
input.count = 4; obj = tpm_eval_dsm(TPM_PPI_FN_GETRSP, ACPI_TYPE_PACKAGE, NULL);
ppi_assign_params(params, TPM_PPI_FN_GETRSP); if (!obj)
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO; return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output,
ACPI_TYPE_PACKAGE);
if (ACPI_FAILURE(status))
return -ENOMEM;
/* /*
* parameter output.pointer should be of package type, including * parameter output.pointer should be of package type, including
* 3 integers. The first means function return code, the second means * 3 integers. The first means function return code, the second means
@ -303,115 +216,81 @@ static ssize_t tpm_show_ppi_response(struct device *dev,
* the most recent TPM operation request. Only if the first is 0, and * the most recent TPM operation request. Only if the first is 0, and
* the second integer is not 0, the response makes sense. * the second integer is not 0, the response makes sense.
*/ */
ret_obj = ((union acpi_object *)output.pointer)->package.elements; ret_obj = obj->package.elements;
if (ret_obj->type != ACPI_TYPE_INTEGER) { if (obj->package.count < 3 ||
status = -EINVAL; ret_obj[0].type != ACPI_TYPE_INTEGER ||
ret_obj[1].type != ACPI_TYPE_INTEGER ||
ret_obj[2].type != ACPI_TYPE_INTEGER)
goto cleanup; goto cleanup;
}
if (ret_obj->integer.value) { if (ret_obj[0].integer.value) {
status = -EFAULT; status = -EFAULT;
goto cleanup; goto cleanup;
} }
ret_obj++;
if (ret_obj->type != ACPI_TYPE_INTEGER) { req = ret_obj[1].integer.value;
status = -EINVAL; res = ret_obj[2].integer.value;
goto cleanup; if (req) {
} if (res == 0)
if (ret_obj->integer.value) {
req = ret_obj->integer.value;
ret_obj++;
if (ret_obj->type != ACPI_TYPE_INTEGER) {
status = -EINVAL;
goto cleanup;
}
if (ret_obj->integer.value == 0)
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req, status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
"0: Success"); "0: Success");
else if (ret_obj->integer.value == 0xFFFFFFF0) else if (res == 0xFFFFFFF0)
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req, status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
"0xFFFFFFF0: User Abort"); "0xFFFFFFF0: User Abort");
else if (ret_obj->integer.value == 0xFFFFFFF1) else if (res == 0xFFFFFFF1)
status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req, status = scnprintf(buf, PAGE_SIZE, "%llu %s\n", req,
"0xFFFFFFF1: BIOS Failure"); "0xFFFFFFF1: BIOS Failure");
else if (ret_obj->integer.value >= 1 && else if (res >= 1 && res <= 0x00000FFF)
ret_obj->integer.value <= 0x00000FFF)
status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n", status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
req, ret_obj->integer.value, req, res, "Corresponding TPM error");
"Corresponding TPM error");
else else
status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n", status = scnprintf(buf, PAGE_SIZE, "%llu %llu: %s\n",
req, ret_obj->integer.value, req, res, "Error");
"Error");
} else { } else {
status = scnprintf(buf, PAGE_SIZE, "%llu: %s\n", status = scnprintf(buf, PAGE_SIZE, "%llu: %s\n",
ret_obj->integer.value, "No Recent Request"); req, "No Recent Request");
} }
cleanup: cleanup:
kfree(output.pointer); ACPI_FREE(obj);
return status; return status;
} }
static ssize_t show_ppi_operations(char *buf, u32 start, u32 end) static ssize_t show_ppi_operations(char *buf, u32 start, u32 end)
{ {
char *str = buf;
char version[PPI_VERSION_LEN + 1];
acpi_handle handle;
acpi_status status;
struct acpi_object_list input;
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object params[4];
union acpi_object obj;
int i; int i;
u32 ret; u32 ret;
char *info[] = { char *str = buf;
union acpi_object *obj, tmp;
union acpi_object argv = ACPI_INIT_DSM_ARGV4(1, &tmp);
static char *info[] = {
"Not implemented", "Not implemented",
"BIOS only", "BIOS only",
"Blocked for OS by BIOS", "Blocked for OS by BIOS",
"User required", "User required",
"User not required", "User not required",
}; };
input.count = 4;
ppi_assign_params(params, TPM_PPI_FN_VERSION);
input.pointer = params;
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, ppi_callback, NULL,
tpm_device_name, &handle);
if (ACPI_FAILURE(status))
return -ENXIO;
status = acpi_evaluate_object_typed(handle, "_DSM", &input, &output, if (strcmp(tpm_ppi_version, "1.2") < 0)
ACPI_TYPE_STRING);
if (ACPI_FAILURE(status))
return -ENOMEM;
strlcpy(version,
((union acpi_object *)output.pointer)->string.pointer,
PPI_VERSION_LEN + 1);
kfree(output.pointer);
output.length = ACPI_ALLOCATE_BUFFER;
output.pointer = NULL;
if (strcmp(version, "1.2") == -1)
return -EPERM; return -EPERM;
params[2].integer.value = TPM_PPI_FN_GETOPR; tmp.integer.type = ACPI_TYPE_INTEGER;
params[3].package.count = 1;
obj.type = ACPI_TYPE_INTEGER;
params[3].package.elements = &obj;
for (i = start; i <= end; i++) { for (i = start; i <= end; i++) {
obj.integer.value = i; tmp.integer.value = i;
status = acpi_evaluate_object_typed(handle, "_DSM", obj = tpm_eval_dsm(TPM_PPI_FN_GETOPR, ACPI_TYPE_INTEGER, &argv);
&input, &output, ACPI_TYPE_INTEGER); if (!obj) {
if (ACPI_FAILURE(status))
return -ENOMEM; return -ENOMEM;
} else {
ret = obj->integer.value;
ACPI_FREE(obj);
}
ret = ((union acpi_object *)output.pointer)->integer.value;
if (ret > 0 && ret < ARRAY_SIZE(info)) if (ret > 0 && ret < ARRAY_SIZE(info))
str += scnprintf(str, PAGE_SIZE, "%d %d: %s\n", str += scnprintf(str, PAGE_SIZE, "%d %d: %s\n",
i, ret, info[ret]); i, ret, info[ret]);
kfree(output.pointer);
output.length = ACPI_ALLOCATE_BUFFER;
output.pointer = NULL;
} }
return str - buf; return str - buf;
} }
@ -453,6 +332,13 @@ static struct attribute_group ppi_attr_grp = {
int tpm_add_ppi(struct kobject *parent) int tpm_add_ppi(struct kobject *parent)
{ {
/* Cache TPM ACPI handle and version string */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
ppi_callback, NULL,
tpm_device_name, &tpm_ppi_handle);
if (tpm_ppi_handle == NULL)
return -ENODEV;
return sysfs_create_group(parent, &ppi_attr_grp); return sysfs_create_group(parent, &ppi_attr_grp);
} }