[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/4] libacpi: Build TPM2 tables for the TIS interface


  • To: Jason Andryuk <jason.andryuk@xxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Mon, 16 Nov 2026 14:30:01 +0100
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:Content-Type:In-Reply-To:Autocrypt:From:Content-Language:References:Cc:To:Subject:User-Agent:MIME-Version:Date:Message-ID"
  • Autocrypt: addr=jbeulich@xxxxxxxx; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL
  • Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
  • Delivery-date: Mon, 16 Nov 2026 13:30:10 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On 07.11.2026 00:15, Jason Andryuk wrote:
> --- a/tools/libacpi/Makefile
> +++ b/tools/libacpi/Makefile
> @@ -16,7 +16,7 @@ C_SRC-$(CONFIG_ARM_64) = dsdt_anycpu_arm.c
>  DSDT_FILES ?= $(C_SRC-y)
>  C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, $(DSDT_FILES))
>  H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h)
> -H_SRC += $(addprefix $(ACPI_BUILD_DIR)/, ssdt_tpm.h ssdt_tpm2.h 
> ssdt_laptop_slate.h)
> +H_SRC += $(addprefix $(ACPI_BUILD_DIR)/, ssdt_tpm.h ssdt_tpm2.h 
> ssdt_tpm2_tis.h ssdt_laptop_slate.h)

I think it's time to wrap this line.

> --- a/tools/libacpi/build.c
> +++ b/tools/libacpi/build.c
> @@ -11,6 +11,7 @@
>  #include "ssdt_s4.h"
>  #include "ssdt_tpm.h"
>  #include "ssdt_tpm2.h"
> +#include "ssdt_tpm2_tis.h"
>  #include "ssdt_pm.h"
>  #include "ssdt_laptop_slate.h"
>  #include <xen/hvm/hvm_info_table.h>
> @@ -444,17 +445,30 @@ static int construct_secondary_tables(struct acpi_ctxt 
> *ctxt,
>              break;
>  
>          case 2:
> -            /*
> -             * Check VID stored in bits 37:32 (3rd 16 bit word) of CRB
> -             * identifier register.  See table 16 of TCG PC client platform
> -             * TPM profile specification for TPM 2.0.
> -             */
> -            if ( config->crb_id[2] == 0 || config->crb_id[2] == 0xffff )
> -                break;
> +            if ( config->tpm_interface == ACPI_TPM_INTERFACE_TIS )

Better use switch() right away?

> +            {
> +                if ( config->tis_hdr[0] == 0 || config->tis_hdr[0] == 0xffff 
> ||
> +                     config->tis_hdr[1] == 0 || config->tis_hdr[1] == 0xffff 
> )
> +                    break;
>  
> -            ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm2), 16);
> -            if (!ssdt) return -1;
> -            memcpy(ssdt, ssdt_tpm2, sizeof(ssdt_tpm2));
> +                ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm2_tis), 16);
> +                if (!ssdt) return -1;

Please can we not gain further instances of this style-violating code? It
would be nice if ...

> +                memcpy(ssdt, ssdt_tpm2_tis, sizeof(ssdt_tpm2_tis));
> +            }
> +            else
> +            {
> +                /*
> +                 * Check VID stored in bits 37:32 (3rd 16 bit word) of CRB
> +                 * identifier register.  See table 16 of TCG PC client
> +                 * platform TPM profile specification for TPM 2.0.
> +                 */
> +                if ( config->crb_id[2] == 0 || config->crb_id[2] == 0xffff )
> +                    break;
> +
> +                ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm2), 16);
> +                if (!ssdt) return -1;

... the one you re-indent could be corrected as well. Actually, can't
we consolidate both allocation and ...

> +                memcpy(ssdt, ssdt_tpm2, sizeof(ssdt_tpm2));

... copying paths by way of having another pair of local variables
(pointer and size)?

> @@ -471,8 +485,17 @@ static int construct_secondary_tables(struct acpi_ctxt 
> *ctxt,
>              tpm2->header.creator_id   = ACPI_CREATOR_ID;
>              tpm2->header.creator_revision = ACPI_CREATOR_REVISION;
>              tpm2->platform_class = TPM2_ACPI_CLASS_CLIENT;
> -            tpm2->control_area_address = TPM_CRB_CTRL_REQ;
> -            tpm2->start_method = TPM2_START_METHOD_CRB;
> +            if ( config->tpm_interface == ACPI_TPM_INTERFACE_TIS )
> +            {
> +                /* The FIFO interface has no control area. */
> +                tpm2->control_area_address = 0;

There is a memset() earlier on, so only the comment looks to be needed
here.

> --- /dev/null
> +++ b/tools/libacpi/ssdt_tpm2_tis.asl
> @@ -0,0 +1,25 @@
> +/* SPDX-License-Identifier: LGPL-2.1-only */
> +/*
> + * ssdt_tpm2_tis.asl
> + */
> +
> +/* SSDT for TPM 2.0 TIS Interface for Xen with Qemu device model. */
> +
> +DefinitionBlock ("SSDT_TPM2_TIS.aml", "SSDT", 2, "Xen", "HVM", 0)
> +{
> +    Device (TPM)
> +    {
> +        Name (_HID, "MSFT0101" /* TPM 2.0 Security Device */)  // _HID: 
> Hardware ID
> +        Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
> +        {
> +            Memory32Fixed (ReadWrite,
> +                0xFED40000,         // Address Base
> +                0x00005000,         // Address Length
> +                )

I know you're only following what we do elsewhere (i.e. this isn't a
request for you to change anything), but I wonder how we could make sure
that such seemingly arbitrary address range allocations won't ever
conflict. (I assume the base address is dictated by qemu?)

Jan



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.