linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomas Winkler <tomas.winkler@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
	Jason Gunthorpe <jgg@ziepe.ca>
Cc: Nayna Jain <nayna@linux.vnet.ibm.com>,
	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 v5 20/21] tpm1: reimplement tpm1_continue_selftest() using tpm_buf
Date: Sat, 29 Sep 2018 01:30:34 +0300	[thread overview]
Message-ID: <20180928223035.14471-21-tomas.winkler@intel.com> (raw)
In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com>

Reimplement tpm1_continue_selftest() using tpm_buf structure.
This is the last command using the old tpm_cmd_t structure
and now the structure can be removed.

Cc: Nayna Jain <nayna@linux.vnet.ibm.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---

V3: New in the series.
V4: Resend.
V5: Fix &buf.data -> buf.data in tpm1_continue_selftest()

 drivers/char/tpm/tpm.h      |  9 ---------
 drivers/char/tpm/tpm1-cmd.c | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 2f06740f993d..7ada00f067f1 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -377,15 +377,6 @@ enum tpm_sub_capabilities {
 	TPM_CAP_PROP_TIS_DURATION = 0x120,
 };
 
-typedef union {
-	struct	tpm_input_header in;
-	struct	tpm_output_header out;
-} tpm_cmd_header;
-
-struct tpm_cmd_t {
-	tpm_cmd_header	header;
-} __packed;
-
 
 /* 128 bytes is an arbitrary cap. This could be as large as TPM_BUFSIZE - 18
  * bytes, but 128 is still a relatively large number of random bytes and
diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c
index d418a27a75e0..6b04648f8184 100644
--- a/drivers/char/tpm/tpm1-cmd.c
+++ b/drivers/char/tpm/tpm1-cmd.c
@@ -602,15 +602,8 @@ int tpm1_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
 }
 
 #define TPM_ORD_CONTINUE_SELFTEST 83
-#define CONTINUE_SELFTEST_RESULT_SIZE 10
-static const struct tpm_input_header continue_selftest_header = {
-	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),
-	.length = cpu_to_be32(10),
-	.ordinal = cpu_to_be32(TPM_ORD_CONTINUE_SELFTEST),
-};
-
 /**
- * tpm_continue_selftest -- run TPM's selftest
+ * tpm_continue_selftest() - run TPM's selftest
  * @chip: TPM chip to use
  *
  * Returns 0 on success, < 0 in case of fatal error or a value > 0 representing
@@ -618,12 +611,18 @@ static const struct tpm_input_header continue_selftest_header = {
  */
 static int tpm1_continue_selftest(struct tpm_chip *chip)
 {
+	struct tpm_buf buf;
 	int rc;
-	struct tpm_cmd_t cmd;
 
-	cmd.header.in = continue_selftest_header;
-	rc = tpm_transmit_cmd(chip, NULL, &cmd, CONTINUE_SELFTEST_RESULT_SIZE,
+	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_CONTINUE_SELFTEST);
+	if (rc)
+		return rc;
+
+	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE,
 			      0, 0, "continue selftest");
+
+	tpm_buf_destroy(&buf);
+
 	return rc;
 }
 
-- 
2.14.4


  parent reply	other threads:[~2018-09-28 22:35 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-28 22:30 [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 01/21] tpm2: add new tpm2 commands according to TCG 1.36 Tomas Winkler
2018-10-02  0:38   ` Jarkko Sakkinen
2018-10-02  0:40   ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 02/21] tpm: sort objects in the Makefile Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Tomas Winkler
2018-10-11 16:55   ` Nayna Jain
2018-09-28 22:30 ` [PATCH v5 04/21] tpm: add tpm_calc_ordinal_duration() wrapper Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 05/21] tpm: factor out tpm_get_timeouts() Tomas Winkler
2018-10-11 17:00   ` Nayna Jain
2018-10-11 20:16     ` Winkler, Tomas
2018-09-28 22:30 ` [PATCH v5 06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c Tomas Winkler
2018-10-02  0:42   ` Jarkko Sakkinen
2018-10-02  9:28     ` Nayna Jain
2018-10-03 12:02       ` Jarkko Sakkinen
2018-10-12  9:31   ` Nayna Jain
2018-10-16 16:48     ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 07/21] tpm: move tpm_getcap " Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c Tomas Winkler
2018-10-02  0:43   ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c Tomas Winkler
2018-10-02  0:45   ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 11/21] tpm: factor out tpm_startup function Tomas Winkler
2018-10-02  0:46   ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 12/21] tpm: move pcr extend code to tpm2-cmd.c Tomas Winkler
2018-10-02  0:52   ` Jarkko Sakkinen
2018-10-02  4:58     ` Winkler, Tomas
2018-10-03 12:01       ` Jarkko Sakkinen
2018-10-03 22:24         ` Winkler, Tomas
2018-10-04 11:35           ` Jarkko Sakkinen
2018-10-04 11:36             ` Jarkko Sakkinen
2018-10-04 11:45             ` Winkler, Tomas
2018-10-04 12:20               ` Roberto Sassu
2018-10-04 13:46                 ` Winkler, Tomas
2018-10-04 14:10                   ` Roberto Sassu
2018-10-05 11:31               ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 13/21] tpm: add tpm_auto_startup() into tpm-interface.c Tomas Winkler
2018-10-02  0:56   ` Jarkko Sakkinen
2018-09-28 22:30 ` [PATCH v5 14/21] tpm: tpm-interface.c drop unused macros Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 15/21] tpm: tpm-space.c remove unneeded semicolon Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 17/21] tpm1: implement tpm1_pcr_read_dev() " Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read() Tomas Winkler
2018-09-28 22:30 ` [PATCH v5 19/21] tpm1: reimplement SAVESTATE using tpm_buf Tomas Winkler
2018-09-28 22:30 ` Tomas Winkler [this message]
2018-10-17  6:02   ` [PATCH v5 20/21] tpm1: reimplement tpm1_continue_selftest() " Nayna Jain
2018-09-28 22:30 ` [PATCH v5 21/21] tpm: use u32 instead of int for PCR index Tomas Winkler
2018-10-02  0:58   ` Jarkko Sakkinen
2018-10-02  0:44 ` [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180928223035.14471-21-tomas.winkler@intel.com \
    --to=tomas.winkler@intel.com \
    --cc=alexander.usyskin@intel.com \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=jgg@ziepe.ca \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=nayna@linux.vnet.ibm.com \
    --cc=tadeusz.struk@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).