tpm_tis: Do not fall back to a hardcoded address for TPM2

[cascardo/linux.git] / drivers / char / tpm / tpm_tis.c

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 8a3509c..2ccad8a 100644 (file)
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -28,7 +28,6 @@
 #include <linux/wait.h>
 #include <linux/acpi.h>
 #include <linux/freezer.h>
-#include <acpi/actbl2.h>
 #include "tpm.h"
 
 enum tis_access {
@@ -69,7 +68,11 @@ enum tis_defaults {
 struct tpm_info {
        unsigned long start;
        unsigned long len;
-       unsigned int irq;
+       /* irq > 0 means: use irq $irq;
+        * irq = 0 means: autoprobe for an irq;
+        * irq = -1 means: no irq support
+        */
+       int irq;
 };
 
 static struct tpm_info tis_default_info = {
@@ -118,39 +121,11 @@ static inline int is_itpm(struct acpi_device *dev)
 {
        return has_hid(dev, "INTC0102");
 }
-
-static inline int is_fifo(struct acpi_device *dev)
-{
-       struct acpi_table_tpm2 *tbl;
-       acpi_status st;
-
-       /* TPM 1.2 FIFO */
-       if (!has_hid(dev, "MSFT0101"))
-               return 1;
-
-       st = acpi_get_table(ACPI_SIG_TPM2, 1,
-                           (struct acpi_table_header **) &tbl);
-       if (ACPI_FAILURE(st)) {
-               dev_err(&dev->dev, "failed to get TPM2 ACPI table\n");
-               return 0;
-       }
-
-       if (le32_to_cpu(tbl->start_method) != TPM2_START_FIFO)
-               return 0;
-
-       /* TPM 2.0 FIFO */
-       return 1;
-}
 #else
 static inline int is_itpm(struct acpi_device *dev)
 {
        return 0;
 }
-
-static inline int is_fifo(struct acpi_device *dev)
-{
-       return 1;
-}
 #endif
 
 /* Before we attempt to access the TPM we must see that the valid bit is set.
@@ -807,7 +782,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info,
        /* INTERRUPT Setup */
        init_waitqueue_head(&chip->vendor.read_queue);
        init_waitqueue_head(&chip->vendor.int_queue);
-       if (interrupts) {
+       if (interrupts && tpm_info->irq != -1) {
                if (tpm_info->irq) {
                        tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
                                                 tpm_info->irq);
@@ -895,9 +870,9 @@ static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
 
 #ifdef CONFIG_PNP
 static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
-                                     const struct pnp_device_id *pnp_id)
+                           const struct pnp_device_id *pnp_id)
 {
-       struct tpm_info tpm_info = tis_default_info;
+       struct tpm_info tpm_info = {};
        acpi_handle acpi_dev_handle = NULL;
 
        tpm_info.start = pnp_mem_start(pnp_dev, 0);
@@ -906,7 +881,7 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
        if (pnp_irq_valid(pnp_dev, 0))
                tpm_info.irq = pnp_irq(pnp_dev, 0);
        else
-               interrupts = false;
+               tpm_info.irq = -1;
 
 #ifdef CONFIG_ACPI
        if (pnp_acpi_device(pnp_dev)) {
@@ -976,14 +951,25 @@ static int tpm_check_resource(struct acpi_resource *ares, void *data)
 
 static int tpm_tis_acpi_init(struct acpi_device *acpi_dev)
 {
+       struct acpi_table_tpm2 *tbl;
+       acpi_status st;
        struct list_head resources;
-       struct tpm_info tpm_info = tis_default_info;
+       struct tpm_info tpm_info = {};
        int ret;
 
-       if (!is_fifo(acpi_dev))
+       st = acpi_get_table(ACPI_SIG_TPM2, 1,
+                           (struct acpi_table_header **) &tbl);
+       if (ACPI_FAILURE(st) || tbl->header.length < sizeof(*tbl)) {
+               dev_err(&acpi_dev->dev,
+                       FW_BUG "failed to get TPM2 ACPI table\n");
+               return -EINVAL;
+       }
+
+       if (tbl->start_method != ACPI_TPM2_MEMORY_MAPPED)
                return -ENODEV;
 
        INIT_LIST_HEAD(&resources);
+       tpm_info.irq = -1;
        ret = acpi_dev_get_resources(acpi_dev, &resources, tpm_check_resource,
                                     &tpm_info);
        if (ret < 0)
@@ -991,8 +977,11 @@ static int tpm_tis_acpi_init(struct acpi_device *acpi_dev)
 
        acpi_dev_free_resource_list(&resources);
 
-       if (!tpm_info.irq)
-               interrupts = false;
+       if (tpm_info.start == 0 && tpm_info.len == 0) {
+               dev_err(&acpi_dev->dev,
+                       FW_BUG "TPM2 ACPI table does not define a memory resource\n");
+               return -EINVAL;
+       }
 
        if (is_itpm(acpi_dev))
                itpm = true;