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=-13.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 C829CC3F2CD for ; Wed, 4 Mar 2020 13:15:47 +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 8D22821741 for ; Wed, 4 Mar 2020 13:15:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D22821741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9TsI-0004dO-Id for qemu-devel@archiver.kernel.org; Wed, 04 Mar 2020 08:15:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38726) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Tp0-00086M-Fu for qemu-devel@nongnu.org; Wed, 04 Mar 2020 08:12:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Toz-0003yc-8C for qemu-devel@nongnu.org; Wed, 04 Mar 2020 08:12:22 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:23860 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9Toz-0003sA-2n for qemu-devel@nongnu.org; Wed, 04 Mar 2020 08:12:21 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 024DB5iC070408; Wed, 4 Mar 2020 08:12:19 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yhs0u374e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Mar 2020 08:12:19 -0500 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 024DCIji074235; Wed, 4 Mar 2020 08:12:18 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 2yhs0u373y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Mar 2020 08:12:18 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 024DAloq026035; Wed, 4 Mar 2020 13:12:18 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma02wdc.us.ibm.com with ESMTP id 2yffk6twy9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Mar 2020 13:12:18 +0000 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 024DCHfv42467762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Mar 2020 13:12:17 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 929FD112064; Wed, 4 Mar 2020 13:12:17 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7BD35112063; Wed, 4 Mar 2020 13:12:17 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 4 Mar 2020 13:12:17 +0000 (GMT) From: Stefan Berger To: qemu-devel@nongnu.org Subject: [PULL v1 00/10] Merge TPM 2020/03/04 Date: Wed, 4 Mar 2020 08:12:04 -0500 Message-Id: <20200304131214.179000-1-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-04_05:2020-03-04, 2020-03-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=1 lowpriorityscore=0 impostorscore=0 spamscore=0 clxscore=1015 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003040101 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 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: peter.maydell@linaro.org, Stefan Berger , eric.auger@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This series of patches adds support for TPM on ARM. Regards, Stefan The following changes since commit 2ac031d171ccd18c973014d9978b4a63f0ad5fb0: Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf3' into staging (2020-03-03 11:06:39 +0000) are available in the Git repository at: git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2020-03-04-1 for you to fetch changes up to cf5b8ff14b38eb93363364635df3a0e6aa8c74e5: test: tpm-tis: Add Sysbus TPM-TIS device test (2020-03-03 07:29:09 -0500) 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 default-configs/i386-softmmu.mak | 2 +- docs/specs/tpm.rst | 25 +- hw/arm/Kconfig | 1 + hw/arm/sysbus-fdt.c | 33 ++ hw/arm/virt.c | 7 + hw/i386/Kconfig | 2 +- hw/i386/acpi-build.c | 6 +- hw/tpm/Kconfig | 12 +- hw/tpm/Makefile.objs | 4 +- hw/tpm/tpm_tis.h | 91 +++++ hw/tpm/{tpm_tis.c => tpm_tis_common.c} | 181 +--------- hw/tpm/tpm_tis_isa.c | 170 +++++++++ hw/tpm/tpm_tis_sysbus.c | 159 +++++++++ include/sysemu/tpm.h | 7 +- tests/qtest/Makefile.include | 11 +- tests/qtest/tpm-crb-swtpm-test.c | 9 +- tests/qtest/tpm-crb-test.c | 3 + tests/qtest/tpm-tests.c | 10 +- tests/qtest/tpm-tests.h | 5 +- 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-tis-util.h | 23 ++ tests/qtest/tpm-util.c | 11 +- tests/qtest/tpm-util.h | 8 +- 27 files changed, 1207 insertions(+), 609 deletions(-) create mode 100644 hw/tpm/tpm_tis.h rename hw/tpm/{tpm_tis.c => 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 create mode 100644 tests/qtest/tpm-tis-util.h -- 2.24.1