From patchwork Tue Aug 3 20:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 12417357 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 5DB80C4338F for ; Tue, 3 Aug 2021 20:55:58 +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 1029960C3F for ; Tue, 3 Aug 2021 20:55:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1029960C3F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB1S9-0007NC-9B for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 16:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1OV-0000Hp-O3 for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1OU-0007xV-Aa for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628023929; 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: in-reply-to:in-reply-to:references:references; bh=Zxn59icsUcVCuhPxyLLQjU1hA9/qYGB4uEzj4yZU5LM=; b=fs3G/ioh1pXpGYFUrl7tUQrK2FNfHAGfCXfiJ1OqGl8p9u8e8SQg9rIDHmIFr9VqPDdo3T bt+l9P+K5XNIS58M4bAwRLugLbvHH+5R3LcMg89ZiPTo6KUaz+QtjT/IfBeHZCmrEspv9S kLDtzxDlGXFynjlvoQ15cgD0DCPlSy0= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-491-_QDJdkTLNdm0b7Py01CDdA-1; Tue, 03 Aug 2021 16:52:08 -0400 X-MC-Unique: _QDJdkTLNdm0b7Py01CDdA-1 Received: by mail-ed1-f71.google.com with SMTP id c1-20020aa7df010000b02903bb5c6f746eso267338edy.10 for ; Tue, 03 Aug 2021 13:52:08 -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:in-reply-to; bh=Zxn59icsUcVCuhPxyLLQjU1hA9/qYGB4uEzj4yZU5LM=; b=i4pQTE8Jjch6o7drS9MZK+iZEe3qiAA9dCPsQh/oJ89UBzkcja+p9Qx7lQBDB6tYRA VzrAlJnkgaeUf4Y7zzNZkXOSg3XOOYvfhchFIBAK1cusLvNJNh1jHLjwKTYUFjgdWtLd Hixmp5zeSkJ9WQftLH84Y/PB6RvQp0S0ty/fIUaTPycDepLrMnBhKQwVDVOdVQxbijqx ffac40dUKja43JepBLziBuXH9/sDICAfa78v2IYIYO2YFtTYglfsOt0FDH1ISXmO9fu5 02ltJRMlpe5R12eZKo0sdzn7ix9JWEJIl3IZCOr1EN1byKR87r972c+ZEN3cAqw0MnxU tceQ== X-Gm-Message-State: AOAM533Cmj8GhIqpTgClwP5t2Lomh87jHEuUPHgF5uAP4FtxUmg3VgPd nj0zBYVL90dyzp8/4b2mjD1h/0vVLGzBHdo0HnE8yGdWeT1qHvwkm8jN6FXc/BdE7Tpg7f5Wv8o xCNQsgQfNZ+mHJ78IzvkKHq7PJSx3UWmyBuSUIovImwbTHK5b5E1z4jyvjWBG X-Received: by 2002:aa7:c1cf:: with SMTP id d15mr19280704edp.201.1628023926475; Tue, 03 Aug 2021 13:52:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSQSNLMPXdB3OY8YSyn411UKhP2KwYFY95QK0LF69MKzO+j4X754+Ms6zNaT0xibqQxYMJZg== X-Received: by 2002:aa7:c1cf:: with SMTP id d15mr19280689edp.201.1628023926259; Tue, 03 Aug 2021 13:52:06 -0700 (PDT) Received: from redhat.com ([2.55.141.248]) by smtp.gmail.com with ESMTPSA id i14sm26648edx.30.2021.08.03.13.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 13:52:05 -0700 (PDT) Date: Tue, 3 Aug 2021 16:52:03 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 1/5] hw/pcie-root-port: Fix hotplug for PCI devices requiring IO Message-ID: <20210803205043.165034-2-mst@redhat.com> References: <20210803205043.165034-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210803205043.165034-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: Marcel Apfelbaum , Peter Maydell , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marcel Apfelbaum Q35 has now ACPI hotplug enabled by default for PCI(e) devices. As opposed to native PCIe hotplug, guests like Fedora 34 will not assign IO range to pcie-root-ports not supporting native hotplug, resulting into a regression. Reproduce by: qemu-bin -M q35 -device pcie-root-port,id=p1 -monitor stdio device_add e1000,bus=p1 In the Guest OS the respective pcie-root-port will have the IO range disabled. Fix it by setting the "reserve-io" hint capability of the pcie-root-ports so the firmware will allocate the IO range instead. Acked-by: Igor Mammedov Signed-off-by: Marcel Apfelbaum Message-Id: <20210802090057.1709775-1-marcel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci-bridge/gen_pcie_root_port.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index ec9907917e..20099a8ae3 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -28,6 +28,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(GenPCIERootPort, GEN_PCIE_ROOT_PORT) (GEN_PCIE_ROOT_PORT_AER_OFFSET + PCI_ERR_SIZEOF) #define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1 +#define GEN_PCIE_ROOT_DEFAULT_IO_RANGE 4096 struct GenPCIERootPort { /*< private >*/ @@ -75,6 +76,7 @@ static bool gen_rp_test_migrate_msix(void *opaque, int version_id) static void gen_rp_realize(DeviceState *dev, Error **errp) { PCIDevice *d = PCI_DEVICE(dev); + PCIESlot *s = PCIE_SLOT(d); GenPCIERootPort *grp = GEN_PCIE_ROOT_PORT(d); PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d); Error *local_err = NULL; @@ -85,6 +87,9 @@ static void gen_rp_realize(DeviceState *dev, Error **errp) return; } + if (grp->res_reserve.io == -1 && s->hotplug && !s->native_hotplug) { + grp->res_reserve.io = GEN_PCIE_ROOT_DEFAULT_IO_RANGE; + } int rc = pci_bridge_qemu_reserve_cap_init(d, 0, grp->res_reserve, errp); From patchwork Tue Aug 3 20:52:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 12417353 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 9C91FC4338F for ; Tue, 3 Aug 2021 20:54:05 +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 403C660EE7 for ; Tue, 3 Aug 2021 20:54:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 403C660EE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB1QK-0002WN-8Y for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 16:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Ob-0000QQ-BU for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1OZ-00081P-Cn for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628023934; 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: in-reply-to:in-reply-to:references:references; bh=GCqmbQ2PqvsxCTgcHNXiIdnPeK91I0G8qY//cWdHM1Y=; b=gfyU4XEZjf8uHPtlJNKEXVdpUi4Ao53t2+Zm57qUyHXY+xTJUEodnGaWV5thSnYoANvQ5T OCl5iHQkTkW+mH2w7/Chj7frzjGz3CkJuaNxcQcHTkkDKdeS0OycjTohYYK/kzkw+UcTLs xFljCb+zGPjNivek8WaWTD2nPtv+qzo= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-164-VK-x-qnvOfiKzavoNF3wSg-1; Tue, 03 Aug 2021 16:52:13 -0400 X-MC-Unique: VK-x-qnvOfiKzavoNF3wSg-1 Received: by mail-ed1-f71.google.com with SMTP id de5-20020a0564023085b02903bb92fd182eso274950edb.8 for ; Tue, 03 Aug 2021 13:52:13 -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:in-reply-to; bh=GCqmbQ2PqvsxCTgcHNXiIdnPeK91I0G8qY//cWdHM1Y=; b=Gx/C+oNQKMHjLMlG8sliuD+pVjSIjpCf1l8zvmdhj4W+ojRaqCboyhLluuA4v7hZWR sv2f7AlQnrH+SErBKhJs7q/lYKURPhzOlPtywuBBiOuJex2G+XQizzYa0H62bW9y1P4E F2bqNHKWfVyWyJVG1/QAnNtIo0FRJBL6XF2k37FPm45WoIikhT4y2pxeeCo6VveNZxn2 C4elMzBTSrrvGaYznkQs0tkhvN5bOAmH+tsG7SsS1j02mUGtCQj5Hv9eMeKC7+SZnp7N M0tHTDg+kU/pE4THKhDMVsp//mPwXPCcm8KlHrRqc24aJ9jDMVOaAYMEZBwcyowy4+uH k/ZA== X-Gm-Message-State: AOAM531BelTflrmA03S34kjCfqUAhcMjx5aafeukzlstuzCwc+j6u7qq ZHm2gnO9VI5BMazoAHdSZTL8PcZHiTDOY21iu8gBg+gT1vxPq/qYfEU2BgzzNk9MVy42QPClZS9 atNgnLo1nRTDP+DW+ET+llHMHMICNeXPq49s31ndE5WKCYnFN4KhL9Wn8HqrD X-Received: by 2002:aa7:df96:: with SMTP id b22mr27461237edy.324.1628023931609; Tue, 03 Aug 2021 13:52:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrnxBScQ32TG5oJ/QWMnR+oBz1hwm+97wEfFHLlqRpJItXlqTJrf8pTVIzA3/KZnoBIg21tg== X-Received: by 2002:aa7:df96:: with SMTP id b22mr27461205edy.324.1628023931358; Tue, 03 Aug 2021 13:52:11 -0700 (PDT) Received: from redhat.com ([2.55.141.248]) by smtp.gmail.com with ESMTPSA id m12sm151ejd.21.2021.08.03.13.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 13:52:10 -0700 (PDT) Date: Tue, 3 Aug 2021 16:52:06 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 2/5] acpi: x86: pcihp: add support hotplug on multifunction bridges Message-ID: <20210803205043.165034-3-mst@redhat.com> References: <20210803205043.165034-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210803205043.165034-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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=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 , Peter Maydell , Laurent@redhat.com, Richard Henderson , <@redhat.com, Paolo Bonzini , Mammedov@redhat.com, Vivier@redhat.com, Igor Mammedov , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Igor Mammedov Commit [1] switched PCI hotplug from native to ACPI one by default. That however breaks hotplug on following CLI that used to work: -nodefaults -machine q35 \ -device pcie-root-port,id=pcie-root-port-0,multifunction=on,bus=pcie.0,addr=0x1,chassis=1 \ -device pcie-root-port,id=pcie-root-port-1,port=0x1,addr=0x1.0x1,bus=pcie.0,chassis=2 where PCI device is hotplugged to pcie-root-port-1 with error on guest side: ACPI BIOS Error (bug): Could not resolve symbol [^S0B.PCNT], AE_NOT_FOUND (20201113/psargs-330) ACPI Error: Aborting method \_SB.PCI0.PCNT due to previous error (AE_NOT_FOUND) (20201113/psparse-531) ACPI Error: Aborting method \_GPE._E01 due to previous error (AE_NOT_FOUND) (20201113/psparse-531) ACPI Error: AE_NOT_FOUND, while evaluating GPE method [_E01] (20201113/evgpe-515) cause is that QEMU's ACPI hotplug never supported functions other then 0 and due to bug it was generating notification entries for not described functions. Technically there is no reason not to describe cold-plugged bridges (root ports) on functions other then 0, as they similarly to bridge on function 0 are unpluggable. So since we need to describe multifunction devices iterate over fuctions as well. But describe only cold-plugged bridges[root ports] on functions other than 0 as well. 1) Fixes: 17858a169508609ca9063c544833e5a1adeb7b52 (hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35) Signed-off-by: Igor Mammedov Reported-by: Laurent Vivier Message-Id: <20210723090424.2092226-1-imammedo@redhat.com> Fixes: 17858a169508609ca9063c544833e5a1adeb7b52 (hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reported-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 17836149fe..a33ac8b91e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -374,7 +374,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, Aml *dev, *notify_method = NULL, *method; QObject *bsel; PCIBus *sec; - int i; + int devfn; bsel = object_property_get_qobject(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, NULL); if (bsel) { @@ -384,23 +384,31 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, notify_method = aml_method("DVNT", 2, AML_NOTSERIALIZED); } - for (i = 0; i < ARRAY_SIZE(bus->devices); i += PCI_FUNC_MAX) { + for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { DeviceClass *dc; PCIDeviceClass *pc; - PCIDevice *pdev = bus->devices[i]; - int slot = PCI_SLOT(i); + PCIDevice *pdev = bus->devices[devfn]; + int slot = PCI_SLOT(devfn); + int func = PCI_FUNC(devfn); + /* ACPI spec: 1.0b: Table 6-2 _ADR Object Bus Types, PCI type */ + int adr = slot << 16 | func; bool hotplug_enabled_dev; bool bridge_in_acpi; bool cold_plugged_bridge; if (!pdev) { - if (bsel) { /* add hotplug slots for non present devices */ + /* + * add hotplug slots for non present devices. + * hotplug is supported only for non-multifunction device + * so generate device description only for function 0 + */ + if (bsel && !func) { if (pci_bus_is_express(bus) && slot > 0) { break; } - dev = aml_device("S%.02X", PCI_DEVFN(slot, 0)); + dev = aml_device("S%.02X", devfn); aml_append(dev, aml_name_decl("_SUN", aml_int(slot))); - aml_append(dev, aml_name_decl("_ADR", aml_int(slot << 16))); + aml_append(dev, aml_name_decl("_ADR", aml_int(adr))); method = aml_method("_EJ0", 1, AML_NOTSERIALIZED); aml_append(method, aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN")) @@ -436,9 +444,18 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, continue; } - /* start to compose PCI slot descriptor */ - dev = aml_device("S%.02X", PCI_DEVFN(slot, 0)); - aml_append(dev, aml_name_decl("_ADR", aml_int(slot << 16))); + /* + * allow describing coldplugged bridges in ACPI even if they are not + * on function 0, as they are not unpluggable, for all other devices + * generate description only for function 0 per slot + */ + if (func && !bridge_in_acpi) { + continue; + } + + /* start to compose PCI device descriptor */ + dev = aml_device("S%.02X", devfn); + aml_append(dev, aml_name_decl("_ADR", aml_int(adr))); if (bsel) { /* @@ -496,7 +513,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, build_append_pci_bus_devices(dev, sec_bus, pcihp_bridge_en); } - /* slot descriptor has been composed, add it into parent context */ + /* device descriptor has been composed, add it into parent context */ aml_append(parent_scope, dev); } @@ -525,13 +542,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, /* Notify about child bus events in any case */ if (pcihp_bridge_en) { QLIST_FOREACH(sec, &bus->child, sibling) { - int32_t devfn = sec->parent_dev->devfn; - if (pci_bus_is_root(sec)) { continue; } - aml_append(method, aml_name("^S%.02X.PCNT", devfn)); + aml_append(method, aml_name("^S%.02X.PCNT", + sec->parent_dev->devfn)); } } From patchwork Tue Aug 3 20:52:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 12417359 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 79A63C4338F for ; Tue, 3 Aug 2021 20:56: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 3D0C860C3F for ; Tue, 3 Aug 2021 20:56:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3D0C860C3F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB1SO-0008IM-Dj for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 16:56:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Of-0000Xa-0j for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Ob-00083D-J6 for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628023937; 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: in-reply-to:in-reply-to:references:references; bh=Ytx1VsHr+GHgepRgy2kP+RSokzemsu2iW7Qn2KcuMSc=; b=Ps+AoQlL1KNQcO0+AGibJFogYHNWGaI7BnIiwVzy8gyQA0axVr0OJYaMCFwdOrc6SXlYf8 O3oFowQbjjDSmm4If6CaQOGjVHzdiTWYVZbneRH7IdtHDCt7Usxq+a0WFZ9s8MpyTI/eKA 7AASaEByam14lJGvepY/9qAD0lgwZ94= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-SGjmVhiMPhe1hwMT2pvufQ-1; Tue, 03 Aug 2021 16:52:15 -0400 X-MC-Unique: SGjmVhiMPhe1hwMT2pvufQ-1 Received: by mail-ej1-f72.google.com with SMTP id ci25-20020a1709072679b029058e79f6c38aso102784ejc.13 for ; Tue, 03 Aug 2021 13:52:15 -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:in-reply-to; bh=Ytx1VsHr+GHgepRgy2kP+RSokzemsu2iW7Qn2KcuMSc=; b=ZrE6uKhYQAFyzr5Aw+Wb0kBmzEQrevzXt5y70o9xNZc1A8TGCiDycqD4+JhjFi2P6U l9aBRAgyMAphS5Nh2Yc5T7uC48dpqK/b5IjjBZq0m2OkyA+82oCuXUUrA5W2/IohZF8r RgG89rr95gvx8NM1h3bLYoeM1X/fR2/UukEISjykuJZo3lk+lYm+E/IZDdbvj4UXlUBm 1SE3T4sGWzxXkZO7ZCbGDiAoPs9iTG67nG6TPuzmI7tZ2ik+F51wYjJqLQVEUcgq3dyo 7mNHObJWw+3+GKMBxhsZ7czLeZkUnxWk/JYneSsfYnWUZVZrEVAdeumyPx8mddxo6TNs eFOA== X-Gm-Message-State: AOAM5338AK5bJXya5h58pV5oJmhj0OwPI4T7vSBylIRYzNtF8TrHhCvv DNprOgrShY0yopmYjq3yzh1p8asW498VPceA0oE4q3idJXYQd5NQG/DKA53GWZp8mSKh/lvMPJY n1vQZ0BFbKVIGsWh+hwwBXfLXWTV4+XfjzNr+yWL+noG20n1sD7YygLVT5pZZ X-Received: by 2002:a05:6402:274f:: with SMTP id z15mr28474921edd.21.1628023934560; Tue, 03 Aug 2021 13:52:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX+qPLTXj7p5xv2dpjl/Yg3BGlKXfOYnjljVpYh1M6ZrLXR16uPiJg690xHTFpcmFPhV9zow== X-Received: by 2002:a05:6402:274f:: with SMTP id z15mr28474911edd.21.1628023934441; Tue, 03 Aug 2021 13:52:14 -0700 (PDT) Received: from redhat.com ([2.55.141.248]) by smtp.gmail.com with ESMTPSA id bd24sm20310edb.56.2021.08.03.13.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 13:52:14 -0700 (PDT) Date: Tue, 3 Aug 2021 16:52:11 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 3/5] arm/acpi: allow DSDT changes Message-ID: <20210803205043.165034-4-mst@redhat.com> References: <20210803205043.165034-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210803205043.165034-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: Peter Maydell , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to commit ccee1a8140 ("acpi: Update _DSM method in expected files"). Allow changes to DSDT on ARM. Only configs with pci are affected thus all virt variants but for microvm only the pcie variant. Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..8a7fe463c5 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,6 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/DSDT", +"tests/data/acpi/virt/DSDT.memhp", +"tests/data/acpi/virt/DSDT.numamem", +"tests/data/acpi/virt/DSDT.pxb", +"tests/data/acpi/microvm/DSDT.pcie", From patchwork Tue Aug 3 20:52:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 12417355 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 15C06C4338F for ; Tue, 3 Aug 2021 20:54:18 +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 B65E060EE8 for ; Tue, 3 Aug 2021 20:54:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B65E060EE8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:59152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB1QW-00030I-UW for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 16:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Oh-0000f0-Sx for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Of-00085y-Od for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628023941; 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: in-reply-to:in-reply-to:references:references; bh=T2ArH9QYDpGKNNFTj8WgsUxFaYVT9AXJO9SHdTMENdg=; b=b2ERXist/0pirEqEIi+nBEZPqOdWXdpdWd9bohAowFqeMo90uc6L3pfVxXP/Jt9AjYIur+ jajivuS51e8MqkNJv/NkNejYVaRv4dyzD4+mE5+7NABfNuIltQitcLlVaO7KVPrBpGhd+t N2MQ8XRfk7qPHy6s72waDPBj+kX8QeY= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-291-0e9yT9HNO5KtPz_DJRaFKg-1; Tue, 03 Aug 2021 16:52:20 -0400 X-MC-Unique: 0e9yT9HNO5KtPz_DJRaFKg-1 Received: by mail-ej1-f70.google.com with SMTP id n9-20020a1709063789b02905854bda39fcso121933ejc.1 for ; Tue, 03 Aug 2021 13:52:19 -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:in-reply-to; bh=T2ArH9QYDpGKNNFTj8WgsUxFaYVT9AXJO9SHdTMENdg=; b=IUeh2Qcd7Ey4Xf6r7aMFX/WanTkdYTX+cO5WA2ppYcGYK3KK8rF3Gw4oaLZjKE3IU7 /Hq7pYoFGLiw3oplTDWD8NwL2R5tx1tfpCG+tSgaFraXm4MrJR3T2l8JC+21L0t4m57m LQ4yi1S2jKi8YnylzTNw5wfSzPvN1tHw5p+GxYn9lRymJHqSod9ewpYqlQAYLoApOr+/ 4mVgrk6oQEqiZctfHnUGGyVa8w1W+J5fCgFoqLxcKwqHCKs44iUQp/jN4D93BZs2wTuQ gQF9jJJ4grU5GJbJpu7bp182swVH1RZg60GnBfuMK0guJVAaL/KDOnqaiAoLGGGuYmHH aJbA== X-Gm-Message-State: AOAM532uMnFxibZ1PZ1bvVMCbx4P1QysQorbhutLY8aZyyVSWy2TQ+Gn MRxOSlIBmS4SBudsujw/Oam9Vc2eS5yF3xr5u0hRl4RyMWvHbGbKJaYIYqM+t9TyYCiXE5lT5qi 4DbbktLJkjOwvUSrWP+kJ6sQJrSYgkQ4kptxSw9W6jjQhruiQ7kw5ck/RHS3c X-Received: by 2002:a05:6402:b99:: with SMTP id cf25mr27973109edb.130.1628023938532; Tue, 03 Aug 2021 13:52:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw47g4aoQM8p5qs9YtfCeakXjmPid5HnqJWr9ZDkTW7uzyg3laa7E5KWKU2GlzyNrDX1ZK8Ow== X-Received: by 2002:a05:6402:b99:: with SMTP id cf25mr27973094edb.130.1628023938349; Tue, 03 Aug 2021 13:52:18 -0700 (PDT) Received: from redhat.com ([2.55.141.248]) by smtp.gmail.com with ESMTPSA id w6sm19660edq.58.2021.08.03.13.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 13:52:17 -0700 (PDT) Date: Tue, 3 Aug 2021 16:52:14 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 4/5] Revert "acpi/gpex: Inform os to keep firmware resource map" Message-ID: <20210803205043.165034-5-mst@redhat.com> References: <20210803205043.165034-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210803205043.165034-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: Peter Maydell , Jiahui Cen , Yubo Miao , Gerd Hoffmann , Igor Mammedov , Ard Biesheuvel , Guenter Roeck Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This reverts commit 0cf8882fd06ba0aeb1e90fa6f23fce85504d7e14. Which this commit, with aarch64 when using efi PCI devices with IO ports do not work. The reason is that EFI creates I/O port mappings below 0x1000 (in fact, at 0). However Linux, for legacy reasons, does not support I/O ports <= 0x1000 on PCI, so the I/O assignment created by EFI is rejected. EFI creates the mappings primarily for itself, and up until DSM #5 started to be enforced, all PCI resource allocations that existed at boot were ignored by Linux and recreated from scratch. Also, the commit in question looks dubious - it seems unlikely that Linux would fail to create a resource tree. What does happen is that BARs get moved around, which may cause trouble in some cases: for instance, Linux had to add special code to the EFI framebuffer driver to copy with framebuffer BARs being relocated. DSM #5 has a long history of debate and misinterpretation. Link: https://lore.kernel.org/r/20210724185234.GA2265457@roeck-us.net/ Fixes: 0cf8882fd06 ("acpi/gpex: Inform os to keep firmware resource map") Reported-by: Guenter Roeck Suggested-by: Ard Biesheuvel Acked-by: Ard Biesheuvel Tested-by: Guenter Roeck Signed-off-by: Michael S. Tsirkin --- hw/pci-host/gpex-acpi.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index 0f01f13a6e..e7e162a00a 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -112,26 +112,10 @@ static void acpi_dsdt_add_pci_osc(Aml *dev) UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D"); ifctx = aml_if(aml_equal(aml_arg(0), UUID)); ifctx1 = aml_if(aml_equal(aml_arg(2), aml_int(0))); - uint8_t byte_list[] = { - 0x1 << 0 /* support for functions other than function 0 */ | - 0x1 << 5 /* support for function 5 */ - }; - buf = aml_buffer(ARRAY_SIZE(byte_list), byte_list); + uint8_t byte_list[1] = {1}; + buf = aml_buffer(1, byte_list); aml_append(ifctx1, aml_return(buf)); aml_append(ifctx, ifctx1); - - /* - * PCI Firmware Specification 3.1 - * 4.6.5. _DSM for Ignoring PCI Boot Configurations - */ - /* Arg2: Function Index: 5 */ - ifctx1 = aml_if(aml_equal(aml_arg(2), aml_int(5))); - /* - * 0 - The operating system must not ignore the PCI configuration that - * firmware has done at boot time. - */ - aml_append(ifctx1, aml_return(aml_int(0))); - aml_append(ifctx, ifctx1); aml_append(method, ifctx); byte_list[0] = 0; From patchwork Tue Aug 3 20:52:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 12417361 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 2212DC4338F for ; Tue, 3 Aug 2021 20:56:25 +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 BC62560EE7 for ; Tue, 3 Aug 2021 20:56:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BC62560EE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:39318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB1SZ-0000HM-Oh for qemu-devel@archiver.kernel.org; Tue, 03 Aug 2021 16:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Ok-0000nf-QO for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB1Oj-00088A-7i for qemu-devel@nongnu.org; Tue, 03 Aug 2021 16:52:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628023944; 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: in-reply-to:in-reply-to:references:references; bh=wK1Xu5JhENTpsRwRTEKAhUpFEUB412r3ZpP4JDIjNQA=; b=ceis7nOjT60MIBt9Cua3UqfWTpyOQeACqU6LVLscXMN+gQ6Pnl71ivCY62FSI/7POXcLPV z/x7BE0SZkRm0VKqVi5Leq7YNK6KCSfHGF2Mr9Tex2X1f2LrjJ08Fhr7HBayiTGyXyGtCW 75K4RRmE2uHB0iy6CWpj0zmZiBzQML4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-k4kEzLuVNz6fKwukihAkAA-1; Tue, 03 Aug 2021 16:52:23 -0400 X-MC-Unique: k4kEzLuVNz6fKwukihAkAA-1 Received: by mail-ed1-f70.google.com with SMTP id d6-20020a50f6860000b02903bc068b7717so267479edn.11 for ; Tue, 03 Aug 2021 13:52:23 -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:in-reply-to; bh=wK1Xu5JhENTpsRwRTEKAhUpFEUB412r3ZpP4JDIjNQA=; b=F3Zg7s7mF0+QHdkqUVm8zpQnKGwwNITT2i1lDy6imIHPomM/zMED6Li3yOYZvmFgPV 56yXcIDPyNTdl9Q3ScQvXaAZmeW6mqFIrgnCLz50mWURafgaEJty93NVQSJMzO7EIo39 bjW7PjG08Cmm3NPV5tJAr1Eet9XkjPVU6kA+wZ+ALLwK/2b2ylIdKH+kFgUA5LXvPK2k cIFr/XjUKX6gTku/DzD1IbBF9Q/8KQW19is6z8R+g16njI4iD12bLOxbeVypNyeOLa3n RqL1E904gCPWNejm6ClodGaOXBaB30nkD1a/H8Ar3b9XXrVxdGkBg5b2FHLYPCluS2Gl oKMQ== X-Gm-Message-State: AOAM533PzSvpBkFipmrUP/3sk8UJH8I1lJdJko6hiC6lQB32Hj8Xx9RP key27Q1GD8pBIi8waO+Ut98s2m9I+BGL1YkUTrGQkB7ubW0zjJKdqqsU3j3gjHGMVJNwdNBkQTW IhgzdkJ71iw05BWUIgffZY+DsQIbk5taVH4dEPb1QnOkeKGC/v4k5/65VSER/ X-Received: by 2002:aa7:dc18:: with SMTP id b24mr28159994edu.343.1628023941799; Tue, 03 Aug 2021 13:52:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3RzyNXhxzJWCFIJz9xmigBRt1GCaOxxuwW5R2m8cSUq7CgZGATpWyGSnGmQvKtpg60yFq3g== X-Received: by 2002:aa7:dc18:: with SMTP id b24mr28159977edu.343.1628023941625; Tue, 03 Aug 2021 13:52:21 -0700 (PDT) Received: from redhat.com ([2.55.141.248]) by smtp.gmail.com with ESMTPSA id qa34sm6666352ejc.120.2021.08.03.13.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 13:52:21 -0700 (PDT) Date: Tue, 3 Aug 2021 16:52:18 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 5/5] Drop _DSM 5 from expected DSDTs on ARM Message-ID: <20210803205043.165034-6-mst@redhat.com> References: <20210803205043.165034-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210803205043.165034-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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=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: Peter Maydell , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" diff --git a/tests/data/acpi/microvm/DSDT.pcie b/tests/data/acpi/microvm/DSDT.pcie index 3fb373fd970f0a33f30f57b1917720754396f0e9..765f14ef3d1e54d3cadccbf0a880f8adb73b3f1f 100644 GIT binary patch delta 51 zcmcaEeqNl*CD#U6GCFLIXMD`bp&RcK?8~x1ak3Y;JR{@e HBJNZGj^hr8 delta 59 zcmX>veqEf)CDA8`aGj89g?~Gd||zFpYN!_GMY1IoXR_o>OrF P`{XPx)+G#+v$#_M_<|6J diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT index 134d8ae5b602e0aaade6756b99c9abca45279284..c47503990715d389914fdf9c8bccb510761741ac 100644 GIT binary patch delta 50 zcmcbjaYlp7CD?thI$T+!B G_%Q%n84Z^J delta 58 zcmX@3aYcj6CD diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.memhp index 140976b23ebea792bec12435a2a547ac5f5cd8f9..bae36cdd397473afe3923c52f030641a5ab19d5d 100644 GIT binary patch delta 52 zcmZ2#JlB}ZCDyi;GWjiE?8wQ*p&RcK?8~x1ak8hdJR{@g ILSYj&0ETJ})&Kwi delta 60 zcmbPhywsS>CDOrF Q`{XPx)+G#^Glfmq0PR!{)&Kwi diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.numamem index 134d8ae5b602e0aaade6756b99c9abca45279284..c47503990715d389914fdf9c8bccb510761741ac 100644 GIT binary patch delta 50 zcmcbjaYlp7CD?thI$T+!B G_%Q%n84Z^J delta 58 zcmX@3aYcj6CD diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb index 46b9c4cad5d65cb1b578410fb3168b70a05021be..fbd78f44c4785d19759daea909fe6d6f9a6e6b01 100644 GIT binary patch delta 78 zcmeCT`ESkT66_N4UzUM^Y5znn8OFOC)g?F?9XC60Hgj_5#=8XjvMf-Xd|F7Ji*bn{ YGb2NEli%{ie}uSD&QL^0Gn_Z9smFU delta 94 zcmexw-EYI?66_MfFUP>ZG;bo84CB3x>Jprco|_#wn>jg5<6VM%Sr%wc{v#tVq_}{6 hauyfs5{4y$%!~}tO>Qd|e-YwBQNsyWGg(IVF#z_a8;k$| diff -rup /tmp/old/tests/data/acpi/microvm/DSDT.pcie.dsl /tmp/new/tests/data/acpi/microvm/DSDT.pcie.dsl --- /tmp/old/tests/data/acpi/microvm/DSDT.pcie.dsl 2021-08-03 16:22:52.289295442 -0400 +++ /tmp/new/tests/data/acpi/microvm/DSDT.pcie.dsl 2021-08-03 16:22:40.102286317 -0400 @@ -1302,14 +1302,9 @@ DefinitionBlock ("", "DSDT", 2, "BOCHS " { Return (Buffer (One) { - 0x21 // ! + 0x01 // . }) } - - If ((Arg2 == 0x05)) - { - Return (Zero) - } } Return (Buffer (One) Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/microvm/DSDT.pcie | Bin 3031 -> 3023 bytes tests/data/acpi/virt/DSDT | Bin 5204 -> 5196 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6565 -> 6557 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5204 -> 5196 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7695 -> 7679 bytes 6 files changed, 5 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 8a7fe463c5..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,6 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/DSDT", -"tests/data/acpi/virt/DSDT.memhp", -"tests/data/acpi/virt/DSDT.numamem", -"tests/data/acpi/virt/DSDT.pxb", -"tests/data/acpi/microvm/DSDT.pcie",