From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:4942:0:0:0:0:0 with SMTP id o2csp3152075lfi; Thu, 5 Mar 2020 09:08:34 -0800 (PST) X-Google-Smtp-Source: ADFU+vvcxOKcUg+5LPDZxnHa6bvDs7cKU2QN10OB/QlTieYX6BLq8qp9q5EIv3cZwMqCKns/xEPt X-Received: by 2002:a37:8384:: with SMTP id f126mr8084570qkd.99.1583428114500; Thu, 05 Mar 2020 09:08:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583428114; cv=none; d=google.com; s=arc-20160816; b=BhxuIIyDE5ukX6csftkC06uOBKNRyXo855iiZoABGqFp+USZLj0n1zq2pXx+5n8DX3 W4WcD3pSK/m24lcZBsH0J8Dcr6X1/zTUkFI3JaV54AwRb3LrqxNvRGVQSoxTbb3/vS8v GdvzqpwAiz8Abg1YxfNNC0RHoA6v96KL27nVhb2tmOvWk3+9GH87E+jEc/HMEjGBGD8/ U+nwkSxlYyAPwZCi1ejmxM3RpAVtB7/bv+ZR4Jwgj12zTy+/n1RKlFYHDXjUfDhbP8vg 6OJBDo2kleqe0NB6tLc6MrA1i9zbtkYl+sZL6d6H5+edg8nenkpvvrZnryEQUUJKfY3d jhxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=c8YYiF9fIDw14MYKT13N5JNz0nQi9S83Rh2gOxjADIA=; b=A8wPgC+uw7eHveugGIwSsKdhFua8iDwwZNEohlP0nOjzcsJEv8PBui7+PUCfyEmQHN fu1T4s3UUD7d+kvVo/tte7IeLn++A8yyAjT+SF1+N3X7/IB1SaP53zC9gBi5VQKTzba9 XeMv3da9PO58GkrSCtggfqJjHLH80xBMdJVmTtjYgD8kMTKZ1/ewL1GkZBO37O0PygsT KWCD5I75JPAaFzmYHqnio0tjb/6dm7Ph7p3ENZNKtU7Jp2DEBshGx0cO5qFqqhGlfxyo xpGk0KSeMMUIs+YV/T4Ipdos+Uh6X+gYpQ/y3YvykTPe3fRqPSBRfkk0SlNecx3Q2zqW zl9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="X/hkHEIU"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o15si2690395qtm.166.2020.03.05.09.08.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Mar 2020 09:08:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="X/hkHEIU"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tz7-00006p-Pb for alex.bennee@linaro.org; Thu, 05 Mar 2020 12:08:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34660) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tjc-0005Jo-S5 for qemu-arm@nongnu.org; Thu, 05 Mar 2020 11:52:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9tjb-0007Wm-MN for qemu-arm@nongnu.org; Thu, 05 Mar 2020 11:52:32 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41453 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9tjb-0007W2-IE for qemu-arm@nongnu.org; Thu, 05 Mar 2020 11:52:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583427151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c8YYiF9fIDw14MYKT13N5JNz0nQi9S83Rh2gOxjADIA=; b=X/hkHEIU1B1Isiv3uCTkwvbN0kRlRqBem7KYJH3NEGKKNkk2I8/19+uBiCRksu5kJRIOIG a9XlXeiAkgbTCVHqDNaLEAb5SCfD4a0aUq+ahueLcsRlZkJp1Ril4skf4UXnv4a8O2nQnt OJ8IsXzUHAo0Ksr5LCJd92VkmAtYdYU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-oOSy9-ZsOieJyQurvicX6Q-1; Thu, 05 Mar 2020 11:52:29 -0500 X-MC-Unique: oOSy9-ZsOieJyQurvicX6Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E5B3801E72; Thu, 5 Mar 2020 16:52:28 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3544E271BA; Thu, 5 Mar 2020 16:52:19 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, stefanb@linux.ibm.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Subject: [PATCH v5 04/10] tpm: Separate TPM_TIS and TPM_TIS_ISA configs Date: Thu, 5 Mar 2020 17:51:43 +0100 Message-Id: <20200305165149.618-5-eric.auger@redhat.com> In-Reply-To: <20200305165149.618-1-eric.auger@redhat.com> References: <20200305165149.618-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, lersek@redhat.com, ardb@kernel.org, philmd@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: YxdBwcXuy8t1 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Ard Biesheuvel Acked-by: Ard Biesheuvel --- 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-softmm= u.mak index 4cc64dafa2..84d1a2487c 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -20,7 +20,7 @@ #CONFIG_SGA=3Dn #CONFIG_TEST_DEVICES=3Dn #CONFIG_TPM_CRB=3Dn -#CONFIG_TPM_TIS=3Dn +#CONFIG_TPM_TIS_ISA=3Dn #CONFIG_VTD=3Dn =20 # 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 =20 -config TPM_TIS +config TPM_TIS_ISA bool depends on TPM && ISA_BUS + select TPM_TIS + +config TPM_TIS + bool + depends on TPM select TPMDEV =20 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) +=3D tpm_util.o obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) +=3D tpm_ppi.o -common-obj-$(CONFIG_TPM_TIS) +=3D tpm_tis_isa.o tpm_tis_common.o +common-obj-$(CONFIG_TPM_TIS_ISA) +=3D tpm_tis_isa.o +common-obj-$(CONFIG_TPM_TIS) +=3D tpm_tis_common.o common-obj-$(CONFIG_TPM_CRB) +=3D tpm_crb.o common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index e769c1ad70..028af5b782 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -54,8 +54,8 @@ check-qtest-i386-y +=3D q35-test check-qtest-i386-y +=3D vmgenid-test check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-swtpm-test check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tpm-crb-test -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-swtpm-test -check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tpm-tis-test +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) +=3D tpm-tis-swtpm-test +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) +=3D tpm-tis-test check-qtest-i386-$(CONFIG_SLIRP) +=3D test-netfilter check-qtest-i386-$(CONFIG_POSIX) +=3D test-filter-mirror check-qtest-i386-$(CONFIG_RTL8139_PCI) +=3D test-filter-redirector --=20 2.20.1