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=-5.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, 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 4EDBEC3F2D7 for ; Thu, 5 Mar 2020 17:07:49 +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 1E21E207FD for ; Thu, 5 Mar 2020 17:07:49 +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="cARDANq8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E21E207FD 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]:53498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tyO-0006zL-Ba for qemu-devel@archiver.kernel.org; Thu, 05 Mar 2020 12:07:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34498) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tjL-0004kA-0N for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:52:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9tjJ-00077W-5F for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:52:14 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:47040 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9tjJ-00076X-2Q for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:52:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583427132; 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; bh=8cL38r9cxiYQQfHCD9Jb/6kyOc/fYElccL153YTjP4c=; b=cARDANq8jEsyJAD4mc5b7HqO+ngBPCDlgKppqxstDWOVX0eb5MDlP7bAGXD4GdgaCJP8jc bV7BzwFimiys68h/Q6+y/RXKRCFa7sNhyfECg7ZklvRfAANOpx3Yk9FBRDqR4feXLN1Y6v 0PVIIJNKdOQs0+LbW3mDhl5ypbAkT5c= 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-79-DG_q5HZFPL-z2obX_5GOFg-1; Thu, 05 Mar 2020 11:52:09 -0500 X-MC-Unique: DG_q5HZFPL-z2obX_5GOFg-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 D825D107ACC4; Thu, 5 Mar 2020 16:52:07 +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 59D3A39A; Thu, 5 Mar 2020 16:52:00 +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 00/10] vTPM for aarch64 Date: Thu, 5 Mar 2020 17:51:39 +0100 Message-Id: <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] [fuzzy] X-Received-From: 207.211.31.81 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" This series adds the capability to instantiate an MMIO TPM TIS in ARM virt. It is candidate to qemu 5.0. The existing TPM TIS code is reshuffled into a generic part, the ISA device and the sysbus device. The sysbus TPM-TIS device gets dynamically instantiated in machvirt on the platform bus. ACPI boot is not yet supported on ARM. Note that the UEFI firmware is itself a consumer of the DT description, so we need the DT related changes regardless of whether the VM boots in DT or ACPI mode. Related qtests are reshuffled to allow the reuse of existing tests for both the ISA and the sysbus devices: Adaption consists in changing the qemu command line (change in the device name and provide explicit machine options) and adapt to the relocation of the TPM-TIS device in the memory map. The series was tested with the swtpm/libtpms emulator. Automatic guest LUKS volume unlocking (tpm2) was successful. Thanks to Ard for supporting me when setting up the test environment. Best Regards Eric Testing: mkdir /tmp/tpm swtpm socket \ --tpm2 \ -t -d \ --tpmstate dir=3D/tmp/tpm \ --ctrl type=3Dunixio,path=3D/tmp/swtpm-sock qemu command line must be augmented with the following options: -chardev socket,id=3Dchrtpm,path=3D/tmp/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ -device tpm-tis-device,tpmdev=3Dtpm0 \ References: [1] libtpms: https://github.com/stefanberger/libtpms/wiki [2] swtpm: https://github.com/stefanberger/swtpm/wiki This series can be found at: https://github.com/eauger/qemu/tree/v4.2.0-tpm-patch-v5 History: v4 -> v5: - Fix osx make check error in [PATCH v4 06/10] hw/arm/virt: vTPM support (put TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node) outside of CONFIG_LINUX) Tested with make vm-build-openbsd v3 -> v4: - collect additional R-b's - add 'Not used but needed for linking' mention related to tpm_tis_base_addr in CRB test files - fix comment style RFCv2 -> PATCH v3: - Updated the doc for ARM - Adapted existing tests for ARM - use qemu_fdt_setprop_string in add_tpm_tis_fdt_node - Collected R-b's - Comments not taken into account: - I have kept the tpm-tis-device name for now despite Stefan's suggestion to rename it into tpm-tis-sysbus. This is not frozen though - Common state still is not a QOM object (no double inheritence) RFC v1 -> RFC v2: - restructure the existing code with common, ISA and sysbus part. - both ARM and x86 integration were tested. Eric Auger (10): tpm: rename TPM_TIS into TPM_TIS_ISA tpm: Use TPMState as a common struct tpm: Separate tpm_tis common functions from isa code tpm: Separate TPM_TIS and TPM_TIS_ISA configs tpm: Add the SysBus TPM TIS device hw/arm/virt: vTPM support docs/specs/tpm: Document TPM_TIS sysbus device for ARM test: tpm: pass optional machine options to swtpm test functions test: tpm-tis: Get prepared to share tests between ISA and sysbus devices test: tpm-tis: Add Sysbus TPM-TIS device test docs/specs/tpm.rst | 25 +- default-configs/i386-softmmu.mak | 2 +- hw/tpm/tpm_tis.h | 91 +++++ include/sysemu/tpm.h | 7 +- tests/qtest/tpm-tests.h | 5 +- tests/qtest/tpm-tis-util.h | 23 ++ tests/qtest/tpm-util.h | 8 +- hw/arm/sysbus-fdt.c | 33 ++ hw/arm/virt.c | 7 + hw/i386/acpi-build.c | 6 +- hw/tpm/{tpm_tis.c =3D> tpm_tis_common.c} | 181 +--------- hw/tpm/tpm_tis_isa.c | 170 +++++++++ hw/tpm/tpm_tis_sysbus.c | 159 +++++++++ tests/qtest/tpm-crb-swtpm-test.c | 9 +- tests/qtest/tpm-crb-test.c | 3 + tests/qtest/tpm-tests.c | 10 +- tests/qtest/tpm-tis-device-swtpm-test.c | 76 ++++ tests/qtest/tpm-tis-device-test.c | 87 +++++ tests/qtest/tpm-tis-swtpm-test.c | 8 +- tests/qtest/tpm-tis-test.c | 414 +--------------------- tests/qtest/tpm-tis-util.c | 451 ++++++++++++++++++++++++ tests/qtest/tpm-util.c | 11 +- hw/arm/Kconfig | 1 + hw/i386/Kconfig | 2 +- hw/tpm/Kconfig | 12 +- hw/tpm/Makefile.objs | 4 +- tests/qtest/Makefile.include | 11 +- 27 files changed, 1207 insertions(+), 609 deletions(-) create mode 100644 hw/tpm/tpm_tis.h create mode 100644 tests/qtest/tpm-tis-util.h rename hw/tpm/{tpm_tis.c =3D> tpm_tis_common.c} (85%) create mode 100644 hw/tpm/tpm_tis_isa.c create mode 100644 hw/tpm/tpm_tis_sysbus.c create mode 100644 tests/qtest/tpm-tis-device-swtpm-test.c create mode 100644 tests/qtest/tpm-tis-device-test.c create mode 100644 tests/qtest/tpm-tis-util.c --=20 2.20.1