Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 31 insertions, 17 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 05ad4a17a28f..7beb0e25f1e1 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -47,6 +47,16 @@ enum tpm_duration {
 #define TPM_MAX_PROTECTED_ORDINAL 12
 #define TPM_PROTECTED_ORDINAL_MASK 0xFF
 
+/*
+ * Bug workaround - some TPM's don't flush the most
+ * recently changed pcr on suspend, so force the flush
+ * with an extend to the selected _unused_ non-volatile pcr.
+ */
+static int tpm_suspend_pcr;
+module_param_named(suspend_pcr, tpm_suspend_pcr, uint, 0644);
+MODULE_PARM_DESC(suspend_pcr,
+                 "PCR to use for dummy writes to faciltate flush on suspend.");
+
 static LIST_HEAD(tpm_chip_list);
 static DEFINE_SPINLOCK(driver_lock);
 static DECLARE_BITMAP(dev_mask, TPM_NUM_DEVICES);
@@ -726,7 +736,7 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf)
         if (chip == NULL)
                 return -ENODEV;
         rc = __tpm_pcr_read(chip, pcr_idx, res_buf);
-        module_put(chip->dev->driver->owner);
+        tpm_chip_put(chip);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_read);
@@ -765,11 +775,27 @@ int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
         rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
                           "attempting extend a PCR value");
 
-        module_put(chip->dev->driver->owner);
+        tpm_chip_put(chip);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_pcr_extend);
 
+int tpm_send(u32 chip_num, void *cmd, size_t buflen)
+{
+        struct tpm_chip *chip;
+        int rc;
+
+        chip = tpm_chip_find_get(chip_num);
+        if (chip == NULL)
+                return -ENODEV;
+
+        rc = transmit_cmd(chip, cmd, buflen, "attempting tpm_cmd");
+
+        tpm_chip_put(chip);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_send);
+
 ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
@@ -954,7 +980,7 @@ int tpm_open(struct inode *inode, struct file *file)
                 return -EBUSY;
         }
 
-        chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
+        chip->data_buffer = kzalloc(TPM_BUFSIZE, GFP_KERNEL);
         if (chip->data_buffer == NULL) {
                 clear_bit(0, &chip->is_open);
                 put_device(chip->dev);
@@ -976,7 +1002,7 @@ int tpm_release(struct inode *inode, struct file *file)
         struct tpm_chip *chip = file->private_data;
 
         del_singleshot_timer_sync(&chip->user_read_timer);
-        flush_scheduled_work();
+        flush_work_sync(&chip->work);
         file->private_data = NULL;
         atomic_set(&chip->data_pending, 0);
         kfree(chip->data_buffer);
@@ -1028,7 +1054,7 @@ ssize_t tpm_read(struct file *file, char __user *buf,
         ssize_t ret_size;
 
         del_singleshot_timer_sync(&chip->user_read_timer);
-        flush_scheduled_work();
+        flush_work_sync(&chip->work);
         ret_size = atomic_read(&chip->data_pending);
         atomic_set(&chip->data_pending, 0);
         if (ret_size > 0) {     /* relay data */
@@ -1077,18 +1103,6 @@ static struct tpm_input_header savestate_header = {
         .ordinal = TPM_ORD_SAVESTATE
 };
 
-/* Bug workaround - some TPM's don't flush the most
- * recently changed pcr on suspend, so force the flush
- * with an extend to the selected _unused_ non-volatile pcr.
- */
-static int tpm_suspend_pcr;
-static int __init tpm_suspend_setup(char *str)
-{
-        get_option(&str, &tpm_suspend_pcr);
-        return 1;
-}
-__setup("tpm_suspend_pcr=", tpm_suspend_setup);
-
 /*
  * We are about to suspend. Save the TPM state
  * so that it can be restored.