From patchwork Wed Jun 10 04:27:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11596907 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84464912 for ; Wed, 10 Jun 2020 04:39:13 +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 58F7520734 for ; Wed, 10 Jun 2020 04:39:13 +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="bLs362LT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58F7520734 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:45598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jisW8-00079Z-I1 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Jun 2020 00:39:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jisKS-0007KU-Im for qemu-devel@nongnu.org; Wed, 10 Jun 2020 00:27:08 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:28354 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 1jisKR-0008Ec-MP for qemu-devel@nongnu.org; Wed, 10 Jun 2020 00:27:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591763227; 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=LZsBbdZ3FM++Eh4KOihw4hI5M2LDwhoU63KzZvHgyWU=; b=bLs362LT8QD60/jeiLF4YsOwrAUUgnYRSsvb+5RKhNC0V/kTWX/W3SdmSuASajNwx2tvfR OQmWUQW9iIOhL0jJFSrUZpDiHZLq1ta3gkwaoDbX7EJGtfzq+y7Ki/ILXQI+f7bFNm+p+N 0Kqco+XmQLAD6AoPZv0KykLPcxAJQYI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-wXnXX5GTOr-vHV6zYZknaA-1; Wed, 10 Jun 2020 00:27:05 -0400 X-MC-Unique: wXnXX5GTOr-vHV6zYZknaA-1 Received: by mail-wr1-f72.google.com with SMTP id c14so504341wrw.11 for ; Tue, 09 Jun 2020 21:27:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=LZsBbdZ3FM++Eh4KOihw4hI5M2LDwhoU63KzZvHgyWU=; b=LCDWrCGlHySUk3RZpnpa1JXzlHQsztFPvza0Gnwo8cg9NM6oPzQrQkk5ClcT0iNoay jnO1IWv1wvTGY0/HEn1MBSYQhXP40pBdMvRHftRDg6XAj3yGSGeIyyH/9XydAylSKVdQ HH2GSzf9eAETAaOYn1Q/VX9Gs42IJEQ9k3Y9VnggA35KTDNdMcGvCFKJTzRVxCwN9e8n fOeg3EeZBEQB7LBDTvGuyCC3Ty4y3/xw/BQffqpKrDbg3T4+0YZ/gy9yePgpPM4W39Uu hZ9d8ZcPznaobgwM6PNyCGGi/pjtTMww8eLO9GnXCHku6Q893Jn+DqTPvFgbE61qcqsQ tQ/w== X-Gm-Message-State: AOAM531T62D5p6irzw+zqHnlpUg9uV6foXz+tg747lL6WL4lrQHrbANO KI7/U2YkcuW5H48SkKNg8nsBFYsVjb1Pl5Thrf2lI6Gank6AwuklULL73/01nEUk8fc1aQwp92v nkYA7mZIQ5aQvCgo= X-Received: by 2002:adf:e387:: with SMTP id e7mr1320064wrm.70.1591763223864; Tue, 09 Jun 2020 21:27:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwN3OQLTmoCj7469kCJ6NlVsN74wBZU6qPYkLYAGak4rJBjZ6jiAWsZViN775gAhJJOuMfs0w== X-Received: by 2002:adf:e387:: with SMTP id e7mr1320047wrm.70.1591763223714; Tue, 09 Jun 2020 21:27:03 -0700 (PDT) Received: from redhat.com (bzq-79-181-55-232.red.bezeqint.net. [79.181.55.232]) by smtp.gmail.com with ESMTPSA id c6sm5153038wma.15.2020.06.09.21.27.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 21:27:03 -0700 (PDT) Date: Wed, 10 Jun 2020 00:27:01 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 13/56] acpi: tpm: Do not build TCPA table for TPM 2 Message-ID: <20200610042613.1459309-14-mst@redhat.com> References: <20200610042613.1459309-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200610042613.1459309-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.81; envelope-from=mst@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 , Eduardo Habkost , =?utf-8?q?Marc-Andr=C3=A9?= Lureau , Eric Auger , Paolo Bonzini , Igor Mammedov , Richard Henderson , Stefan Berger Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Stefan Berger Do not build a TCPA table for TPM 2 anymore but create the log area when building the TPM2 table. The TCPA table is only needed for TPM 1.2. Signed-off-by: Stefan Berger Reviewed-by: Marc-André Lureau Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Signed-off-by: Michael S. Tsirkin Reviewed-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 58fe505fb6..d05d010f77 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2216,6 +2216,10 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr->log_area_minimum_length = cpu_to_le32(TPM_LOG_AREA_MINIMUM_SIZE); + acpi_data_push(tcpalog, le32_to_cpu(tpm2_ptr->log_area_minimum_length)); + bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1, + false); + /* 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, @@ -2752,10 +2756,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) build_hpet(tables_blob, tables->linker); } if (misc.tpm_version != TPM_VERSION_UNSPEC) { - acpi_add_table(table_offsets, tables_blob); - build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog); - - if (misc.tpm_version == TPM_VERSION_2_0) { + if (misc.tpm_version == TPM_VERSION_1_2) { + acpi_add_table(table_offsets, tables_blob); + build_tpm_tcpa(tables_blob, tables->linker, tables->tcpalog); + } else { /* TPM_VERSION_2_0 */ acpi_add_table(table_offsets, tables_blob); build_tpm2(tables_blob, tables->linker, tables->tcpalog); }