From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Eric Auger <eric.auger@redhat.com>,
eric.auger.pro@gmail.com, stefanb@linux.ibm.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org
Cc: marcandre.lureau@redhat.com, lersek@redhat.com, ardb@kernel.org
Subject: Re: [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs
Date: Fri, 14 Feb 2020 20:03:58 +0100 [thread overview]
Message-ID: <3d53d213-0135-6b9f-7684-39c4d6ae1321@redhat.com> (raw)
In-Reply-To: <20200214183704.14389-5-eric.auger@redhat.com>
On 2/14/20 7:37 PM, Eric Auger wrote:
> Let's separate the compilation of tpm_tis_common.c from
> the compilation of tpm_tis_isa.c
>
> The common part will be also compiled along with the
> tpm_tis_sysbus device.
>
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> ---
> default-configs/i386-softmmu.mak | 2 +-
> hw/i386/Kconfig | 2 +-
> hw/tpm/Kconfig | 7 ++++++-
> hw/tpm/Makefile.objs | 3 ++-
> tests/qtest/Makefile.include | 4 ++--
> 5 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index 4cc64dafa2..84d1a2487c 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -20,7 +20,7 @@
> #CONFIG_SGA=n
> #CONFIG_TEST_DEVICES=n
> #CONFIG_TPM_CRB=n
> -#CONFIG_TPM_TIS=n
> +#CONFIG_TPM_TIS_ISA=n
> #CONFIG_VTD=n
>
> # Boards:
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index cdc851598c..c93f32f657 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -20,7 +20,7 @@ config PC
> imply SGA
> imply TEST_DEVICES
> imply TPM_CRB
> - imply TPM_TIS
> + imply TPM_TIS_ISA
> imply VGA_PCI
> imply VIRTIO_VGA
> select FDC
> diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig
> index 9e67d990e8..686f8206bb 100644
> --- a/hw/tpm/Kconfig
> +++ b/hw/tpm/Kconfig
> @@ -2,9 +2,14 @@ config TPMDEV
> bool
> depends on TPM
>
> -config TPM_TIS
> +config TPM_TIS_ISA
> bool
> depends on TPM && ISA_BUS
Maybe you can relax to "depends on ISA_BUS" ...
> + select TPM_TIS
> +
> +config TPM_TIS
> + bool
> + depends on TPM
... since TPM_TIS depends on TPM.
> select TPMDEV
>
> config TPM_CRB
> diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
> index fcc4c2f27c..3ef2036cca 100644
> --- a/hw/tpm/Makefile.objs
> +++ b/hw/tpm/Makefile.objs
> @@ -1,6 +1,7 @@
> common-obj-$(CONFIG_TPM) += tpm_util.o
> obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
> -common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
> +common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
> +common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
> common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
> common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
> common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
> diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
> index eb0f23b108..33dd3c89cc 100644
> --- a/tests/qtest/Makefile.include
> +++ b/tests/qtest/Makefile.include
> @@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test
> check-qtest-i386-y += vmgenid-test
> check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
> check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
> -check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
> -check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
> +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
> +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
> check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
> check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
> check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
next prev parent reply other threads:[~2020-02-14 19:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 18:36 [RFC v2 0/6] vTPM for aarch64 Eric Auger
2020-02-14 18:36 ` [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA Eric Auger
2020-02-14 18:55 ` Philippe Mathieu-Daudé
2020-02-25 10:16 ` Auger Eric
2020-02-25 10:22 ` Philippe Mathieu-Daudé
2020-02-25 10:28 ` Auger Eric
2020-02-16 18:14 ` Stefan Berger
2020-02-14 18:37 ` [RFC v2 2/6] tpm: Use TPMState as a common struct Eric Auger
2020-02-14 19:01 ` Philippe Mathieu-Daudé
2020-02-16 18:22 ` Stefan Berger
2020-02-17 9:21 ` Philippe Mathieu-Daudé
2020-02-17 18:01 ` Auger Eric
2020-02-25 10:18 ` Auger Eric
2020-02-14 18:37 ` [RFC v2 3/6] tpm: Separate tpm_tis common functions from isa code Eric Auger
2020-02-16 18:27 ` Stefan Berger
2020-02-14 18:37 ` [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs Eric Auger
2020-02-14 19:03 ` Philippe Mathieu-Daudé [this message]
2020-02-25 10:05 ` Auger Eric
2020-02-14 18:37 ` [RFC v2 5/6] tpm: Add the SysBus TPM TIS device Eric Auger
2020-02-16 18:32 ` Stefan Berger
2020-02-17 18:13 ` Auger Eric
2020-02-25 9:18 ` Auger Eric
2020-02-25 9:52 ` Ard Biesheuvel
2020-02-25 10:18 ` Philippe Mathieu-Daudé
2020-02-26 8:38 ` Auger Eric
2020-02-14 18:37 ` [RFC v2 6/6] hw/arm/virt: vTPM support Eric Auger
2020-02-16 18:47 ` Stefan Berger
2020-02-17 18:26 ` Auger Eric
2020-02-16 16:35 ` [RFC v2 0/6] vTPM for aarch64 Ard Biesheuvel
2020-02-17 18:03 ` Auger Eric
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=3d53d213-0135-6b9f-7684-39c4d6ae1321@redhat.com \
--to=philmd@redhat.com \
--cc=ardb@kernel.org \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.com \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--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 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).