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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 98E50C35DF9 for ; Tue, 25 Feb 2020 10:30:01 +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 63A1E218AC for ; Tue, 25 Feb 2020 10:30:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="f1HrLPud" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63A1E218AC 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]:52066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6XTU-00054n-K2 for qemu-devel@archiver.kernel.org; Tue, 25 Feb 2020 05:30:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34359) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6XSi-0004Kn-JS for qemu-devel@nongnu.org; Tue, 25 Feb 2020 05:29:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6XSh-0007nw-BV for qemu-devel@nongnu.org; Tue, 25 Feb 2020 05:29:12 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:27014 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 1j6XSh-0007nT-86 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 05:29:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582626550; 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=eshyn9fh7aNIDenEnNW/UIb6iPc/g8gyvLYT0vLExco=; b=f1HrLPudmyYmmj2yUXbzMd86lygNPvaTcZMSrFmOoiAya+NB40TnLQXDz4NGjBEcGXs+IU mDWljaGoLnFIL6SAbVqOlTNQ1qNkUZ10SL3pfgN0OMtk/9mnMEECUAa/TgAdiV3k4n7T+U SnHP2lEfIZIlBaZzZM+/7L9RvZ9Ncow= 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-327-iCOYz_zfOVOAoN148uEZCw-1; Tue, 25 Feb 2020 05:29:07 -0500 X-MC-Unique: iCOYz_zfOVOAoN148uEZCw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE2D81005512; Tue, 25 Feb 2020 10:29:05 +0000 (UTC) Received: from [10.36.116.59] (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E90FE5C1D6; Tue, 25 Feb 2020 10:29:00 +0000 (UTC) Subject: Re: [RFC v2 1/6] tpm: rename TPM_TIS into TPM_TIS_ISA To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , eric.auger.pro@gmail.com, stefanb@linux.ibm.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org References: <20200214183704.14389-1-eric.auger@redhat.com> <20200214183704.14389-2-eric.auger@redhat.com> <29cc9864-a016-b251-506a-8c04b37efe28@redhat.com> <4dd1b4b0-7112-5a8a-9033-9c21eb01b8f9@redhat.com> <5eb51283-2bfd-bd02-3bbd-492961e842ff@redhat.com> From: Auger Eric Message-ID: Date: Tue, 25 Feb 2020 11:28:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <5eb51283-2bfd-bd02-3bbd-492961e842ff@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Phil, On 2/25/20 11:22 AM, Philippe Mathieu-Daud=C3=A9 wrote: > On 2/25/20 11:16 AM, Auger Eric wrote: >> Hi Phil, >> >> On 2/14/20 7:55 PM, Philippe Mathieu-Daud=C3=A9 wrote: >>> On 2/14/20 7:36 PM, Eric Auger wrote: >>>> As we plan to introduce a sysbus TPM_TIS, let's rename >>>> TPM_TIS into TPM_TIS_ISA. >>>> >>>> Signed-off-by: Eric Auger >>>> --- >>>> =C2=A0=C2=A0 hw/i386/acpi-build.c | 6 +++--- >>>> =C2=A0=C2=A0 hw/tpm/tpm_tis.c=C2=A0=C2=A0=C2=A0=C2=A0 | 4 ++-- >>>> =C2=A0=C2=A0 include/sysemu/tpm.h | 6 +++--- >>>> =C2=A0=C2=A0 3 files changed, 8 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c >>>> index 9c4e46fa74..26777f8828 100644 >>>> --- a/hw/i386/acpi-build.c >>>> +++ b/hw/i386/acpi-build.c >>>> @@ -2026,7 +2026,7 @@ build_dsdt(GArray *table_data, BIOSLinker >>>> *linker, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0 if (TPM_IS_TIS(tpm_find())) { >>>> +=C2=A0=C2=A0=C2=A0 if (TPM_IS_TIS_ISA(tpm_find())) { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 aml_appen= d(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPM_TIS_ADDR_SIZE= , AML_READ_WRITE)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >>>> @@ -2197,7 +2197,7 @@ build_dsdt(GArray *table_data, BIOSLinker >>>> *linker, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 /* Scan all PCI buses. Generate tables to support >>>> hotplug. */ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 build_append_pci_bus_devices(scope, bus, >>>> pm->pcihp_bridge_en); >>>> =C2=A0=C2=A0 -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 if (TPM_IS_TIS(tpm)) { >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if= (TPM_IS_TIS_ISA(tpm)) { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (misc->tpm_version =3D=3D TPM_VE= RSION_2_0) { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dev =3D aml= _device("TPM"); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 aml_append(= dev, aml_name_decl("_HID", >>>> @@ -2304,7 +2304,7 @@ build_tpm2(GArray *table_data, BIOSLinker >>>> *linker, GArray *tcpalog) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (char *)&= tpm2_ptr->log_area_start_address - >>>> table_data->data; >>>> =C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm2_ptr->platform_class = =3D >>>> cpu_to_le16(TPM2_ACPI_CLASS_CLIENT); >>>> -=C2=A0=C2=A0=C2=A0 if (TPM_IS_TIS(tpm_find())) { >>>> +=C2=A0=C2=A0=C2=A0 if (TPM_IS_TIS_ISA(tpm_find())) { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm2_ptr-= >control_area_address =3D cpu_to_le64(0); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm2_ptr-= >start_method =3D >>>> cpu_to_le32(TPM2_START_METHOD_MMIO); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } else if (TPM_IS_CRB(tpm_find())= ) { >>>> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c >>>> index 31facb896d..c609737272 100644 >>>> --- a/hw/tpm/tpm_tis.c >>>> +++ b/hw/tpm/tpm_tis.c >>>> @@ -91,7 +91,7 @@ typedef struct TPMState { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPMPPI ppi; >>>> =C2=A0=C2=A0 } TPMState; >>>> =C2=A0=C2=A0 -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_= TIS) >>>> +#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA) >>>> =C2=A0=C2=A0 =C2=A0 #define DEBUG_TIS 0 >>>> =C2=A0=C2=A0 @@ -1008,7 +1008,7 @@ static void tpm_tis_class_init(Obje= ctClass >>>> *klass, void *data) >>>> =C2=A0=C2=A0 } >>>> =C2=A0=C2=A0 =C2=A0 static const TypeInfo tpm_tis_info =3D { >>>> -=C2=A0=C2=A0=C2=A0 .name =3D TYPE_TPM_TIS, >>>> +=C2=A0=C2=A0=C2=A0 .name =3D TYPE_TPM_TIS_ISA, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .parent =3D TYPE_ISA_DEVICE, >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .instance_size =3D sizeof(TPMStat= e), >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .instance_init =3D tpm_tis_initfn= , >>>> diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h >>>> index 15979a3647..1691b92c28 100644 >>>> --- a/include/sysemu/tpm.h >>>> +++ b/include/sysemu/tpm.h >>>> @@ -43,12 +43,12 @@ typedef struct TPMIfClass { >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 enum TPMVersion (*get_version)(TP= MIf *obj); >>>> =C2=A0=C2=A0 } TPMIfClass; >>>> =C2=A0=C2=A0 -#define TYPE_TPM_TIS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "tpm-tis" >>>> +#define TYPE_TPM_TIS_ISA=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 "tpm-tis" >>> >>> It should be safe to rename this "tpm-tis-isa" in this patch. >> This would change the name of the legacy ISA device and also the way we >> instantiate it through the cmd line. To avoid breaking the compatibility >> I kept the same name and used tpm-tis-device (?) for the new sysbus one. >=20 > I thought ISA devices were not user-creatable... See docs/specs/tpm.rst and the cmd line used for x86: ../.. -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ -device tpm-tis,tpmdev=3Dtpm0 test.img Thanks Eric >=20 >> >> Thanks >> >> Eric >>> >>> Regardless: >>> Reviewed-by: Philippe Mathieu-Daud=C3=A9 >>> >>>> =C2=A0=C2=A0 #define TYPE_TPM_CRB=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "tpm-crb" >>>> =C2=A0=C2=A0 #define TYPE_TPM_SPAPR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "tpm-spapr" >>>> =C2=A0=C2=A0 -#define TPM_IS_TIS(chr)=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >>>> -=C2=A0=C2=A0=C2=A0 object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS) >>>> +#define TPM_IS_TIS_ISA(chr)=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >>>> +=C2=A0=C2=A0=C2=A0 object_dynamic_cast(OBJECT(chr), TYPE_TPM_TIS_ISA) >>>> =C2=A0=C2=A0 #define TPM_IS_CRB(chr)=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 object_dynamic_cast(OBJECT(chr), = TYPE_TPM_CRB) >>>> =C2=A0=C2=A0 #define TPM_IS_SPAPR(chr)=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 \ >>>> >>> >> >=20 >=20