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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 479DEC43464 for ; Fri, 18 Sep 2020 06:48: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 AD67921481 for ; Fri, 18 Sep 2020 06:48:14 +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="g5vsNDLq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD67921481 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]:33800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJABp-00011H-Ms for qemu-devel@archiver.kernel.org; Fri, 18 Sep 2020 02:48:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJAAr-0000VL-OF for qemu-devel@nongnu.org; Fri, 18 Sep 2020 02:47:13 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:54010 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 1kJAAn-0007CO-NM for qemu-devel@nongnu.org; Fri, 18 Sep 2020 02:47:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600411627; 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=ecIn5VgJYMWA6PjVDARbI1Pxjteny53Ili7Etnli2Ec=; b=g5vsNDLq9UyQRm3O7Bkn/RRFLl/o7P9GCEQUUa/IlhJRz8npYtTiwG3wwcBtAd1wm+bAd5 agCtHjsOmvfDzstMr8YGcdEWMAyqiePNUAmsaGB6sFMEjcsl4F5jIlkD2pIHkrMGlD3Iwj WyqHNUIwNelkEXO5rqbM2wxUipqd6KU= 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-258-UE1kmhQ0OyODLXe6C9g3aw-1; Fri, 18 Sep 2020 02:47:05 -0400 X-MC-Unique: UE1kmhQ0OyODLXe6C9g3aw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70F0D1007B01; Fri, 18 Sep 2020 06:47:04 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id C866258; Fri, 18 Sep 2020 06:46:55 +0000 (UTC) Date: Fri, 18 Sep 2020 08:46:54 +0200 From: Igor Mammedov To: Ani Sinha Subject: Re: [PATCH v8 09/12] piix4: don't reserve hw resources when hotplug is off globally Message-ID: <20200918084654.18bf01d8@redhat.com> In-Reply-To: References: <20200917150044.23159-1-ani@anisinha.ca> <20200917150044.23159-10-ani@anisinha.ca> <20200918082423.644c3a08@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 02:47:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.997, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Laurent Vivier , Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , Julia Suvorova , Philippe =?UTF-8?B?TWF0aGll?= =?UTF-8?B?dS1EYXVkw6k=?= , QEMU Developers , Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 18 Sep 2020 12:06:26 +0530 Ani Sinha wrote: > On Fri, Sep 18, 2020 at 11:54 AM Igor Mammedov wrote: > > > > On Thu, 17 Sep 2020 20:30:41 +0530 > > Ani Sinha wrote: > > > > > When acpi hotplug is turned off for both root pci bus as well as for pci > > > bridges, we should not generate the related ACPI code for DSDT table or > > > initialize 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. > > > > > > In this change, we also make sure ACPI code for the PCNT method are only > > > added when bsel is enabled for the corresponding pci bus or bridge hotplug > > > is turned on. > > > > > > As q35 machines do not use bsel for it's pci buses at this point in time, this > > > change affects DSDT acpi table for q35 machines as well. Therefore, we will > > > also need to commit the updated golden master DSDT table acpi binary blobs as > > > well. Follwoing is the list of blobs which needs updating: > > > > > > tests/data/acpi/q35/DSDT > > > tests/data/acpi/q35/DSDT.acpihmat > > > tests/data/acpi/q35/DSDT.bridge > > > tests/data/acpi/q35/DSDT.cphp > > > tests/data/acpi/q35/DSDT.dimmpxm > > > tests/data/acpi/q35/DSDT.ipmibt > > > tests/data/acpi/q35/DSDT.memhp > > > tests/data/acpi/q35/DSDT.mmio64 > > > tests/data/acpi/q35/DSDT.numamem > > > tests/data/acpi/q35/DSDT.tis > > > > > > These tables are updated in the following commit. Without the updated table > > > blobs, the unit tests would fail with this patch. > > > > adding this to commit description doesn't help, > > 'make check' still fails if we apply patches till this point. > > which leads to broken bisection. > > > > I'm curious, what is not clear in process description at > > the start of tests/qtest/bios-tables-test.c. > > You did that for new tests, but so some reason you are avoiding > > to follow the same rules with this patch. > > Yes because I assumed the instructions were for tests only not for > patches which modify tables. It starts with the lines: > " How to add or update the tests:" any change to ACPI tables, that breaks test[s], leads to updating relevant blobs and you point out in commit message that it does break q35 tests. " * How to add or update the tests: * Contributor: * 1. add empty files for new tables, if any, under tests/data/acpi * 2. list any changed files in tests/qtest/bios-tables-test-allowed-diff.h * 3. commit the above *before* making changes that affect the tables " Above is pretty clear to me, but if you can improve it feel free to post a patch clarifying process. > > > > > > > Signed-off-by: Ani Sinha > > > --- > > > hw/acpi/piix4.c | 6 ++++-- > > > hw/i386/acpi-build.c | 25 ++++++++++++++++++------- > > > 2 files changed, 22 insertions(+), 9 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(MemoryRegion *parent, > > > "acpi-gpe0", GPE_LEN); > > > memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); > > > > > > - 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); > > > + } > > > > > > s->cpu_hotplug_legacy = 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 e079b686f5..e41bb0992b 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, AcpiPmInfo *pm) > > > pm->pcihp_bridge_en = > > > object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support", > > > NULL); > > > + pm->pcihp_root_en = > > > + object_property_get_bool(obj, "acpi-root-pci-hotplug", > > > + NULL); > > > } > > > > > > static void acpi_get_misc_info(AcpiMiscInfo *info) > > > @@ -450,10 +454,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, > > > } > > > > > > /* Append PCNT method to notify about events on local and child buses. > > > - * Add unconditionally for root since DSDT expects it. > > > + * Add this method for root bus only when hotplug is enabled since DSDT > > > + * expects it. > > > */ > > > - method = aml_method("PCNT", 0, AML_NOTSERIALIZED); > > > - > > > + if (bsel || pcihp_bridge_en) { > > > + method = aml_method("PCNT", 0, AML_NOTSERIALIZED); > > > + } > > > /* If bus supports hotplug select it and notify about local events */ > > > if (bsel) { > > > uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel)); > > > @@ -479,7 +485,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, > > > aml_append(method, aml_name("^S%.02X.PCNT", devfn)); > > > } > > > } > > > - aml_append(parent_scope, method); > > > + > > > + if (bsel || pcihp_bridge_en) { > > > + aml_append(parent_scope, method); > > > + } > > > qobject_unref(bsel); > > > } > > > > > > @@ -1504,7 +1513,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 = aml_scope("_SB"); > > > @@ -1546,7 +1557,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > { > > > aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006"))); > > > > > > - if (misc->is_piix4) { > > > + if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > > > method = aml_method("_E01", 0, AML_NOTSERIALIZED); > > > aml_append(method, > > > aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF)); > > > @@ -1698,7 +1709,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > > crs_range_set_free(&crs_range_set); > > > > > > /* reserve PCIHP resources */ > > > - if (pm->pcihp_io_len) { > > > + if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) { > > > dev = aml_device("PHPR"); > > > aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06"))); > > > aml_append(dev, > > >