Skip to contentSkip to conversation

TPM: change 'tpm_suspend_pcr' to be module parameter

PATCH RESEND New Dmitry Torokhov 1 participant 1 message Sep 1, 2010 TPM device driver

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 TPM: change 'tpm_suspend_pcr' to be module parameter

This gets rid of the following warning:

drivers/char/tpm/tpm.c:1085: warning: ‘tpm_suspend_setup’ defined but not used

and makes the workaround operable in case when TPM is compiled as a module. As a side-effect the option will be called tpm.suspend_pcr

---

 drivers/char/tpm/tpm.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)
drivers/char/tpm/tpm.c +10 -12
index 05ad4a1..7c41335 100644
@@ -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);
@@ -1077,18 +1087,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.
Signature · 1 line
Dmitry