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.1 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,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 EB1C6C38A2A for ; Wed, 6 May 2020 09:56:18 +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 B9CF020753 for ; Wed, 6 May 2020 09:56:18 +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="YOBvWUJ9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9CF020753 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]:45702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWGmn-0007WM-VY for qemu-devel@archiver.kernel.org; Wed, 06 May 2020 05:56:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWGhH-0004zF-HU for qemu-devel@nongnu.org; Wed, 06 May 2020 05:50:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48104 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jWGh9-0004AQ-Bw for qemu-devel@nongnu.org; Wed, 06 May 2020 05:50:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588758626; 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=fntlZxOrQXIy/pcq6sRK0Boh9YWLv+kEEtgN1sPemoY=; b=YOBvWUJ9vlO/TJCeNaxVorzaC9/eN5sguQLA5yVeqP1QHq8C95QHHWb/ux4m875sQ+7PjL i3xkKlpvHwwH9H9cXW0Wpq8w96uN4HIDvmjt7Erd9OnPrKYDk69jnA75/kW9ILlONCu7rQ PtBsP/0qKvOW3Z1PHb0Wbz4A3YojKv8= 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-235--dY5D_JfPF-YpiqQbat7ig-1; Wed, 06 May 2020 05:50:25 -0400 X-MC-Unique: -dY5D_JfPF-YpiqQbat7ig-1 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 AD1078014C0; Wed, 6 May 2020 09:50:23 +0000 (UTC) Received: from [10.36.114.214] (ovpn-114-214.ams2.redhat.com [10.36.114.214]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D5BF5D9C5; Wed, 6 May 2020 09:50:12 +0000 (UTC) Subject: Re: [PATCH v2 1/3] acpi: Move build_tpm2() in the generic part To: Andrew Jones References: <20200505144419.29174-1-eric.auger@redhat.com> <20200505144419.29174-2-eric.auger@redhat.com> <20200506063314.4qvnyfonjixcknuj@kamzik.brq.redhat.com> From: Auger Eric Message-ID: Date: Wed, 6 May 2020 11:50:09 +0200 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: <20200506063314.4qvnyfonjixcknuj@kamzik.brq.redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=eric.auger@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 23:48:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, gshan@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, imammedo@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, lersek@redhat.com, ardb@kernel.org, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, On 5/6/20 8:33 AM, Andrew Jones wrote: > On Tue, May 05, 2020 at 04:44:17PM +0200, Eric Auger wrote: >> We plan to build the tpm2 table on ARM too. In order to reuse the >> generation code, let's move build_tpm2() to aml-build.c. >> >> No change in the implementation. >> >> Signed-off-by: Eric Auger >> --- >> include/hw/acpi/aml-build.h | 2 ++ >> hw/acpi/aml-build.c | 30 ++++++++++++++++++++++++++++++ >> hw/i386/acpi-build.c | 30 ------------------------------ >> 3 files changed, 32 insertions(+), 30 deletions(-) >> >> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h >> index 0f4ed53d7f..a67ab4618a 100644 >> --- a/include/hw/acpi/aml-build.h >> +++ b/include/hw/acpi/aml-build.h >> @@ -437,4 +437,6 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms); >> >> void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f, >> const char *oem_id, const char *oem_table_id); >> + >> +void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog); >> #endif >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 2c3702b882..1f7fd09112 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -26,6 +26,7 @@ >> #include "qemu/bitops.h" >> #include "sysemu/numa.h" >> #include "hw/boards.h" >> +#include "hw/acpi/tpm.h" >> >> static GArray *build_alloc_array(void) >> { >> @@ -1875,6 +1876,35 @@ build_hdr: >> "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id); >> } >> >> +void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) >> +{ >> + Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr); >> + unsigned log_addr_size = sizeof(tpm2_ptr->log_area_start_address); >> + unsigned log_addr_offset = >> + (char *)&tpm2_ptr->log_area_start_address - table_data->data; >> + >> + tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT); >> + if (TPM_IS_TIS_ISA(tpm_find())) { >> + tpm2_ptr->control_area_address = cpu_to_le64(0); >> + tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_MMIO); >> + } else if (TPM_IS_CRB(tpm_find())) { >> + tpm2_ptr->control_area_address = cpu_to_le64(TPM_CRB_ADDR_CTRL); >> + tpm2_ptr->start_method = cpu_to_le32(TPM2_START_METHOD_CRB); >> + } else { >> + g_warn_if_reached(); >> + } >> + >> + tpm2_ptr->log_area_minimum_length = >> + cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE); >> + >> + /* log area start address to be filled by Guest linker */ >> + bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, >> + log_addr_offset, log_addr_size, >> + ACPI_BUILD_TPMLOG_FILE, 0); >> + build_header(linker, table_data, >> + (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); >> +} >> + > > I'll let Igor and mst confirm/deny this, but my understanding was that the > build_append* API was the preferred way to create the table. Indeed, I > don't see too many table.field = cpu_to_le(...) lines in aml-build.c > > I realize this function is just getting moved, but maybe it should get > converted to the build_append* API while being moved? The reason I did not convert is that the struct is as follows struct Acpi20TPM2 { ACPI_TABLE_HEADER_DEF uint16_t platform_class; uint16_t reserved; uint64_t control_area_address; uint32_t start_method; uint8_t start_method_params[12]; uint32_t log_area_minimum_length; uint64_t log_area_start_address; } QEMU_PACKED; If I understand correctly the build_append* adds the fields contiguously. It was not straightforward to me how to skip the start_method_params array. While we are at it the tcpalog arg is not used. Shall I remove it? Thanks Eric > > Thanks, > drew > >