Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[cascardo/linux.git] / drivers / char / tpm / tpm-sysfs.c

diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index ee66fd4..b46cf70 100644 (file)
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -36,7 +36,7 @@ static ssize_t pubek_show(struct device *dev, struct device_attribute *attr,
        int i, rc;
        char *str = buf;
 
-       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_chip *chip = to_tpm_chip(dev);
 
        tpm_cmd.header.in = tpm_readpubek_header;
        err = tpm_transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
@@ -92,9 +92,9 @@ static ssize_t pcrs_show(struct device *dev, struct device_attribute *attr,
        ssize_t rc;
        int i, j, num_pcrs;
        char *str = buf;
-       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_chip *chip = to_tpm_chip(dev);
 
-       rc = tpm_getcap(dev, TPM_CAP_PROP_PCR, &cap,
+       rc = tpm_getcap(chip, TPM_CAP_PROP_PCR, &cap,
                        "attempting to determine the number of PCRS");
        if (rc)
                return 0;
@@ -119,8 +119,8 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr,
        cap_t cap;
        ssize_t rc;
 
-       rc = tpm_getcap(dev, TPM_CAP_FLAG_PERM, &cap,
-                        "attempting to determine the permanent enabled state");
+       rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,
+                       "attempting to determine the permanent enabled state");
        if (rc)
                return 0;
 
@@ -135,8 +135,8 @@ static ssize_t active_show(struct device *dev, struct device_attribute *attr,
        cap_t cap;
        ssize_t rc;
 
-       rc = tpm_getcap(dev, TPM_CAP_FLAG_PERM, &cap,
-                        "attempting to determine the permanent active state");
+       rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_PERM, &cap,
+                       "attempting to determine the permanent active state");
        if (rc)
                return 0;
 
@@ -151,8 +151,8 @@ static ssize_t owned_show(struct device *dev, struct device_attribute *attr,
        cap_t cap;
        ssize_t rc;
 
-       rc = tpm_getcap(dev, TPM_CAP_PROP_OWNER, &cap,
-                        "attempting to determine the owner state");
+       rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_PROP_OWNER, &cap,
+                       "attempting to determine the owner state");
        if (rc)
                return 0;
 
@@ -167,8 +167,8 @@ static ssize_t temp_deactivated_show(struct device *dev,
        cap_t cap;
        ssize_t rc;
 
-       rc = tpm_getcap(dev, TPM_CAP_FLAG_VOL, &cap,
-                        "attempting to determine the temporary state");
+       rc = tpm_getcap(to_tpm_chip(dev), TPM_CAP_FLAG_VOL, &cap,
+                       "attempting to determine the temporary state");
        if (rc)
                return 0;
 
@@ -180,11 +180,12 @@ static DEVICE_ATTR_RO(temp_deactivated);
 static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
                         char *buf)
 {
+       struct tpm_chip *chip = to_tpm_chip(dev);
        cap_t cap;
        ssize_t rc;
        char *str = buf;
 
-       rc = tpm_getcap(dev, TPM_CAP_PROP_MANUFACTURER, &cap,
+       rc = tpm_getcap(chip, TPM_CAP_PROP_MANUFACTURER, &cap,
                        "attempting to determine the manufacturer");
        if (rc)
                return 0;
@@ -192,8 +193,8 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
                       be32_to_cpu(cap.manufacturer_id));
 
        /* Try to get a TPM version 1.2 TPM_CAP_VERSION_INFO */
-       rc = tpm_getcap(dev, CAP_VERSION_1_2, &cap,
-                        "attempting to determine the 1.2 version");
+       rc = tpm_getcap(chip, CAP_VERSION_1_2, &cap,
+                       "attempting to determine the 1.2 version");
        if (!rc) {
                str += sprintf(str,
                               "TCG version: %d.%d\nFirmware version: %d.%d\n",
@@ -203,7 +204,7 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
                               cap.tpm_version_1_2.revMinor);
        } else {
                /* Otherwise just use TPM_STRUCT_VER */
-               rc = tpm_getcap(dev, CAP_VERSION_1_1, &cap,
+               rc = tpm_getcap(chip, CAP_VERSION_1_1, &cap,
                                "attempting to determine the 1.1 version");
                if (rc)
                        return 0;
@@ -222,7 +223,7 @@ static DEVICE_ATTR_RO(caps);
 static ssize_t cancel_store(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
 {
-       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_chip *chip = to_tpm_chip(dev);
        if (chip == NULL)
                return 0;
 
@@ -234,16 +235,16 @@ static DEVICE_ATTR_WO(cancel);
 static ssize_t durations_show(struct device *dev, struct device_attribute *attr,
                              char *buf)
 {
-       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_chip *chip = to_tpm_chip(dev);
 
-       if (chip->vendor.duration[TPM_LONG] == 0)
+       if (chip->duration[TPM_LONG] == 0)
                return 0;
 
        return sprintf(buf, "%d %d %d [%s]\n",
-                      jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
-                      jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),
-                      jiffies_to_usecs(chip->vendor.duration[TPM_LONG]),
-                      chip->vendor.duration_adjusted
+                      jiffies_to_usecs(chip->duration[TPM_SHORT]),
+                      jiffies_to_usecs(chip->duration[TPM_MEDIUM]),
+                      jiffies_to_usecs(chip->duration[TPM_LONG]),
+                      chip->duration_adjusted
                       ? "adjusted" : "original");
 }
 static DEVICE_ATTR_RO(durations);
@@ -251,14 +252,14 @@ static DEVICE_ATTR_RO(durations);
 static ssize_t timeouts_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
 {
-       struct tpm_chip *chip = dev_get_drvdata(dev);
+       struct tpm_chip *chip = to_tpm_chip(dev);
 
        return sprintf(buf, "%d %d %d %d [%s]\n",
-                      jiffies_to_usecs(chip->vendor.timeout_a),
-                      jiffies_to_usecs(chip->vendor.timeout_b),
-                      jiffies_to_usecs(chip->vendor.timeout_c),
-                      jiffies_to_usecs(chip->vendor.timeout_d),
-                      chip->vendor.timeout_adjusted
+                      jiffies_to_usecs(chip->timeout_a),
+                      jiffies_to_usecs(chip->timeout_b),
+                      jiffies_to_usecs(chip->timeout_c),
+                      jiffies_to_usecs(chip->timeout_d),
+                      chip->timeout_adjusted
                       ? "adjusted" : "original");
 }
 static DEVICE_ATTR_RO(timeouts);
@@ -281,19 +282,12 @@ static const struct attribute_group tpm_dev_group = {
        .attrs = tpm_dev_attrs,
 };
 
-int tpm_sysfs_add_device(struct tpm_chip *chip)
+void tpm_sysfs_add_device(struct tpm_chip *chip)
 {
-       int err;
-       err = sysfs_create_group(&chip->pdev->kobj,
-                                &tpm_dev_group);
-
-       if (err)
-               dev_err(chip->pdev,
-                       "failed to create sysfs attributes, %d\n", err);
-       return err;
-}
-
-void tpm_sysfs_del_device(struct tpm_chip *chip)
-{
-       sysfs_remove_group(&chip->pdev->kobj, &tpm_dev_group);
+       /* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
+        * is called before ops is null'd and the sysfs core synchronizes this
+        * removal so that no callbacks are running or can run again
+        */
+       WARN_ON(chip->groups_cnt != 0);
+       chip->groups[chip->groups_cnt++] = &tpm_dev_group;
 }