From: Stefan Berger <stefanb@linux.ibm.com>
To: Eric Auger <eric.auger@redhat.com>,
eric.auger.pro@gmail.com, qemu-devel@nongnu.org,
qemu-arm@nongnu.org, peter.maydell@linaro.org, mst@redhat.com,
shannon.zhaosl@gmail.com, imammedo@redhat.com
Cc: marcandre.lureau@redhat.com, drjones@redhat.com,
lersek@redhat.com, ardb@kernel.org, philmd@redhat.com
Subject: Re: [PATCH v4 2/5] acpi: Move build_tpm2() in the generic part
Date: Thu, 11 Jun 2020 11:14:14 -0400 [thread overview]
Message-ID: <0c34a3c3-a5b0-15a1-e8e9-418d611a26f3@linux.ibm.com> (raw)
In-Reply-To: <20200611135917.18300-3-eric.auger@redhat.com>
On 6/11/20 9:59 AM, Eric Auger wrote:
> We plan to build the TPM2 table on ARM too. In order to reuse the
> generation code, let's move build_tpm2() to aml-build.c.
>
> No change in the implementation.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> include/hw/acpi/aml-build.h | 2 ++
> hw/acpi/aml-build.c | 51 +++++++++++++++++++++++++++++++++++++
> hw/i386/acpi-build.c | 51 -------------------------------------
> 3 files changed, 53 insertions(+), 51 deletions(-)
>
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index ed7c89309e..d27da03d64 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -437,4 +437,6 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms);
>
> void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
> const char *oem_id, const char *oem_table_id);
> +
> +void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog);
> #endif
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 3681ec6e3d..2a1d9fc839 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -26,6 +26,7 @@
> #include "qemu/bitops.h"
> #include "sysemu/numa.h"
> #include "hw/boards.h"
> +#include "hw/acpi/tpm.h"
>
> static GArray *build_alloc_array(void)
> {
> @@ -1877,6 +1878,56 @@ build_hdr:
> "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
> }
>
> +void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
> +{
> + uint8_t start_method_params[12] = {};
> + unsigned log_addr_offset, tpm2_start;
> + uint64_t control_area_start_address;
> + uint32_t start_method;
> + void *tpm2_ptr;
> +
> + tpm2_start = table_data->len;
> + tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));
> +
> + /* Platform Class */
> + build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);
> + /* Reserved */
> + build_append_int_noprefix(table_data, 0, 2);
> + if (TPM_IS_TIS_ISA(tpm_find())) {
> + control_area_start_address = 0;
> + start_method = TPM2_START_METHOD_MMIO;
> + } else if (TPM_IS_CRB(tpm_find())) {
> + control_area_start_address = TPM_CRB_ADDR_CTRL;
> + start_method = TPM2_START_METHOD_CRB;
> + } else {
> + g_assert_not_reached();
> + }
> + /* Address of Control Area */
> + build_append_int_noprefix(table_data, control_area_start_address, 8);
> + /* Start Method */
> + build_append_int_noprefix(table_data, start_method, 4);
> +
> + /* Platform Specific Parameters */
> + g_array_append_vals(table_data, &start_method_params,
> + ARRAY_SIZE(start_method_params));
> +
> + /* Log Area Minimum Length */
> + build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4);
> +
> + acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);
> + bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1,
> + false);
> +
> + log_addr_offset = table_data->len;
> + build_append_int_noprefix(table_data, 0, 8);
> + /* Log Area Start Address to be filled by Guest linker */
> + bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
> + log_addr_offset, 8,
> + ACPI_BUILD_TPMLOG_FILE, 0);
> + build_header(linker, table_data,
> + tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL);
> +}
> +
> /* ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors */
> static Aml *aml_serial_bus_device(uint8_t serial_bus_type, uint8_t flags,
> uint16_t type_flags,
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index f150d95ecc..b7c7583b5f 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2295,57 +2295,6 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
> (void *)tcpa, "TCPA", sizeof(*tcpa), 2, NULL, NULL);
> }
>
> -static void
> -build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)
> -{
> - uint8_t start_method_params[12] = {};
> - unsigned log_addr_offset, tpm2_start;
> - uint64_t control_area_start_address;
> - uint32_t start_method;
> - void *tpm2_ptr;
> -
> - tpm2_start = table_data->len;
> - tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));
> -
> - /* Platform Class */
> - build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);
> - /* Reserved */
> - build_append_int_noprefix(table_data, 0, 2);
> - if (TPM_IS_TIS_ISA(tpm_find())) {
> - control_area_start_address = 0;
> - start_method = TPM2_START_METHOD_MMIO;
> - } else if (TPM_IS_CRB(tpm_find())) {
> - control_area_start_address = TPM_CRB_ADDR_CTRL;
> - start_method = TPM2_START_METHOD_CRB;
> - } else {
> - g_assert_not_reached();
> - }
> - /* Address of Control Area */
> - build_append_int_noprefix(table_data, control_area_start_address, 8);
> - /* Start Method */
> - build_append_int_noprefix(table_data, start_method, 4);
> -
> - /* Platform Specific Parameters */
> - g_array_append_vals(table_data, &start_method_params,
> - ARRAY_SIZE(start_method_params));
> -
> - /* Log Area Minimum Length */
> - build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4);
> -
> - acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);
> - bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1,
> - false);
> -
> - log_addr_offset = table_data->len;
> - build_append_int_noprefix(table_data, 0, 8);
> - /* Log Area Start Address to be filled by Guest linker */
> - bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
> - log_addr_offset, 8,
> - ACPI_BUILD_TPMLOG_FILE, 0);
> - build_header(linker, table_data,
> - tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL);
> -}
> -
> #define HOLE_640K_START (640 * KiB)
> #define HOLE_640K_END (1 * MiB)
>
next prev parent reply other threads:[~2020-06-11 15:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 13:59 [PATCH v4 0/5] vTPM/aarch64 ACPI support Eric Auger
2020-06-11 13:59 ` [PATCH v4 1/5] acpi: Convert build_tpm2() to build_append* API Eric Auger
2020-06-11 14:25 ` Stefan Berger
2020-06-11 14:49 ` Auger Eric
2020-06-11 14:54 ` Auger Eric
2020-06-16 12:06 ` Igor Mammedov
2020-06-11 15:19 ` Stefan Berger
2020-06-11 16:13 ` Auger Eric
2020-06-16 12:33 ` Igor Mammedov
2020-06-16 14:03 ` Auger Eric
2020-06-16 14:11 ` Stefan Berger
2020-06-18 7:50 ` Auger Eric
2020-06-19 9:38 ` Laszlo Ersek
2020-06-19 9:43 ` Auger Eric
2020-06-19 11:19 ` Stefan Berger
2020-06-22 9:39 ` Igor Mammedov
2020-06-22 9:47 ` Auger Eric
2020-06-22 12:14 ` Igor Mammedov
2020-06-22 12:24 ` Auger Eric
2020-06-11 13:59 ` [PATCH v4 2/5] acpi: Move build_tpm2() in the generic part Eric Auger
2020-06-11 15:14 ` Stefan Berger [this message]
2020-06-11 13:59 ` [PATCH v4 3/5] arm/acpi: TPM2 ACPI table support Eric Auger
2020-06-11 13:59 ` [PATCH v4 4/5] arm/acpi: Add the TPM2.0 device under the DSDT Eric Auger
2020-06-11 13:59 ` [PATCH v4 5/5] docs/specs/tpm: ACPI boot now supported for TPM/ARM Eric Auger
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=0c34a3c3-a5b0-15a1-e8e9-418d611a26f3@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=ardb@kernel.org \
--cc=drjones@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.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).