From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C3F7C3B1BD for ; Fri, 14 Feb 2020 18:40:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 31A5D20848 for ; Fri, 14 Feb 2020 18:40:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PhX2mPCK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 31A5D20848 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2ftP-0007uI-DP for qemu-devel@archiver.kernel.org; Fri, 14 Feb 2020 13:40:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37178) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2fqZ-0002PH-Qm for qemu-devel@nongnu.org; Fri, 14 Feb 2020 13:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2fqY-0004K8-MZ for qemu-devel@nongnu.org; Fri, 14 Feb 2020 13:37:51 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28736 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 1j2fqY-0004Id-IR for qemu-devel@nongnu.org; Fri, 14 Feb 2020 13:37:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581705470; 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=WUM5I+j1JR22/Wll5QP0UshXB6fn5FjlT493r1BFhug=; b=PhX2mPCKSIKQHu/DBzgvz6UkLqqeaV6vBuU5tIRpFOHklRGx6xC1qAerysWZtiQ6qo7Tv0 8G6KtqQfQLiH5/5tJRjVOBRTXPBtYf0V0nrUNGZCIVQaK90Cwryd2a2WTJUBI2ToJntBdX d5fOA0cMTxzplxnb8N5O0113fJRXOk4= 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-326-ZSpBLxFoMK2Czdz4eFxCzA-1; Fri, 14 Feb 2020 13:37:47 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D9A3107ACC4; Fri, 14 Feb 2020 18:37:46 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 325215DA7D; Fri, 14 Feb 2020 18:37:41 +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: [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs Date: Fri, 14 Feb 2020 19:37:02 +0100 Message-Id: <20200214183704.14389-5-eric.auger@redhat.com> In-Reply-To: <20200214183704.14389-1-eric.auger@redhat.com> References: <20200214183704.14389-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: ZSpBLxFoMK2Czdz4eFxCzA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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-devel@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-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 eb0f23b108..33dd3c89cc 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