From nobody Thu Nov 28 13:36:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1671124362; cv=none; d=zohomail.com; s=zohoarc; b=YGGcgS0FZJ89yQBOpyIVzMs2DGjzwmjM+LgdYWOKYErAF7nZi5sn7eDyoCALfz7nIKyup261Wq/+zpTj+aZlgY0uiofW1dc+bJMQ8HmGDq5rVM5OnQqlDVqRwFBgBjKO9AyAt2w27hib+6RCGLm3LdOwvfd7WUf10r4HSX7P7YQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671124362; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rcv8L7CQI9zf6LleTgyrbchtR+FAdnO0mDJIn2Hg4jY=; b=BidYXLABxNhUOVqhU0zllVD4QXfEC7JDUrYhc0EpmdMWhWAjJ/5dwimIPLdJqEwpWr36zGcpgzfc4qj+qS9TmXGBuDmPQ8+JVEEXPW3+WBzTDh+Yxf10CSSrWbZSfuF0JdYLT15gtNE+dzNMyY17szOQ88cGdpg5Q+VUa+S+YfA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16711243623691020.0143355594561; Thu, 15 Dec 2022 09:12:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.463629.721861 (Exim 4.92) (envelope-from ) id 1p5rm9-0007v8-I2; Thu, 15 Dec 2022 17:12:05 +0000 Received: by outflank-mailman (output) from mailman id 463629.721861; Thu, 15 Dec 2022 17:12:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p5rm9-0007ux-ES; Thu, 15 Dec 2022 17:12:05 +0000 Received: by outflank-mailman (input) for mailman id 463629; Thu, 15 Dec 2022 17:12:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p5rm8-0007rI-7f for xen-devel@lists.xenproject.org; Thu, 15 Dec 2022 17:12:04 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 95efed3e-7c9b-11ed-8fd3-01056ac49cbb; Thu, 15 Dec 2022 18:12:01 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 95efed3e-7c9b-11ed-8fd3-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1671124322; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QpNE7L2uaNTmHw5dmmRErah9AeqgxX3aSlOHFvQjjvM=; b=Y3sdtpQxYFMryRTbOWXVZvfDA8Y6IX6FPtzz9vxV9qZ1CnJpgZgte0aA LT9DYXNFoeWAvfsuOiZy22rroMA9h+fnuWMfhDSDiQdS+GpX4u/8zJ9Ku vL2/Yx5n4a65W36rEYU4vzeqZBsN144TNKtRytivTcdsREPysstYBKiiQ o=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 4.0 X-MesageID: 87563912 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:TAL14KJBxQIuwu1sFE+Rw5UlxSXFcZb7ZxGr2PjKsXjdYENS1DJRy mcaDWiAPK3cZTGketolPoS/9E0PusOAzNdrTABlqX01Q3x08seUXt7xwmUcnc+xBpaaEB84t ZV2hv3odp1coqr0/0/1WlTZhSAgk/rOHv+kUrWs1hlZHWdMUD0mhQ9oh9k3i4tphcnRKw6Ws Jb5rta31GWNglaYCUpJrfPdwP9TlK6q4mlB5AVjPa0jUGL2zBH5MrpOfcldEFOgKmVkNrbSb /rOyri/4lTY838FYj9yuu+mGqGiaue60Tmm0hK6aYD76vRxjnVaPpIAHOgdcS9qZwChxLid/ jnvWauYEm/FNoWU8AgUvoIx/ytWZcWq85efSZSzXFD6I+QrvBIAzt03ZHzaM7H09c4tJGxj8 +ZFEwkERTaajv6xw+ikSdVV05FLwMnDZOvzu1llxDDdS/0nXYrCU+PB4towMDUY354UW6yEP oxANGQpPE+ojx5nYz/7DLo8keGuh3fyaXtYpUifqLAry2PS0BZwwP7mN9+9ltmiFZoIwB3J/ ziuE2LRU0w4aPDY8Ti++yyCvdWe2iihXthDG+jtnhJtqALKnTFCYPEMbnOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslgEYc8pdFas98g7l4qje7hudB2MEZiVcc9Fgv8gzLQHGz XfQwYmvX2Y29uTIFzTNrd94sA9eJwBPCGIvYzVZdjIMyP/6qZ00jUjQTepaRfvdYsLOJRn8x DWDrS4bjroVjNIW26jTwW0rkw5AtbCSEFdru1y/snaNq1ogOdX7P9DABU3zt64oEWqPcrWWU JHoceC65ftGM5yCnTflrA4lTODwvKbt3NExbDdS83gdG9aFoSbLkWN4umsWyKJV3iEsJ1fUj Lf741852XOqFCLCgVVLS4ywEd826qPrCM7oUPvZBvIXPMcoLFPdonw/PxDKt4wIrKTKuftnU Xt8WZ/8ZUv29Iw9lGbmLwvj+eFDKt8CKZP7GsmgkkXPPUu2b3+JU7YVWGZinchghJ5oVD79q o4FX+PTkkU3bQELSnWPmWLlBQxQfCdT6FGfg5A/S9Nv1SI5Qjh7U6SNmu9Jlk4Mt/09q9okN 0qVAidwoGcTT1WdQelWQhiPsI/SYKs= IronPort-HdrOrdr: A9a23:7oB8v6F6v+YGFEsNpLqEyseALOsnbusQ8zAXPiFKOHlom6mj/a 2TdZsguSMc5Ax/ZJhYo6HmBEDiewK/yXcW2+ks1N6ZNWHbUQ2TQr2KhrGSoAEIdReeygdr79 YFT0EvMrbN5IBB/LzHCdODYq4dKQS8gcaVbDvlvgxQpN9RGtxdB2gQMHfjLnFL X-IronPort-AV: E=Sophos;i="5.96,248,1665460800"; d="scan'208";a="87563912" From: Jennifer Herbert To: CC: Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Subject: [PATCH v2 1/2] acpi: Make TPM version configurable. Date: Thu, 15 Dec 2022 17:09:33 +0000 Message-ID: <20221215170934.123889-2-jennifer.herbert@citrix.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221215170934.123889-1-jennifer.herbert@citrix.com> References: <0548fa97-5384-94e4-7329-b019e60555f4@citrix.com> <20221215170934.123889-1-jennifer.herbert@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1671124363691100001 Content-Type: text/plain; charset="utf-8" This patch makes the TPM version, for which the ACPI library probes, config= urable. If acpi_config.tpm_verison is set to 1, it indicates that 1.2 (TCPA) should= be probed. I have also added to hvmloader an option to allow setting this new config, = which can be triggered by setting the platform/tpm_verion xenstore key. Signed-off-by: Jennifer Herbert --- docs/misc/xenstore-paths.pandoc | 8 ++++ tools/firmware/hvmloader/util.c | 13 ++++++- tools/libacpi/build.c | 68 ++++++++++++++++++--------------- tools/libacpi/libacpi.h | 4 +- 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pan= doc index 5cd5c8a3b9..7270b46721 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -269,6 +269,14 @@ at the guest physical address in HVM_PARAM_VM_GENERATI= ON_ID_ADDR. See Microsoft's "Virtual Machine Generation ID" specification for the circumstances where the generation ID needs to be changed. =20 + +#### ~/platform/tpm_version =3D INTEGER [HVM,INTERNAL] + +The TPM version to be probed for. + +A value of 1 indicates to probe for TPM 1.2. If unset, or an +invalid version, then no TPM is probed. + ### Frontend device paths =20 Paravirtual device frontends are generally specified by their own diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/uti= l.c index 581b35e5cf..87bc2d677f 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -994,13 +994,22 @@ void hvmloader_acpi_build_tables(struct acpi_config *= config, if ( !strncmp(xenstore_read("platform/acpi_laptop_slate", "0"), "1", 1= ) ) config->table_flags |=3D ACPI_HAS_SSDT_LAPTOP_SLATE; =20 - config->table_flags |=3D (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | + config->table_flags |=3D (ACPI_HAS_TPM | ACPI_HAS_IOAPIC | ACPI_HAS_WAET | ACPI_HAS_PMTIMER | ACPI_HAS_BUTTONS | ACPI_HAS_VGA | ACPI_HAS_8042 | ACPI_HAS_CMOS_RTC); config->acpi_revision =3D 4; =20 - config->tis_hdr =3D (uint16_t *)ACPI_TIS_HDR_ADDRESS; + s =3D xenstore_read("platform/tpm_version", "0"); + config->tpm_version =3D strtoll(s, NULL, 0); + + switch( config->tpm_version ) + { + case 1: + config->table_flags |=3D ACPI_HAS_TPM; + config->tis_hdr =3D (uint16_t *)ACPI_TIS_HDR_ADDRESS; + break; + } =20 config->numa.nr_vmemranges =3D nr_vmemranges; config->numa.nr_vnodes =3D nr_vnodes; diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index fe2db66a62..d313ccd8cf 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -409,38 +409,46 @@ static int construct_secondary_tables(struct acpi_ctx= t *ctxt, memcpy(ssdt, ssdt_laptop_slate, sizeof(ssdt_laptop_slate)); table_ptrs[nr_tables++] =3D ctxt->mem_ops.v2p(ctxt, ssdt); } - - /* TPM TCPA and SSDT. */ - if ( (config->table_flags & ACPI_HAS_TCPA) && - (config->tis_hdr[0] !=3D 0 && config->tis_hdr[0] !=3D 0xffff) && - (config->tis_hdr[1] !=3D 0 && config->tis_hdr[1] !=3D 0xffff) ) + /* TPM and SSDT. */ + if (config->table_flags & ACPI_HAS_TPM) { - ssdt =3D ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16); - if (!ssdt) return -1; - memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm)); - table_ptrs[nr_tables++] =3D ctxt->mem_ops.v2p(ctxt, ssdt); - - tcpa =3D ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16= ); - if (!tcpa) return -1; - memset(tcpa, 0, sizeof(*tcpa)); - table_ptrs[nr_tables++] =3D ctxt->mem_ops.v2p(ctxt, tcpa); - - tcpa->header.signature =3D ACPI_2_0_TCPA_SIGNATURE; - tcpa->header.length =3D sizeof(*tcpa); - tcpa->header.revision =3D ACPI_2_0_TCPA_REVISION; - fixed_strcpy(tcpa->header.oem_id, ACPI_OEM_ID); - fixed_strcpy(tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID); - tcpa->header.oem_revision =3D ACPI_OEM_REVISION; - tcpa->header.creator_id =3D ACPI_CREATOR_ID; - tcpa->header.creator_revision =3D ACPI_CREATOR_REVISION; - if ( (lasa =3D ctxt->mem_ops.alloc(ctxt, ACPI_2_0_TCPA_LAML_SIZE, = 16)) !=3D NULL ) + switch (config->tpm_version) { - tcpa->lasa =3D ctxt->mem_ops.v2p(ctxt, lasa); - tcpa->laml =3D ACPI_2_0_TCPA_LAML_SIZE; - memset(lasa, 0, tcpa->laml); - set_checksum(tcpa, - offsetof(struct acpi_header, checksum), - tcpa->header.length); + case 1: + if (!config->tis_hdr || + config->tis_hdr[0] =3D=3D 0 || config->tis_hdr[0] =3D=3D 0= xffff || + config->tis_hdr[1] =3D=3D 0 || config->tis_hdr[1] =3D=3D 0= xffff) + break; + + ssdt =3D ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16); + if (!ssdt) return -1; + memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm)); + table_ptrs[nr_tables++] =3D ctxt->mem_ops.v2p(ctxt, ssdt); + + tcpa =3D ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa)= , 16); + if (!tcpa) return -1; + memset(tcpa, 0, sizeof(*tcpa)); + table_ptrs[nr_tables++] =3D ctxt->mem_ops.v2p(ctxt, tcpa); + + tcpa->header.signature =3D ACPI_2_0_TCPA_SIGNATURE; + tcpa->header.length =3D sizeof(*tcpa); + tcpa->header.revision =3D ACPI_2_0_TCPA_REVISION; + fixed_strcpy(tcpa->header.oem_id, ACPI_OEM_ID); + fixed_strcpy(tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID); + tcpa->header.oem_revision =3D ACPI_OEM_REVISION; + tcpa->header.creator_id =3D ACPI_CREATOR_ID; + tcpa->header.creator_revision =3D ACPI_CREATOR_REVISION; + + if ( (lasa =3D ctxt->mem_ops.alloc(ctxt, ACPI_2_0_TCPA_LAML_SI= ZE, 16)) !=3D NULL ) + { + tcpa->lasa =3D ctxt->mem_ops.v2p(ctxt, lasa); + tcpa->laml =3D ACPI_2_0_TCPA_LAML_SIZE; + memset(lasa, 0, tcpa->laml); + set_checksum(tcpa, + offsetof(struct acpi_header, checksum), + tcpa->header.length); + } + break; } } =20 diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index a2efd23b0b..9143616130 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -27,7 +27,7 @@ #define ACPI_HAS_SSDT_PM (1<<4) #define ACPI_HAS_SSDT_S3 (1<<5) #define ACPI_HAS_SSDT_S4 (1<<6) -#define ACPI_HAS_TCPA (1<<7) +#define ACPI_HAS_TPM (1<<7) #define ACPI_HAS_IOAPIC (1<<8) #define ACPI_HAS_WAET (1<<9) #define ACPI_HAS_PMTIMER (1<<10) @@ -78,8 +78,8 @@ struct acpi_config { struct acpi_numa numa; const struct hvm_info_table *hvminfo; =20 + uint8_t tpm_version; const uint16_t *tis_hdr; - /* * Address where acpi_info should be placed. * This must match the OperationRegion(BIOS, SystemMemory, ....) --=20 2.31.1