TPM: ACPI/PNP dependency removal

This patch pushes the ACPI dependency into the device driver code
itself. Now, even without ACPI/PNP enabled, the device can be registered
using the TIS specified memory space. This will however result in the
lack of access to the bios event log, being the only implication of such
ACPI removal.

Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>

2 files changed, 32 insertions, 22 deletions

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index f5fc64f89c5c..bfc2c26780fb 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -17,20 +17,28 @@ menuconfig TCG_TPM
           obtained at: <http://sourceforge.net/projects/trousers>.  To 
           compile this driver as a module, choose M here; the module 
           will be called tpm. If unsure, say N.
-          Note: For more TPM drivers enable CONFIG_PNP, CONFIG_ACPI
-          and CONFIG_PNPACPI.
+          Note: For more TPM drivers and BIOS LOG access enable
+          CONFIG_PNP, CONFIG_ACPI and CONFIG_PNPACPI.
 
 if TCG_TPM
 
 config TCG_TIS
         tristate "TPM Interface Specification 1.2 Interface"
-        depends on PNP
         ---help---
           If you have a TPM security chip that is compliant with the
           TCG TIS 1.2 TPM specification say Yes and it will be accessible
           from within Linux.  To compile this driver as a module, choose
           M here; the module will be called tpm_tis.
 
+config TCG_BIOS_LOG
+        bool "TPM bios mesurement log"
+        depends on X86
+        select ACPI
+        ---help---
+          ACPI is required for access to bios measurements lists and therefore
+          to validate the PCR[0] value. So say Yes in case you want this
+          feature and, consequently, ACPI will be enabled.
+
 config TCG_NSC
         tristate "National Semiconductor TPM Interface"
         ---help---
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 2405f17b29dd..04a18bffb730 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -597,7 +597,7 @@ out_err:
         tpm_remove_hardware(chip->dev);
         return rc;
 }
-
+#ifdef CONFIG_PNP
 static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
                                       const struct pnp_device_id *pnp_id)
 {
@@ -662,7 +662,7 @@ static struct pnp_driver tis_pnp_driver = {
 module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
                     sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);
 MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
-
+#endif
 static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg)
 {
         return tpm_pm_suspend(&dev->dev, msg);
@@ -689,21 +689,21 @@ MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry");
 static int __init init_tis(void)
 {
         int rc;
+#ifdef CONFIG_PNP
+        if (!force)
+                return pnp_register_driver(&tis_pnp_driver);
+#endif
 
-        if (force) {
-                rc = platform_driver_register(&tis_drv);
-                if (rc < 0)
-                        return rc;
-                if (IS_ERR(pdev=platform_device_register_simple("tpm_tis", -1, NULL, 0)))
-                        return PTR_ERR(pdev);
-                if((rc=tpm_tis_init(&pdev->dev, TIS_MEM_BASE, TIS_MEM_LEN, 0)) != 0) {
-                        platform_device_unregister(pdev);
-                        platform_driver_unregister(&tis_drv);
-                }
+        rc = platform_driver_register(&tis_drv);
+        if (rc < 0)
                 return rc;
+        if (IS_ERR(pdev=platform_device_register_simple("tpm_tis", -1, NULL, 0)))
+                return PTR_ERR(pdev);
+        if((rc=tpm_tis_init(&pdev->dev, TIS_MEM_BASE, TIS_MEM_LEN, 0)) != 0) {
+                platform_device_unregister(pdev);
+                platform_driver_unregister(&tis_drv);
         }
-
-        return pnp_register_driver(&tis_pnp_driver);
+        return rc;
 }
 
 static void __exit cleanup_tis(void)
@@ -727,12 +727,14 @@ static void __exit cleanup_tis(void)
                 list_del(&i->list);
         }
         spin_unlock(&tis_lock);
-
-        if (force) {
-                platform_device_unregister(pdev);
-                platform_driver_unregister(&tis_drv);
-        } else
+#ifdef CONFIG_PNP
+        if (!force) {
                 pnp_unregister_driver(&tis_pnp_driver);
+                return;
+        }
+#endif
+        platform_device_unregister(pdev);
+        platform_driver_unregister(&tis_drv);
 }
 
 module_init(init_tis);