From nobody Thu May 2 09:31:34 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623701532501608.2269338705303; Mon, 14 Jun 2021 13:12:12 -0700 (PDT) Received: from localhost ([::1]:58498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsswN-0003yb-BJ for importer2@patchew.org; Mon, 14 Jun 2021 16:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuB-0001DX-Lu for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:09:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssu6-0002qO-Iy for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:09:55 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-xruvtWnZPf-8asRLiLHtMQ-1; Mon, 14 Jun 2021 16:09:48 -0400 Received: by mail-wr1-f70.google.com with SMTP id g14-20020a5d698e0000b0290117735bd4d3so7437870wru.13 for ; Mon, 14 Jun 2021 13:09:48 -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 r1sm3338409wmh.32.2021.06.14.13.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 13:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623701389; 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=40vzgrQVAoTrypUvftjd8gyH06NkxRrNl5FBl3A4XCw=; b=ChoRbvTw9u2argTjh7r1C4a8yxdqZ4Lmfj1cY1QwissBA6+i01D3WdL/JgnitjvbCfGunB WdkHTQziFvJhDiy4rYxV21WlRFDkEG35ckxjNrbBtaC3KITiTs3sMudCHq3kLrzrXZZObC rD472ybm/FSfiMJg0aC5t8eHvgUqmx8= X-MC-Unique: xruvtWnZPf-8asRLiLHtMQ-1 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=40vzgrQVAoTrypUvftjd8gyH06NkxRrNl5FBl3A4XCw=; b=HoLpoyDtcs+4Y6i5fschnQSCCYtJY9m54y0hgKLxwt+5KyEk7ckxOdyuTUIlY75BCF Al9gAg276H8t2I5BI+DrtNdJLnb3p3JFjOKTg1+NICc0tiL5TPyANLR6qd5FxE9TZqzl 6JkYXdjkgXs/1qq6GhlfdqmhiVZcGJm5LzXuczbfOnQs/m24N9GU/wb5UduSA8m0SdOw lGbE1gHiUXnvb8ygO6EtYjz/rBd7DH2qQgVnPB06WQHdfnHc9r+jAdSmX5smOB4rjyjm WD4ZHIPt2XZLonv9S9xm4BtveBtvSpu89MGMtYrLwONy8NgWDvVwG6IvQNMtKrgDvyis BcMQ== X-Gm-Message-State: AOAM532Lq5ouXhfrJzr1lnOS525YGjJ6UJ+T23JyYQzPQI84CdWBoTTt 7mMbXRRXwvjBti4DJHn5B3Osj7BhWnQ3stnpr7EujIf+MXyQefsLcECqqwK8GjHhsdXQm+vTgr3 8Q+B8o2GBBPGGZ+Q9nqWuDaPv19gN6YevxZoFUcq5/Y9zlRlhiC7R73Lcer4zvV0d X-Received: by 2002:a05:600c:5112:: with SMTP id o18mr17697365wms.15.1623701386798; Mon, 14 Jun 2021 13:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx73L90UH77xCEhpE85hSS1DheGNL00NdYYVBu3XttGgizFFeM7Sf2ru0z39vRAsn/ON3i+4g== X-Received: by 2002:a05:600c:5112:: with SMTP id o18mr17697335wms.15.1623701386557; Mon, 14 Jun 2021 13:09:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] i386: Eliminate all TPM related code if CONFIG_TPM is not set Date: Mon, 14 Jun 2021 22:09:36 +0200 Message-Id: <20210614200940.2056770-2-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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Berger Cc: Michael S. Tsirkin Cc: Igor Mammedov Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210614191335.1968807-2-stefanb@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/acpi-build.c | 20 ++++++++++++++++++++ stubs/tpm.c | 4 ---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 80bee00da66..796ffc6f5c4 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -107,7 +107,9 @@ typedef struct AcpiPmInfo { typedef struct AcpiMiscInfo { bool is_piix4; bool has_hpet; +#ifdef CONFIG_TPM TPMVersion tpm_version; +#endif const unsigned char *dsdt_code; unsigned dsdt_size; uint16_t pvpanic_port; @@ -286,7 +288,9 @@ static void acpi_get_misc_info(AcpiMiscInfo *info) } =20 info->has_hpet =3D hpet_find(); +#ifdef CONFIG_TPM info->tpm_version =3D tpm_get_version(tpm_find()); +#endif info->pvpanic_port =3D pvpanic_port(); info->applesmc_io_base =3D applesmc_port(); } @@ -1371,7 +1375,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, uint32_t nr_mem =3D machine->ram_slots; int root_bus_limit =3D 0xFF; PCIBus *bus =3D NULL; +#ifdef CONFIG_TPM TPMIf *tpm =3D tpm_find(); +#endif int i; VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); =20 @@ -1604,10 +1610,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, } } =20 +#ifdef CONFIG_TPM if (TPM_IS_TIS_ISA(tpm_find())) { aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); } +#endif aml_append(scope, aml_name_decl("_CRS", crs)); =20 /* reserve GPE0 block resources */ @@ -1753,6 +1761,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, /* Scan all PCI buses. Generate tables to support hotplug. */ build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); =20 +#ifdef CONFIG_TPM if (TPM_IS_TIS_ISA(tpm)) { if (misc->tpm_version =3D=3D TPM_VERSION_2_0) { dev =3D aml_device("TPM"); @@ -1780,11 +1789,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, =20 aml_append(scope, dev); } +#endif =20 aml_append(sb_scope, scope); } } =20 +#ifdef CONFIG_TPM if (TPM_IS_CRB(tpm)) { dev =3D aml_device("TPM"); aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101"))); @@ -1799,6 +1810,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, =20 aml_append(sb_scope, dev); } +#endif =20 aml_append(dsdt, sb_scope); =20 @@ -1828,6 +1840,7 @@ build_hpet(GArray *table_data, BIOSLinker *linker, co= nst char *oem_id, "HPET", sizeof(*hpet), 1, oem_id, oem_table_id); } =20 +#ifdef CONFIG_TPM static void build_tpm_tcpa(GArray *table_data, BIOSLinker *linker, GArray *tcpalog, const char *oem_id, const char *oem_table_id) @@ -1854,6 +1867,7 @@ build_tpm_tcpa(GArray *table_data, BIOSLinker *linker= , GArray *tcpalog, (void *)(table_data->data + tcpa_start), "TCPA", sizeof(*tcpa), 2, oem_id, oem_table_id); } +#endif =20 #define HOLE_640K_START (640 * KiB) #define HOLE_640K_END (1 * MiB) @@ -2403,6 +2417,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) build_hpet(tables_blob, tables->linker, x86ms->oem_id, x86ms->oem_table_id); } +#ifdef CONFIG_TPM if (misc.tpm_version !=3D TPM_VERSION_UNSPEC) { if (misc.tpm_version =3D=3D TPM_VERSION_1_2) { acpi_add_table(table_offsets, tables_blob); @@ -2414,6 +2429,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState= *machine) x86ms->oem_id, x86ms->oem_table_id); } } +#endif if (pcms->numa_nodes) { acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, machine); @@ -2605,8 +2621,10 @@ void acpi_setup(void) AcpiBuildTables tables; AcpiBuildState *build_state; Object *vmgenid_dev; +#ifdef CONFIG_TPM TPMIf *tpm; static FwCfgTPMConfig tpm_config; +#endif =20 if (!x86ms->fw_cfg) { ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); @@ -2638,6 +2656,7 @@ void acpi_setup(void) acpi_add_rom_blob(acpi_build_update, build_state, tables.linker->cmd_blob, ACPI_BUILD_LOADER_FILE); =20 +#ifdef CONFIG_TPM fw_cfg_add_file(x86ms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data, acpi_data_len(tables.tcpalog)); =20 @@ -2651,6 +2670,7 @@ void acpi_setup(void) fw_cfg_add_file(x86ms->fw_cfg, "etc/tpm/config", &tpm_config, sizeof tpm_config); } +#endif =20 vmgenid_dev =3D find_vmgenid_dev(); if (vmgenid_dev) { diff --git a/stubs/tpm.c b/stubs/tpm.c index 9bded191d9d..22014595a06 100644 --- a/stubs/tpm.c +++ b/stubs/tpm.c @@ -33,7 +33,3 @@ TpmModelList *qmp_query_tpm_models(Error **errp) { return NULL; } - -void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev) -{ -} --=20 2.31.1 From nobody Thu May 2 09:31:34 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623701693579369.16170577194487; Mon, 14 Jun 2021 13:14:53 -0700 (PDT) Received: from localhost ([::1]:39458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lssyy-0001tN-Ea for importer2@patchew.org; Mon, 14 Jun 2021 16:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuF-0001QJ-6j for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:09:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuD-0002vN-Gv for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:09:58 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-FtXvlo9VM5-W8c_VAJ9TAQ-1; Mon, 14 Jun 2021 16:09:53 -0400 Received: by mail-wr1-f69.google.com with SMTP id d9-20020adffbc90000b029011a3b249b10so4253250wrs.3 for ; Mon, 14 Jun 2021 13:09:52 -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 c2sm374340wmf.24.2021.06.14.13.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 13:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623701396; 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=1/ujT/H+jsCDhMHDnxsFjIbcqBjOv5SGrl9Ow17b7os=; b=Vp+QDDfOGQOsb0RPudx3D5uk7Tfi3DfZt9tUGikjRH6cffMrLPNibBOpEesZviPyrNVPsj FqsGX0wyGTuWdEaIAxjCDfRrb5yEpDwfgZYMjSOKLn0VSs0z3KgDvbCBxQjf4VL1NdSta4 dPMWJV27A14YDrsYI+CjXVnLRYCrrnQ= X-MC-Unique: FtXvlo9VM5-W8c_VAJ9TAQ-1 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=1/ujT/H+jsCDhMHDnxsFjIbcqBjOv5SGrl9Ow17b7os=; b=WeQOx8oCJJCTUl+loJXojGoBr1COiagJdrb9i6Q6ey7Jss1qH4ddeF6YebOecEtGEY Gb4nRNuOQI0n5tJ/KYrif6fQW45+VSS4LJsfFn6+hf5SYQi4pIQ7l6nYcrPoWCCdTvK7 kbq54rdNonlepqTdEn+oYuemI9jkJHF1+b4Zs0IxB2V2Xzzo1HuSPoHt8EOak2HDWYdt m+Kyx/CRYY3fckG6PN9Lf0Rj0PucpxM60nBv+BLOv60u3eoWlCbo6Ua4LMPAZAdYcW+V 1zNZZZWpfSeqLQdUgI2fq1OmZt/LXy55iiNtq3H7i23X/VuCYtUvCiDBQjVho76UkrT5 EyzQ== X-Gm-Message-State: AOAM5307RK9Q+vZ/p9FBe7iKs98BCi5V0rbpnPC/S1Hj2oy3H+1eVd8g h50FaL11yXi/2xareLDwj1aj1hySNwNa3oL3yEn6HL+hET4AOPFFdCPhqGc7yk35Vv61olThDIm xX4YmD9hPfrIsRdqyOU0zw7yYveLVP+uotlLZz3k8+3ntntnbPzVVi9Fx239Ts84y X-Received: by 2002:a1c:4c04:: with SMTP id z4mr18165471wmf.47.1623701391465; Mon, 14 Jun 2021 13:09:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc0OK4e/o5tkKqjb26qF5CV6tiiR98I5yq3UvpGXUN0QuTe9ceqhq3BJEAP5bjrVLnvTiVfg== X-Received: by 2002:a1c:4c04:: with SMTP id z4mr18165439wmf.47.1623701391214; Mon, 14 Jun 2021 13:09:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] arm: Eliminate all TPM related code if CONFIG_TPM is not set Date: Mon, 14 Jun 2021 22:09:37 +0200 Message-Id: <20210614200940.2056770-3-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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Berger Peter Maydell Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210614191335.1968807-3-stefanb@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/sysbus-fdt.c | 4 ++++ hw/arm/virt-acpi-build.c | 6 ++++++ hw/arm/virt.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 6b6906f4cfc..48c5fe9bf18 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -437,6 +437,7 @@ static bool vfio_platform_match(SysBusDevice *sbdev, =20 #endif /* CONFIG_LINUX */ =20 +#ifdef CONFIG_TPM /* * add_tpm_tis_fdt_node: Create a DT node for TPM TIS * @@ -467,6 +468,7 @@ static int add_tpm_tis_fdt_node(SysBusDevice *sbdev, vo= id *opaque) g_free(nodename); return 0; } +#endif =20 static int no_fdt_node(SysBusDevice *sbdev, void *opaque) { @@ -488,7 +490,9 @@ static const BindingEntry bindings[] =3D { TYPE_BINDING(TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node), VFIO_PLATFORM_BINDING("amd,xgbe-seattle-v1a", add_amd_xgbe_fdt_node), #endif +#ifdef CONFIG_TPM TYPE_BINDING(TYPE_TPM_TIS_SYSBUS, add_tpm_tis_fdt_node), +#endif TYPE_BINDING(TYPE_RAMFB_DEVICE, no_fdt_node), TYPE_BINDING("", NULL), /* last element */ }; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 60fe2e65a76..f1024843ddb 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -205,6 +205,7 @@ static void acpi_dsdt_add_gpio(Aml *scope, const MemMap= Entry *gpio_memmap, aml_append(scope, dev); } =20 +#ifdef CONFIG_TPM static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) { PlatformBusDevice *pbus =3D PLATFORM_BUS_DEVICE(vms->platform_bus_dev); @@ -236,6 +237,7 @@ static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineSt= ate *vms) aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(scope, dev); } +#endif =20 static void build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) @@ -642,7 +644,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) } =20 acpi_dsdt_add_power_button(scope); +#ifdef CONFIG_TPM acpi_dsdt_add_tpm(scope, vms); +#endif =20 aml_append(dsdt, scope); =20 @@ -745,11 +749,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuild= Tables *tables) build_iort(tables_blob, tables->linker, vms); } =20 +#ifdef CONFIG_TPM if (tpm_get_version(tpm_find()) =3D=3D TPM_VERSION_2_0) { acpi_add_table(table_offsets, tables_blob); build_tpm2(tables_blob, tables->linker, tables->tcpalog, vms->oem_= id, vms->oem_table_id); } +#endif =20 /* XSDT is pointed to by RSDP */ xsdt =3D tables_blob->len; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 840758666d4..9122e22ee0c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2599,7 +2599,9 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_PLATFORM); +#ifdef CONFIG_TPM machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); +#endif mc->block_default_type =3D IF_VIRTIO; mc->no_cdrom =3D 1; mc->pci_allow_0_address =3D true; --=20 2.31.1 From nobody Thu May 2 09:31:34 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623701561469432.25535529163756; Mon, 14 Jun 2021 13:12:41 -0700 (PDT) Received: from localhost ([::1]:59378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsswq-0004cl-CA for importer2@patchew.org; Mon, 14 Jun 2021 16:12:40 -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 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 Received: by mail-wr1-f72.google.com with SMTP id n4-20020a5d42040000b0290119fef97609so7490694wrq.18 for ; Mon, 14 Jun 2021 13:09:57 -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) 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= X-MC-Unique: rO-8FaL4Mw-xfxC6ware9A-1 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) 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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Berger Cc: M: Michael S. Tsirkin Cc: Igor Mammedov Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210614191335.1968807-4-stefanb@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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" =20 +#ifdef CONFIG_TPM + #define TPM_TIS_ADDR_BASE 0xFED40000 #define TPM_TIS_ADDR_SIZE 0x5000 =20 @@ -209,4 +211,6 @@ REG32(CRB_DATA_BUFFER, 0x80) =20 void tpm_build_ppi_acpi(TPMIf *tpm, Aml *dev); =20 +#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); } =20 +#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 *linke= r, GArray *tcpalog, (void *)(table_data->data + tpm2_start), "TPM2", table_data->len - tpm2_start, 4, oem_id, oem_tabl= e_id); } +#endif =20 Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_off= set, uint32_t mmio32_offset, uint64_t mmio64_offset, --=20 2.31.1 From nobody Thu May 2 09:31:34 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623701701043247.04646337894997; Mon, 14 Jun 2021 13:15:01 -0700 (PDT) Received: from localhost ([::1]:40408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lssz6-0002Xi-2M for importer2@patchew.org; Mon, 14 Jun 2021 16:15:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuN-0001t0-86 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuL-0002zh-Fo for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:06 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-pFWUcieSO_evQkn3roirbA-1; Mon, 14 Jun 2021 16:10:01 -0400 Received: by mail-wm1-f70.google.com with SMTP id u17-20020a05600c19d1b02901af4c4deac5so437008wmq.7 for ; Mon, 14 Jun 2021 13:10:01 -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 l10sm16558905wrs.11.2021.06.14.13.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 13:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623701404; 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=3hIM4nZ+edtMSEGqYdtBltxWEdrhiKauaGSD/ANl7HE=; b=gJhfkASrvedP/Vvw+LZZDhn/V2UkLAyMQ9R6ZZf4x/YV+d0DWedrqSULFq7vpHBS5ivjuh mUR3WVDaAk4lHrs35zdMxdCS4UdpVdeR0RjOGCv+x8l4GQ7tB8Y4Zw3MEIyDB5WPFCEygw 53Jz/DUlWZgtrAgiKpc1mzKMm5YJnUA= X-MC-Unique: pFWUcieSO_evQkn3roirbA-1 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=3hIM4nZ+edtMSEGqYdtBltxWEdrhiKauaGSD/ANl7HE=; b=sVlY7xtNSjP4adc+HzwfAHDTDMQFwwTpfcuUOcobqlUwA/2UXon/+Ul+J0n5lQYaa1 lMT6QFtQ4fucGQGhceWQOFOJUgMd7PgesJA5cg35CEmKsPdYL7vMeq/j8qYyC/Xov0O1 O5xGBr341NTpNp4RMb9jvEB773dRdyOdb2uaUs3ED6bkis8bc32D+j8nNC1hZPMSRw6j ddRnsjBtMDoEP5C3PqTWzJqmw2A3wo3WmVzz3bNiUn8DqGxyM109hGoFclTJtNmPqmmS 5JT2+fHrEG0wl/BOe2zvc8527M84x5xhOTcJqCYDVA4hpjB/cIagGUc4UTD3rgU0ulvF TqqQ== X-Gm-Message-State: AOAM533RvZkrWdiwrkx2oAKxHuDu1F05Of+F7dNPHJVbID4EHksjrpqM GVZHdABBLAniNU0scPOd134n5DWYy1ZMOwyuOKmBL7ExABUjDsczYKQRf5lbyi+IlubLWKwQscW /8XXI/yBr7X1R8no6Ym8BOAjvNXP9DTzwNpKDDmiujABvbZ+xMvDe36oU4WaUPvl4 X-Received: by 2002:a7b:c20b:: with SMTP id x11mr908285wmi.9.1623701400340; Mon, 14 Jun 2021 13:10:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaznMWFe5kkp1meQldQFacYfdH9YXNqNYunC1G3Aov7zVvcIVEXU8ceZduYpB9ckQkbChHjg== X-Received: by 2002:a7b:c20b:: with SMTP id x11mr908261wmi.9.1623701400118; Mon, 14 Jun 2021 13:10:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] sysemu: Make TPM structures inaccessible if CONFIG_TPM is not defined Date: Mon, 14 Jun 2021 22:09:39 +0200 Message-Id: <20210614200940.2056770-5-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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Berger Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210614191335.1968807-5-stefanb@linux.ibm.com> [PMD: Remove tpm_init() / tpm_cleanup() stubs] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/tpm.h | 9 +++++++++ include/sysemu/tpm_backend.h | 6 +++++- stubs/tpm.c | 10 ---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index 1a85564e479..68b2206463c 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -15,6 +15,8 @@ #include "qapi/qapi-types-tpm.h" #include "qom/object.h" =20 +#ifdef CONFIG_TPM + int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_init(void); void tpm_cleanup(void); @@ -73,4 +75,11 @@ static inline TPMVersion tpm_get_version(TPMIf *ti) return TPM_IF_GET_CLASS(ti)->get_version(ti); } =20 +#else /* CONFIG_TPM */ + +#define tpm_init() (0) +#define tpm_cleanup() + +#endif /* CONFIG_TPM */ + #endif /* QEMU_TPM_H */ diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 6f078f5f482..8fd3269c117 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -18,6 +18,8 @@ #include "sysemu/tpm.h" #include "qapi/error.h" =20 +#ifdef CONFIG_TPM + #define TYPE_TPM_BACKEND "tpm-backend" OBJECT_DECLARE_TYPE(TPMBackend, TPMBackendClass, TPM_BACKEND) @@ -209,4 +211,6 @@ TPMInfo *tpm_backend_query_tpm(TPMBackend *s); =20 TPMBackend *qemu_find_tpm_be(const char *id); =20 -#endif +#endif /* CONFIG_TPM */ + +#endif /* TPM_BACKEND_H */ diff --git a/stubs/tpm.c b/stubs/tpm.c index 22014595a06..e79bd2a6c2d 100644 --- a/stubs/tpm.c +++ b/stubs/tpm.c @@ -7,18 +7,8 @@ =20 #include "qemu/osdep.h" #include "qapi/qapi-commands-tpm.h" -#include "sysemu/tpm.h" #include "hw/acpi/tpm.h" =20 -int tpm_init(void) -{ - return 0; -} - -void tpm_cleanup(void) -{ -} - TPMInfoList *qmp_query_tpm(Error **errp) { return NULL; --=20 2.31.1 From nobody Thu May 2 09:31:34 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623701833715955.2047885266096; Mon, 14 Jun 2021 13:17:13 -0700 (PDT) Received: from localhost ([::1]:45792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lst1E-0006Dr-P7 for importer2@patchew.org; Mon, 14 Jun 2021 16:17:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuR-00023v-0g for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lssuO-00031X-3X for qemu-devel@nongnu.org; Mon, 14 Jun 2021 16:10:10 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-259-IQhJ5XHuMw2vHtkbeTWJiQ-1; Mon, 14 Jun 2021 16:10:06 -0400 Received: by mail-wr1-f71.google.com with SMTP id x9-20020adfffc90000b02901178add5f60so7553622wrs.5 for ; Mon, 14 Jun 2021 13:10:06 -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 r3sm13478975wmq.8.2021.06.14.13.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 13:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623701407; 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=983yM9Ivhh0Jdv/knxi7k66F6inZsKoawfPPt/Wd0Sg=; b=Mg3IeQjAaEXNt6AIoRDocbPVsfKBXifJ8l7nsYkHcm/QaQRkgnYHWDsQGP5NV4YIaj1jOH hvulwSzEEb5QJ4Gdki7CQoF8caq5ytVbDZ3qgHYkMMlq5MGAVLekvL1QqYhopBjbVkOuzi FzEhIgHPh4QKDIlKIS9L9w9ADMe03wo= X-MC-Unique: IQhJ5XHuMw2vHtkbeTWJiQ-1 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=983yM9Ivhh0Jdv/knxi7k66F6inZsKoawfPPt/Wd0Sg=; b=JSP6fRNqqB46mJi3rsrjIEd8NXnn8/CYcZarCpEuW0HFneYoYo5/qG3atJD3SNBPj8 6dA0VDvKA4Ha9ntyVRzNx0b1DYSTRWG89V3Y+791LSiarS7BM6QU6lonW4uXBNp0p9LV 0iP/ZkG91PQXw5FwkbNZYfHRf8Wz4JiGraFfoxJyYHWro8Z+HyUkUTw+jKuS6OjZ68SG AqpP6O76TNy4STVKxKTsbHlgCSY+xaDvfvisBycTamEyEgUTBkPU7lT+o274WFZEhSlI ApLtpJD/BaN2TA8HFRRd/sREkJcQlSzPm9OI7Kz409QkvmBHs7ezBE+01GWR6h9vkeF5 sLXw== X-Gm-Message-State: AOAM532jaczeSZvZzRpMJTiGZVl10rW/eP2XCJwH2HvuGpCaGcqB/snZ IlCUgq/3HQaU/UUR6NpmGvjNqewgL4WIu+GlBpVPSOOPCg4NLz4mB0QEz0YAwO3vXu/EGKibYWK F5o0jzapZSjukgvU1f06lcra9ol+OSzNaHH1e5D1yGzvrWe6GgiogZp53KncyGe0t X-Received: by 2002:a05:600c:214c:: with SMTP id v12mr7749wml.33.1623701404897; Mon, 14 Jun 2021 13:10:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0PdR37Rt3bX/goJSOjRFbJug4PyP9k9icobUOSZ8HNzsU1MSjrwbTby5svQuPLqfFl9maaA== X-Received: by 2002:a05:600c:214c:: with SMTP id v12mr7711wml.33.1623701404620; Mon, 14 Jun 2021 13:10:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] tpm: Return QMP error when TPM is disabled in build Date: Mon, 14 Jun 2021 22:09:40 +0200 Message-Id: <20210614200940.2056770-6-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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Eric Blake Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When the management layer queries a binary built using --disable-tpm for TPM devices, it gets confused by getting empty responses: { "execute": "query-tpm" } { "return": [ ] } { "execute": "query-tpm-types" } { "return": [ ] } { "execute": "query-tpm-models" } { "return": [ ] } To make it clearer by returning an error: - Make the TPM QAPI schema conditional - Adapt the HMP command - Remove stubs which became unnecessary The management layer now gets a 'CommandNotFound' error: { "execute": "query-tpm" } { "error": { "class": "CommandNotFound", "desc": "The command query-tpm has not been found" } } Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- qapi/tpm.json | 28 +++++++++++++++++++--------- monitor/hmp-cmds.c | 4 ++++ stubs/tpm.c | 25 ------------------------- stubs/meson.build | 1 - 4 files changed, 23 insertions(+), 35 deletions(-) delete mode 100644 stubs/tpm.c diff --git a/qapi/tpm.json b/qapi/tpm.json index 6a10c9ed8d2..75590979fde 100644 --- a/qapi/tpm.json +++ b/qapi/tpm.json @@ -17,7 +17,9 @@ # # Since: 1.5 ## -{ 'enum': 'TpmModel', 'data': [ 'tpm-tis', 'tpm-crb', 'tpm-spapr' ] } +{ 'enum': 'TpmModel', 'data': [ 'tpm-tis', 'tpm-crb', 'tpm-spapr' ], + 'if': 'defined(CONFIG_TPM)' } + ## # @query-tpm-models: # @@ -33,7 +35,8 @@ # <- { "return": [ "tpm-tis", "tpm-crb", "tpm-spapr" ] } # ## -{ 'command': 'query-tpm-models', 'returns': ['TpmModel'] } +{ 'command': 'query-tpm-models', 'returns': ['TpmModel'], + 'if': 'defined(CONFIG_TPM)' } =20 ## # @TpmType: @@ -46,7 +49,8 @@ # # Since: 1.5 ## -{ 'enum': 'TpmType', 'data': [ 'passthrough', 'emulator' ] } +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'emulator' ], + 'if': 'defined(CONFIG_TPM)' } =20 ## # @query-tpm-types: @@ -63,7 +67,8 @@ # <- { "return": [ "passthrough", "emulator" ] } # ## -{ 'command': 'query-tpm-types', 'returns': ['TpmType'] } +{ 'command': 'query-tpm-types', 'returns': ['TpmType'], + 'if': 'defined(CONFIG_TPM)' } =20 ## # @TPMPassthroughOptions: @@ -79,7 +84,8 @@ ## { 'struct': 'TPMPassthroughOptions', 'data': { '*path': 'str', - '*cancel-path': 'str' } } + '*cancel-path': 'str' }, + 'if': 'defined(CONFIG_TPM)' } =20 ## # @TPMEmulatorOptions: @@ -90,7 +96,8 @@ # # Since: 2.11 ## -{ 'struct': 'TPMEmulatorOptions', 'data': { 'chardev' : 'str' } } +{ 'struct': 'TPMEmulatorOptions', 'data': { 'chardev' : 'str' }, + 'if': 'defined(CONFIG_TPM)' } =20 ## # @TpmTypeOptions: @@ -104,7 +111,8 @@ ## { 'union': 'TpmTypeOptions', 'data': { 'passthrough' : 'TPMPassthroughOptions', - 'emulator': 'TPMEmulatorOptions' } } + 'emulator': 'TPMEmulatorOptions' }, + 'if': 'defined(CONFIG_TPM)' } =20 ## # @TPMInfo: @@ -122,7 +130,8 @@ { 'struct': 'TPMInfo', 'data': {'id': 'str', 'model': 'TpmModel', - 'options': 'TpmTypeOptions' } } + 'options': 'TpmTypeOptions' }, + 'if': 'defined(CONFIG_TPM)' } =20 ## # @query-tpm: @@ -152,4 +161,5 @@ # } # ## -{ 'command': 'query-tpm', 'returns': ['TPMInfo'] } +{ 'command': 'query-tpm', 'returns': ['TPMInfo'], + 'if': 'defined(CONFIG_TPM)' } diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index d10ee141109..f6cadede40f 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -901,6 +901,9 @@ void hmp_info_pci(Monitor *mon, const QDict *qdict) =20 void hmp_info_tpm(Monitor *mon, const QDict *qdict) { +#ifndef CONFIG_TPM + monitor_printf(mon, "TPM device not supported\n"); +#else TPMInfoList *info_list, *info; Error *err =3D NULL; unsigned int c =3D 0; @@ -946,6 +949,7 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c++; } qapi_free_TPMInfoList(info_list); +#endif /* CONFIG_TPM */ } =20 void hmp_quit(Monitor *mon, const QDict *qdict) diff --git a/stubs/tpm.c b/stubs/tpm.c deleted file mode 100644 index e79bd2a6c2d..00000000000 --- a/stubs/tpm.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * TPM stubs - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qapi/qapi-commands-tpm.h" -#include "hw/acpi/tpm.h" - -TPMInfoList *qmp_query_tpm(Error **errp) -{ - return NULL; -} - -TpmTypeList *qmp_query_tpm_types(Error **errp) -{ - return NULL; -} - -TpmModelList *qmp_query_tpm_models(Error **errp) -{ - return NULL; -} diff --git a/stubs/meson.build b/stubs/meson.build index 65c22c0568c..d4e9549dc99 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -38,7 +38,6 @@ stub_ss.add(files('sysbus.c')) stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) -stub_ss.add(files('tpm.c')) stub_ss.add(files('trace-control.c')) stub_ss.add(files('uuid.c')) stub_ss.add(files('vmgenid.c')) --=20 2.31.1