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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 1B41BC2B9F4 for ; Mon, 14 Jun 2021 20:11:59 +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 CF5A361242 for ; Mon, 14 Jun 2021 20:11:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF5A361242 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]:59378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsswA-0004cl-1B for qemu-devel@archiver.kernel.org; Mon, 14 Jun 2021 16:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuJ-0001fD-5S for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuF-0002vk-0A for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623701398; 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=EPKTfv2HqhrWVRWhfR1Uo1UNdb0VcpdNpjLI/wWrdVo=; b=MubBnpHjjwBih/Gm1U/K0LQXk8i8gj8LI9keAIenzam2954i9yRaafXg3zUGxsiK61KFBV +KOQq67xk5hAfb6WO6yYPymc0Iwsgz6yXQtP7Iacb+TQhn/uPGbWxQJ/hjLwe2NwMz1PUv 5T+E52FP4I02XbL82fd2ExgGdhx7s6I= 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-441-rO-8FaL4Mw-xfxC6ware9A-1; Mon, 14 Jun 2021 16:09:57 -0400 X-MC-Unique: rO-8FaL4Mw-xfxC6ware9A-1 Received: by mail-wr1-f72.google.com with SMTP id n4-20020a5d42040000b0290119fef97609so7490694wrq.18 for ; Mon, 14 Jun 2021 13:09:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EPKTfv2HqhrWVRWhfR1Uo1UNdb0VcpdNpjLI/wWrdVo=; b=E8v5PpeG0ydrMxhhEJHKaIZlcgn8YgqUsMpku3z3I+w2Dzx4Fv+DGJ54fUVpFPXHtM 5Pf2y16okCgiy0CkwBVFUhfEdFqjRjQONfhXXpqdS+PZFebNRig1nU/qq6gH3+liX4L6 M2Fmggeyu33ErkOIog5OIGlVqmYwxi5nAb8mTKkjGaBdZ78LDSK+J7yIvO9UMk2IakV4 6caUMR+O3KGiDiNtpgzC6DM/yiGvtefsXchUbsFCslL+YtVWodAxFxbgcIKYiondfYcp J3GcmvHffliWbsmJyuDLPxqPxP7F7EePbmOCRBygYlqWkLlFm+416J1cGRerj32nUVSp yx3w== X-Gm-Message-State: AOAM533ZqtZOYNRV41NeVv1NmtSzLd58gQ0jNt2TEuYn2rJa0S/5JzjT OThpXzg3C1UiKMqBJxR6KowmQTzGDEcWvSB+//Mr+oZCdWVNa+mYRTQLd2cuav6MdDo8B8jGcz7 HHuUcvALWtPfpT70/GnYwzVKSZlGM2c/89I4/EgTsvmwnS5/fiFbUQQnKsh95WK9R X-Received: by 2002:a05:600c:154:: with SMTP id w20mr19010088wmm.185.1623701395864; Mon, 14 Jun 2021 13:09:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKrtErV8vdKFyKmCoLXADeqaBrA3K+NaN7fHpr2QZqO+iHRt2YFsbePDqVXE5fGAiZ4mv/tA== X-Received: by 2002:a05:600c:154:: with SMTP id w20mr19010065wmm.185.1623701395709; Mon, 14 Jun 2021 13:09:55 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id 2sm16640398wrz.87.2021.06.14.13.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 13:09:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] acpi: Eliminate all TPM related code if CONFIG_TPM is not set Date: Mon, 14 Jun 2021 22:09:38 +0200 Message-Id: <20210614200940.2056770-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210614200940.2056770-1-philmd@redhat.com> References: <20210614200940.2056770-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger , Markus Armbruster , qemu-arm@nongnu.org, Igor Mammedov , Eric Blake , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Stefan Berger Cc: M: Michael S. Tsirkin Cc: Igor Mammedov Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20210614191335.1968807-4-stefanb@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/acpi/tpm.h | 4 ++++ hw/acpi/aml-build.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 1a2a57a21f0..559ba6906c8 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -21,6 +21,8 @@ #include "hw/acpi/aml-build.h" #include "sysemu/tpm.h" +#ifdef CONFIG_TPM + #define TPM_TIS_ADDR_BASE 0xFED40000 #define TPM_TIS_ADDR_SIZE 0x5000 @@ -209,4 +211,6 @@ REG32(CRB_DATA_BUFFER, 0x80) void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev); +#endif /* CONFIG_TPM */ + #endif /* HW_ACPI_TPM_H */ diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index f0035d2b4a1..d5103e6d7b0 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -2044,6 +2044,7 @@ build_hdr: "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id); } +#ifdef CONFIG_TPM /* * build_tpm2 - Build the TPM2 table as specified in * table 7: TCG Hardware Interface Description Table Format for TPM 2.0 @@ -2101,6 +2102,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, (void *)(table_data->data + tpm2_start), "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_table_id); } +#endif Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_offset, uint32_t mmio32_offset, uint64_t mmio64_offset, -- 2.31.1