diff options
author | Xiaoyan Zhang <xiaoyan.zhang@intel.com> | 2012-08-22 06:47:22 -0400 |
---|---|---|
committer | Kent Yoder <key@linux.vnet.ibm.com> | 2012-08-22 17:23:42 -0400 |
commit | f84fdff0fdcda7e509ce530e0ee612233a2104fb (patch) | |
tree | 6af900776de08b9610f383eb741681366e800e9a /drivers/char/tpm/tpm.c | |
parent | 1f862f0f96abdf8b030bda84d6b66d676f31785f (diff) |
driver: add PPI support in tpm driver
The Physical Presence Interface enables the OS and the BIOS to cooperate and
provides a simple and straightforward platform user experience for
administering the TPM without sacrificing security.
V2: separate the patch out in a separate source file,
add #ifdef CONFIG_ACPI so it compiles out on ppc,
use standard error instead of ACPI error as return code of show/store fns.
V3: move #ifdef CONFIG_ACPI from .c file to .h file.
V4: move tpm_ppi code from tpm module to tpm_bios module.
V5: modify sys_add_ppi() so that ppi_attr_grp doesn't need to be exported
Signed-off-by: Xiaoyan Zhang <xiaoyan.zhang@intel.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm/tpm.c')
-rw-r--r-- | drivers/char/tpm/tpm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index 0a75638e3e56..39526c053158 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
@@ -1476,6 +1476,11 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, | |||
1476 | goto put_device; | 1476 | goto put_device; |
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | if (sys_add_ppi(&dev->kobj)) { | ||
1480 | misc_deregister(&chip->vendor.miscdev); | ||
1481 | goto put_device; | ||
1482 | } | ||
1483 | |||
1479 | chip->bios_dir = tpm_bios_log_setup(devname); | 1484 | chip->bios_dir = tpm_bios_log_setup(devname); |
1480 | 1485 | ||
1481 | /* Make chip available */ | 1486 | /* Make chip available */ |