From patchwork Wed Dec 11 20:27:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 1207906 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Y7ny4nmGz9sR7 for ; Thu, 12 Dec 2019 07:29:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47Y7ny1fQyzDqPN for ; Thu, 12 Dec 2019 07:29:42 +1100 (AEDT) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=stefanb@linux.vnet.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47Y7ll6JzszDqKJ for ; Thu, 12 Dec 2019 07:27:44 +1100 (AEDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBBKGfWT068511; Wed, 11 Dec 2019 15:27:42 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wtf8jd2gs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Dec 2019 15:27:41 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id xBBKF9ZM030496; Wed, 11 Dec 2019 20:27:40 GMT Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by ppma02wdc.us.ibm.com with ESMTP id 2wr3q6r2ra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Dec 2019 20:27:40 +0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xBBKReoA51053030 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Dec 2019 20:27:40 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 53173B2067; Wed, 11 Dec 2019 20:27:40 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 461ECB2064; Wed, 11 Dec 2019 20:27:40 +0000 (GMT) Received: from newfield.pok.ibm.com (unknown [9.47.158.66]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 11 Dec 2019 20:27:40 +0000 (GMT) From: Stefan Berger To: slof@lists.ozlabs.org Date: Wed, 11 Dec 2019 15:27:07 -0500 Message-Id: <20191211202728.127996-13-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211202728.127996-1-stefanb@linux.vnet.ibm.com> References: <20191211202728.127996-1-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-12-11_06:2019-12-11, 2019-12-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=15 bulkscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 phishscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 spamscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912110168 Subject: [SLOF] [PATCH v4 12/33] tpm: Add TPM firmware API call get-maximum-cmd-size X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevin@koconnor.net MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" This patch adds support for the firmware API call get-maximum-cmd-size. Signed-off-by: Stefan Berger --- board-qemu/slof/vio-vtpm-cdriver.fs | 7 +++++++ board-qemu/slof/vtpm-sml.fs | 10 ++++++++++ lib/libtpm/tcgbios.c | 24 ++++++++++++++++++++++++ lib/libtpm/tcgbios.h | 1 + lib/libtpm/tcgbios_int.h | 7 +++++++ lib/libtpm/tpm.code | 10 ++++++++++ lib/libtpm/tpm.in | 1 + 7 files changed, 60 insertions(+) diff --git a/board-qemu/slof/vio-vtpm-cdriver.fs b/board-qemu/slof/vio-vtpm-cdriver.fs index d4d0690..de69e2d 100644 --- a/board-qemu/slof/vio-vtpm-cdriver.fs +++ b/board-qemu/slof/vio-vtpm-cdriver.fs @@ -122,6 +122,13 @@ false VALUE vtpm-debug? THEN ; +\ firmware API call +: get-maximum-cmd-size ( -- maximum-size ) + " get-maximum-cmd-size" vtpm-call-forward IF + 0 + THEN +; + : open ( ) vtpm-debug? IF ." VTPM: vTPM open()" cr THEN true diff --git a/board-qemu/slof/vtpm-sml.fs b/board-qemu/slof/vtpm-sml.fs index b7ecb4a..bf0d55e 100644 --- a/board-qemu/slof/vtpm-sml.fs +++ b/board-qemu/slof/vtpm-sml.fs @@ -84,6 +84,16 @@ log-base LOG-SIZE tpm-set-log-parameters THEN ; +: get-maximum-cmd-size ( -- max-size ) + vtpm-debug? IF + ." Call to get-maximum-cmd-size" cr + THEN + tpm-get-maximum-cmd-size ( max-size ) + dup 0= IF \ Display if return value is 0 + ." VTPM: Return value from tpm-get-maximum-cmd-size: " dup . cr + THEN +; + \ \ internal API calls \ diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c index e42b7e2..9114d64 100644 --- a/lib/libtpm/tcgbios.c +++ b/lib/libtpm/tcgbios.c @@ -38,6 +38,8 @@ #define dprintf(_x ...) #endif +#define MIN(a, b) ((a) < (b) ? (a) : (b)) + struct tpm_state { unsigned tpm_probed:1; unsigned tpm_found:1; @@ -813,3 +815,25 @@ uint32_t tpm_measure_scrtm(void) return rc; } + +/* + * tpm_get_maximum_cmd_size: Function for interfacing with the firmware API + * + * This function returns the maximum size a TPM command (or response) may have. + */ +uint32_t tpm_get_maximum_cmd_size(void) +{ + struct tpm_rsp_getcap_buffersize trgb; + int ret; + + if (!tpm_is_working()) + return 0; + + ret = tpm12_get_capability(TPM_CAP_PROPERTY, TPM_CAP_PROP_INPUT_BUFFER, + &trgb.hdr, sizeof(trgb)); + if (ret) + return 0; + + return MIN(cpu_to_be32(trgb.buffersize), + spapr_vtpm_get_buffersize()); +} diff --git a/lib/libtpm/tcgbios.h b/lib/libtpm/tcgbios.h index b08e12f..6eb6751 100644 --- a/lib/libtpm/tcgbios.h +++ b/lib/libtpm/tcgbios.h @@ -34,6 +34,7 @@ uint32_t tpm_measure_bcv_mbr(uint32_t bootdrv, const uint8_t *addr, uint32_t length); uint32_t tpm_add_event_separators(uint32_t start_pcr, uint32_t end_pcr); uint32_t tpm_process_opcode(uint8_t op, bool verbose); +uint32_t tpm_get_maximum_cmd_size(void); /* flags returned by tpm_get_state */ #define TPM_STATE_ENABLED 1 diff --git a/lib/libtpm/tcgbios_int.h b/lib/libtpm/tcgbios_int.h index 77ed815..39e1ea4 100644 --- a/lib/libtpm/tcgbios_int.h +++ b/lib/libtpm/tcgbios_int.h @@ -116,6 +116,7 @@ struct tpm_req_getcap { #define TPM_CAP_FLAG_PERMANENT 0x108 #define TPM_CAP_PROP_OWNER 0x111 #define TPM_CAP_PROP_DURATION 0x120 +#define TPM_CAP_PROP_INPUT_BUFFER 0x124 struct tpm_req_getcap_perm_flags { struct tpm_req_header hdr; @@ -179,6 +180,12 @@ struct tpm_rsp_getcap_durations { uint32_t durations[TPM_NUM_DURATIONS]; } __attribute__((packed)); +struct tpm_rsp_getcap_buffersize { + struct tpm_rsp_header hdr; + uint32_t size; + uint32_t buffersize; +} __attribute__((packed)); + #define TPM_PPI_OP_NOOP 0 #define TPM_PPI_OP_ENABLE 1 #define TPM_PPI_OP_DISABLE 2 diff --git a/lib/libtpm/tpm.code b/lib/libtpm/tpm.code index 67877c0..ecfba8c 100644 --- a/lib/libtpm/tpm.code +++ b/lib/libtpm/tpm.code @@ -162,3 +162,13 @@ PRIM(tpm_X2d_measure_X2d_scrtm) PUSH; TOS.n = tpm_measure_scrtm(); MIRP + +/****************************************************/ +/* Firmware API */ +/* SLOF: tpm-get-maximum-cmd-size ( -- max-size) */ +/* LIBTPM: maxsize = tpm_get_maximum_cmd_size() */ +/****************************************************/ +PRIM(tpm_X2d_get_X2d_maximum_X2d_cmd_X2d_size) + PUSH; + TOS.n = tpm_get_maximum_cmd_size(); +MIRP diff --git a/lib/libtpm/tpm.in b/lib/libtpm/tpm.in index 59a4ba6..1bd393e 100644 --- a/lib/libtpm/tpm.in +++ b/lib/libtpm/tpm.in @@ -27,3 +27,4 @@ cod(tpm-process-opcode) cod(tpm-get-state) cod(tpm-is-working) cod(tpm-measure-scrtm) +cod(tpm-get-maximum-cmd-size)