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 D1C58C433DF for ; Wed, 10 Jun 2020 16:16:15 +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 9CC272067B for ; Wed, 10 Jun 2020 16:16:15 +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="NNP4xxFz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CC272067B 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]:38484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj3Og-0004ip-TB for qemu-devel@archiver.kernel.org; Wed, 10 Jun 2020 12:16:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj3Nt-00043J-FS for qemu-devel@nongnu.org; Wed, 10 Jun 2020 12:15:25 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:31006 helo=us-smtp-delivery-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 1jj3Nr-0002D1-Mz for qemu-devel@nongnu.org; Wed, 10 Jun 2020 12:15:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591805721; 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=HMx5xu9NgEMjj8Q6zdThtcbjandUaDRNB4HsTwoXJBg=; b=NNP4xxFzk0l78GJFBJdOs8mhEmzEOcI0/rk7hTGXDOQl1zunGPk1w9sEeVkvCLTq8LO3O+ lEelgh5ailEeODyHblrYT+3S8qAQb1HBHefhxI+4kkBU361SA64wbsHiTdyiJTBXgNkSAB NWlqCMUHG0Vji6DMWDWPOBj7X1roHUQ= 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-341-MEV9RFb3M0evtdHSM6eipA-1; Wed, 10 Jun 2020 12:15:18 -0400 X-MC-Unique: MEV9RFb3M0evtdHSM6eipA-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 764F21005513; Wed, 10 Jun 2020 16:15:16 +0000 (UTC) Received: from [10.36.114.197] (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5EA4719C71; Wed, 10 Jun 2020 16:15:09 +0000 (UTC) Subject: Re: [PATCH v3 1/4] acpi: Convert build_tpm2() to build_append* API To: Igor Mammedov References: <20200601095737.32671-1-eric.auger@redhat.com> <20200601095737.32671-2-eric.auger@redhat.com> <20200605162357.407dff93@redhat.com> From: Auger Eric Message-ID: <683abdd1-0112-d76c-5ccf-85236ff13e0a@redhat.com> Date: Wed, 10 Jun 2020 18:15:07 +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: <20200605162357.407dff93@redhat.com> Content-Language: en-US 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: 7bit Received-SPF: pass client-ip=207.211.31.81; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/09 23:22:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=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, drjones@redhat.com, philmd@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, marcandre.lureau@redhat.com, eric.auger.pro@gmail.com, lersek@redhat.com, ardb@kernel.org, stefanb@linux.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Igor, On 6/5/20 4:23 PM, Igor Mammedov wrote: > On Mon, 1 Jun 2020 11:57:34 +0200 > Eric Auger wrote: > >> In preparation of its move to the generic acpi code, >> let's convert build_tpm2() to use build_append API. This >> latter now is prefered in place of direct ACPI struct field >> settings with manual endianness conversion. >> >> Signed-off-by: Eric Auger >> --- >> hw/i386/acpi-build.c | 28 +++++++++++++++++++--------- >> 1 file changed, 19 insertions(+), 9 deletions(-) >> >> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c >> index b5669d6c65..f0d35d7b17 100644 >> --- a/hw/i386/acpi-build.c >> +++ b/hw/i386/acpi-build.c >> @@ -2298,30 +2298,40 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) >> static void >> build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) >> { >> - Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof *tpm2_ptr); >> + Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader)); > >> 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; > > Is this the reason why you've kept Acpi20TPM2 around? Yes it is > > >> + uint8_t start_method_params[12] = {}; >> >> - tpm2_ptr->platform_class = cpu_to_le16(TPM2_ACPI_CLASS_CLIENT); >> + /* platform class */ > pls verbatim filed names from spec in comments Do you want "Platform Class" instead? > >> + build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2); >> + /* reserved */ >> + build_append_int_noprefix(table_data, 0, 2); >> 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); >> + /* address of control area */ >> + build_append_int_noprefix(table_data, 0, 8); >> + /* start method */ >> + build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4); >> } 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); > > missing field name comments OK > >> + build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8); >> + build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4); >> } else { >> g_warn_if_reached(); >> } > > considering fields are the same I'd also restructure above as > if () { > control_area_address = > start_method = > ... > } > /* address of control area */ > build_append_int_noprefix(table_data, control_area_address, 8); > /* start method */ > build_append_int_noprefix(table_data, start_method, 4); > > which is bit easier to read OK > >> >> - tpm2_ptr->log_area_minimum_length = >> - cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE); >> + /* platform specific parameters */ >> + g_array_append_vals(table_data, &start_method_params, 12); >> >> - acpi_data_push(tcpalog, le32_to_cpu(tpm2_ptr->log_area_minimum_length)); >> + /* log area minimum length */ >> + build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4); >> + >> + acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE); >> bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1, >> false); > > I suggest to drop Acpi20TPM2 with pointer math above and use approach similar > to build_ghes_v2/address_offset, i.e. get actual offest here: > > log_addr_offset = table_data->len yes, that's simpler. Thank you for the suggestion. > > and s/log_addr_size/8/ OK Thanks Eric > >> /* log area start address to be filled by Guest linker */ >> + build_append_int_noprefix(table_data, 0, 8); >> bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, >> log_addr_offset, log_addr_size, >> ACPI_BUILD_TPMLOG_FILE, 0); >