From patchwork Thu Feb 27 00:26:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 11407549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E0E3159A for ; Thu, 27 Feb 2020 00:27:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 675F624683 for ; Thu, 27 Feb 2020 00:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727987AbgB0A1E (ORCPT ); Wed, 26 Feb 2020 19:27:04 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:50350 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728012AbgB0A1E (ORCPT ); Wed, 26 Feb 2020 19:27:04 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01R0KfdN036701; Wed, 26 Feb 2020 19:26:57 -0500 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ydcnh0vfa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Feb 2020 19:26:57 -0500 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 01R0AHjT000648; Thu, 27 Feb 2020 00:26:56 GMT Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by ppma01wdc.us.ibm.com with ESMTP id 2ydcmkh5sq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Feb 2020 00:26:56 +0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01R0Qu0853674396 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Feb 2020 00:26:56 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E94A828058; Thu, 27 Feb 2020 00:26:55 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D9E722805E; Thu, 27 Feb 2020 00:26:55 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 27 Feb 2020 00:26:55 +0000 (GMT) From: Stefan Berger To: jarkko.sakkinen@linux.intel.com, linux-integrity@vger.kernel.org Cc: aik@ozlabs.ru, david@gibson.dropbear.id.au, linux-kernel@vger.kernel.org, nayna@linux.vnet.ibm.com, gcwilson@linux.ibm.com, jgg@ziepe.ca, Stefan Berger Subject: [PATCH v3 3/4] tpm: Implement tpm2_init_commands to use in non-auto startup case Date: Wed, 26 Feb 2020 19:26:53 -0500 Message-Id: <20200227002654.7536-4-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200227002654.7536-1-stefanb@linux.vnet.ibm.com> References: <20200227002654.7536-1-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-26_09:2020-02-26,2020-02-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 spamscore=0 suspectscore=0 impostorscore=0 clxscore=1015 mlxscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002270000 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Stefan Berger The IBM vTPM device driver will not use TPM_OPS_AUTO_STARTUP since we assume the firmware has initialized the TPM 2 and TPM2_Startup() need not be sent. Therefore, tpm2_auto_startup() will not be called. To cover the tpm_chip's initialization of timeouts, command durations, and command attributes we implement tpm2_init_commands() function that will be called instead of tpm2_auto_startup(). Signed-off-by: Stefan Berger --- drivers/char/tpm/tpm-interface.c | 5 ++++- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm2-cmd.c | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index a438b1206fcb..30d80b94db33 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -371,8 +371,11 @@ int tpm_auto_startup(struct tpm_chip *chip) { int rc; - if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP)) + if (!(chip->ops->flags & TPM_OPS_AUTO_STARTUP)) { + if (chip->flags & TPM_CHIP_FLAG_TPM2) + return tpm2_init_commands(chip); return 0; + } if (chip->flags & TPM_CHIP_FLAG_TPM2) rc = tpm2_auto_startup(chip); diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 5620747da0cf..30da942d714a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -222,6 +222,7 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id, u32 *value, const char *desc); ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip); +int tpm2_init_commands(struct tpm_chip *chip); int tpm2_auto_startup(struct tpm_chip *chip); void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type); unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal); diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 13696deceae8..2d0c5a3b65c0 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -709,6 +709,20 @@ static int tpm2_startup(struct tpm_chip *chip) return rc; } +/** + * tpm2_init_commands - Get timeouts, durations and command code attributes + * in case tpm2_auto_startup is not used. + * @chip: TPM chip to use + * + * Return 0 on success, < 0 in case of fatal error. + */ +int tpm2_init_commands(struct tpm_chip *chip) +{ + tpm2_get_timeouts(chip); + + return tpm2_get_cc_attrs_tbl(chip); +} + /** * tpm2_auto_startup - Perform the standard automatic TPM initialization * sequence