From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Stefan Berger <stefanb@linux.ibm.com>,
armbru@redhat.com, qemu-devel@nongnu.org,
qemu-arm <qemu-arm@nongnu.org>
Cc: Igor Mammedov <imammedo@redhat.com>,
"M : Michael S . Tsirkin" <mst@redhat.com>
Subject: Re: [RFC PATCH V1 1/3] acpi: Eliminate all TPM related code if CONFIG_TPM is not set
Date: Mon, 14 Jun 2021 11:53:17 +0200 [thread overview]
Message-ID: <d097926e-5f55-e2a0-0cf9-42dfd71815d4@redhat.com> (raw)
In-Reply-To: <20210612012102.1820063-2-stefanb@linux.ibm.com>
On 6/12/21 3:21 AM, Stefan Berger wrote:
> Cc: M: Michael S. Tsirkin <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> hw/acpi/aml-build.c | 2 ++
> hw/arm/virt-acpi-build.c | 2 ++
> hw/i386/acpi-build.c | 20 ++++++++++++++++++++
> include/hw/acpi/tpm.h | 4 ++++
> stubs/tpm.c | 4 ----
> 5 files changed, 28 insertions(+), 4 deletions(-)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index f0035d2b4a..d5103e6d7b 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -2044,6 +2044,7 @@ build_hdr:
> "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
> }
>
> +#ifdef CONFIG_TPM
> /*
> * build_tpm2 - Build the TPM2 table as specified in
> * table 7: TCG Hardware Interface Description Table Format for TPM 2.0
> @@ -2101,6 +2102,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog,
> (void *)(table_data->data + tpm2_start),
> "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id);
> }
> +#endif
This makes the ARM virt machine build to fail for missing
the build_tpm2() symbol.
You probably need to split the patch in 2 and rearrange the
series:
1/ hw/i386 (current 1)
2/ hw/arm (current 2)
3/ hw/acpi (current 1)
4/ sysemu/tpm (current 3)
> diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h
> index 1a2a57a21f..559ba6906c 100644
> --- a/include/hw/acpi/tpm.h
> +++ b/include/hw/acpi/tpm.h
> @@ -21,6 +21,8 @@
> #include "hw/acpi/aml-build.h"
> #include "sysemu/tpm.h"
>
> +#ifdef CONFIG_TPM
> +
> #define TPM_TIS_ADDR_BASE 0xFED40000
> #define TPM_TIS_ADDR_SIZE 0x5000
>
> @@ -209,4 +211,6 @@ REG32(CRB_DATA_BUFFER, 0x80)
>
> void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev);
>
> +#endif /* CONFIG_TPM */
> +
> #endif /* HW_ACPI_TPM_H */
next prev parent reply other threads:[~2021-06-14 9:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 1:20 [RFC PATCH V1 0/3] tpm: Eliminate TPM related code if CONFIG_TPM is not set Stefan Berger
2021-06-12 1:21 ` [RFC PATCH V1 1/3] acpi: Eliminate all " Stefan Berger
2021-06-14 8:09 ` Markus Armbruster
2021-06-14 9:53 ` Philippe Mathieu-Daudé [this message]
2021-06-14 18:12 ` Stefan Berger
2021-06-12 1:21 ` [RFC PATCH V1 2/3] arm: " Stefan Berger
2021-06-12 1:21 ` [RFC PATCH V1 3/3] sysemu: Make TPM structures inaccessible if CONFIG_TPM is not defined Stefan Berger
2021-06-14 9:46 ` Philippe Mathieu-Daudé
2021-06-14 8:34 ` [RFC PATCH V1 0/3] tpm: Eliminate TPM related code if CONFIG_TPM is not set Markus Armbruster
2021-06-14 19:12 ` Stefan Berger
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=d097926e-5f55-e2a0-0cf9-42dfd71815d4@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.