[v4,13/21] tpm: add tpm_auto_startup() into tpm-interface.c

Message ID	20180921135820.20549-14-tomas.winkler@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> From: Tomas Winkler <tomas.winkler@intel.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: Alexander Usyskin <alexander.usyskin@intel.com>, Tadeusz Struk <tadeusz.struk@intel.com>, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com> Subject: [PATCH v4 13/21] tpm: add tpm_auto_startup() into tpm-interface.c Date: Fri, 21 Sep 2018 16:58:12 +0300 Message-Id: <20180921135820.20549-14-tomas.winkler@intel.com> In-Reply-To: <20180921135820.20549-1-tomas.winkler@intel.com> References: <20180921135820.20549-1-tomas.winkler@intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	tpm: separate tpm 1.x and tpm 2.x commands \| expand [v4,00/21] tpm: separate tpm 1.x and tpm 2.x commands [v4,01/21] tpm2: add new tpm2 commands according to TCG 1.36 [v4,02/21] tpm: sort objects in the Makefile [v4,03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c [v4,04/21] tpm: add tpm_calc_ordinal_duration() wrapper [v4,05/21] tpm: factor out tpm_get_timeouts() [v4,06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c [v4,07/21] tpm: move tpm_getcap to tpm1-cmd.c [v4,08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c [v4,09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c [v4,10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c [v4,11/21] tpm: factor out tpm_startup function [v4,12/21] tpm: move pcr extend code to tpm2-cmd.c [v4,13/21] tpm: add tpm_auto_startup() into tpm-interface.c [v4,14/21] tpm: tpm-interface.c drop unused macros [v4,15/21] tpm: tpm-space.c remove unneeded semicolon [v4,16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure [v4,17/21] tpm1: implement tpm1_pcr_read_dev() using tpm_buf structure [v4,18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read(). [v4,19/21] tpm1: reimplement SAVESTATE using tpm_buf [v4,20/21] tpm1: reimplement tpm1_continue_selftest() using tpm_buf [v4,21/21] tpm: use u32 instead of int for PCR index

Message ID

20180921135820.20549-14-tomas.winkler@intel.com (mailing list archive)

State

New, archived

Headers

From: Tomas Winkler <tomas.winkler@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        Jason Gunthorpe <jgg@ziepe.ca>
Cc: Alexander Usyskin <alexander.usyskin@intel.com>,
        Tadeusz Struk <tadeusz.struk@intel.com>,
        linux-integrity@vger.kernel.org,
        linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Tomas Winkler <tomas.winkler@intel.com>
Subject: [PATCH v4 13/21] tpm: add tpm_auto_startup() into tpm-interface.c
Date: Fri, 21 Sep 2018 16:58:12 +0300
Message-Id: <20180921135820.20549-14-tomas.winkler@intel.com>
In-Reply-To: <20180921135820.20549-1-tomas.winkler@intel.com>
References: <20180921135820.20549-1-tomas.winkler@intel.com>
Sender: owner-linux-security-module@vger.kernel.org
Precedence: bulk

Series

tpm: separate tpm 1.x and tpm 2.x commands | expand

Commit Message

Winkler, Tomas Sept. 21, 2018, 1:58 p.m. UTC

Add wrapper tpm_auto_startup() to tpm-interface.c
instead of open coded decision between TPM 1.x and TPM 2.x
in tpm-chip.c

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
V3: New in the series.
V4: Fix the commit message.

 drivers/char/tpm/tpm-chip.c      | 11 +++--------
 drivers/char/tpm/tpm-interface.c | 15 +++++++++++++++
 drivers/char/tpm/tpm.h           |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 46caadca916a..32db84683c40 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -451,14 +451,9 @@  int tpm_chip_register(struct tpm_chip *chip)
 {
 	int rc;
 
-	if (chip->ops->flags & TPM_OPS_AUTO_STARTUP) {
-		if (chip->flags & TPM_CHIP_FLAG_TPM2)
-			rc = tpm2_auto_startup(chip);
-		else
-			rc = tpm1_auto_startup(chip);
-		if (rc)
-			return rc;
-	}
+	rc = tpm_auto_startup(chip);
+	if (rc)
+		return rc;
 
 	tpm_sysfs_add_device(chip);
 
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index d18d9103a867..6cd3aed1e190 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -530,6 +530,21 @@  int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)
 }
 EXPORT_SYMBOL_GPL(tpm_send);
 
+int tpm_auto_startup(struct tpm_chip *chip)
+{
+	int rc;
+
+	if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP))
+		return 0;
+
+	if (chip->flags & TPM_CHIP_FLAG_TPM2)
+		rc = tpm2_auto_startup(chip);
+	else
+		rc = tpm1_auto_startup(chip);
+
+	return rc;
+}
+
 /*
  * We are about to suspend. Save the TPM state
  * so that it can be restored.
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index f0963a0a8acd..4ccffbb56864 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -541,6 +541,7 @@  ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
 			 size_t min_rsp_body_length, unsigned int flags,
 			 const char *desc);
 int tpm_get_timeouts(struct tpm_chip *);
+int tpm_auto_startup(struct tpm_chip *chip);
 
 int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr);
 int tpm1_do_selftest(struct tpm_chip *chip);

[v4,13/21] tpm: add tpm_auto_startup() into tpm-interface.c

Commit Message

Patch