From nobody Mon May 20 15:24:13 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598953953; cv=none; d=zohomail.com; s=zohoarc; b=AiIcxM5uo3oRAPhi+hl+eBSSgJOMFDFzDr65wuclQDMsWBbOvUsy2qPRZSe9SsO1ny5K4ARTXZShkONvTaCYLF8xYfnRQnoVWvP/FY2wdQK0q3tc/rLtNoDqayNvzhHu4Jh2Rzfay0jnXBJFAR9omgnJ4h8wtOZzFEmOX76NI7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598953953; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kWHo9X9OBZwhoM/Kz051GeLSEd1ecmj0d9rMesNU2TQ=; b=DpmNa9miR46A+YzvgtuOsGxGfhoaLOa6YqjLP57ExQJG783QkKHaRyPy3UxcymzK9Vv9N0orvsDylUKR+OPIXpW/e3CRTE2tvOQ3JSsp4PZCbVI76e+aJsnJ6FXO8f3L6x2o1Y70uvnn+JbZYHT4OEUgfNV5SW6BuTMFHbXXy/8= ARC-Authentication-Results: i=1; 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+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598953952909322.485139874118; Tue, 1 Sep 2020 02:52:32 -0700 (PDT) Received: from localhost ([::1]:41284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2xs-0000DJ-52 for importer@patchew.org; Tue, 01 Sep 2020 05:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2vV-00042t-8i for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:50:05 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:33688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kD2vT-0002wU-AQ for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:50:04 -0400 Received: by mail-pg1-x542.google.com with SMTP id e33so415784pgm.0 for ; Tue, 01 Sep 2020 02:50:02 -0700 (PDT) Received: from localhost.localdomain ([203.163.237.89]) by smtp.googlemail.com with ESMTPSA id o63sm1081872pfb.190.2020.09.01.02.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 02:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kWHo9X9OBZwhoM/Kz051GeLSEd1ecmj0d9rMesNU2TQ=; b=EL0IEckssDIUYNXznI64SCUfFOCCH0ox+LdLnG4P/HgAaDCgYaPNgpWJBKUgJNezKd 2gnQBN+0sZX255g+Qt6XxhBzz04N1U/xwCDeaoJAk41TmHXF50fLbLOI+ltjgatPgQ9w 2cPbyDWgRhxQuw5tW5aHjPAd7mnvkhxQFkJDTwODGBmQWM8Eia62Ibd8aMXZrERrN4YB howfkTurpnhWFx8oT2o21iWO5c19XyTqBBqeRx+JR/+d4KCzNGLjGmqG0jiJ8npVCCaW 9aI/wQc67AXGL6mW29QleUCd1G+w5uUCj9xrdxhr0vzHS1oC2U/FR89KaKhIffCh95qn AzmQ== 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; bh=kWHo9X9OBZwhoM/Kz051GeLSEd1ecmj0d9rMesNU2TQ=; b=rYzH+3VxgxLSQGhCmmerPY+fcmTlr2UBhzUi4aYTPVYm/SM8w05FzUd3QiGsfxtqGl j+TtwCpt09joF+lqv8ZbD8Bz4guMIY5iwh1YapDOJg4ztlsCRoHOxC7CGayfWeaP/XFR 6rX7/KrE33291DLXVpUPPmabiixWc5ZWkt5VkLz3pbgaQm5dTT/2rDxjEIdyghyf5kWJ Zsf3af03dvyvb3tJ4ZjgISLunW0scUdmMh1GVvXb3NOK01qy/jYaX+GZeefYpX/of4AX o96kiqIr+k0fzOW841Lpq2yt5urrZA+4UN0GXmK4q7IjV3/Hl04RQFvIiOaM21O4kP7S 8yrw== X-Gm-Message-State: AOAM5314BRAwVlijzceooQr/lHI9kY4LBotxYzgKS93th9mu3b5ziZ5M 6+B1DR62zdg+D+1jULFdhZeDhfasM8Mya3Zh X-Google-Smtp-Source: ABdhPJxjLe9iLm4d58pLQQZm3E/SEfOIU2W+PPsMF7VTFZ8GXsC/6DsZk1qFfHQ2kwz4dOM0CZtfAg== X-Received: by 2002:a62:1683:: with SMTP id 125mr426481pfw.189.1598953801414; Tue, 01 Sep 2020 02:50:01 -0700 (PDT) From: Ani Sinha To: qemu-devel@nongnu.org Subject: [PATCH] piix4: don't reserve hw resources when hotplug is off globally Date: Tue, 1 Sep 2020 15:19:22 +0530 Message-Id: <20200901094922.25514-2-ani@anisinha.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200901094922.25514-1-ani@anisinha.ca> References: <20200901094922.25514-1-ani@anisinha.ca> 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::542; envelope-from=ani@anisinha.ca; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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: Eduardo Habkost , "Michael S. Tsirkin" , jusual@redhat.com, Aleksandar Markovic , Paolo Bonzini , Ani Sinha , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related amls for DSDT table or initiali= ze related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case acpi pci hotplug is off globally. Signed-off-by: Ani Sinha --- hw/acpi/piix4.c | 6 ++++-- hw/i386/acpi-build.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e6163bb6ce..b70b1f98af 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegio= n *parent, "acpi-gpe0", GPE_LEN); memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); =20 - acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, - s->use_acpi_hotplug_bridge); + if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) { + acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent, + s->use_acpi_hotplug_bridge); + } =20 s->cpu_hotplug_legacy =3D true; object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy", diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b7bcbbbb2a..5365b3d290 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -95,6 +95,7 @@ typedef struct AcpiPmInfo { bool s3_disabled; bool s4_disabled; bool pcihp_bridge_en; + bool pcihp_root_en; uint8_t s4_val; AcpiFadtData fadt; uint16_t cpu_hp_io_base; @@ -245,6 +246,9 @@ static void acpi_get_pm_info(MachineState *machine, Acp= iPmInfo *pm) pm->pcihp_bridge_en =3D object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-suppor= t", NULL); + pm->pcihp_root_en =3D + object_property_get_bool(obj, "acpi-root-pci-hotplug", + NULL); } =20 static void acpi_get_misc_info(AcpiMiscInfo *info) @@ -1504,7 +1508,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, build_hpet_aml(dsdt); build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); - build_piix4_pci_hotplug(dsdt); + if (pm->pcihp_bridge_en || pm->pcihp_root_en) { + build_piix4_pci_hotplug(dsdt); + } build_piix4_pci0_int(dsdt); } else { sb_scope =3D aml_scope("_SB"); @@ -1698,7 +1704,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, crs_range_set_free(&crs_range_set); =20 /* reserve PCIHP resources */ - if (pm->pcihp_io_len) { + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { dev =3D aml_device("PHPR"); aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); aml_append(dev, --=20 2.17.1