From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096883; cv=none; d=zohomail.com; s=zohoarc; b=IsNtlhIDMxUXr2DptXXNw6S8VllGgNUeDnYxH5kRCEVIuhOkJlwWzvKIuvKHIRrvgDm4X9Bw0SnrS/biUFT9GDSdFvkdu8h47cGrUUTlQOzIGcshyYDvBNhdXNG0Feoj1avTaCjORy7wxafvFJQpatC7fzZ0QyMFVth068CGFWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096883; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H6gI52FLqNUGPgAAMMiiYEtH8SUBM+MxPOhZvMXUJHo=; b=nOyRLJ5jhhm868yhQN859aBz1msTJC7vJgknbrbTnrYtRElfy/Pw++f5xe7BoO5TD1bYnnrXQ6pFByfbgCGwE1jNWwkQ9UrsecQsnKmk51mqI2xAmStSBlNXXvMAsUekqSicxUXRpe1oe4Cb9EAc9mMxGSEhcyFCptOT4zRVgDw= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096883298764.2934038097079; Tue, 23 Feb 2021 08:14:43 -0800 (PST) Received: from localhost ([::1]:54036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaKg-0000bt-0V for importer@patchew.org; Tue, 23 Feb 2021 11:14:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaDK-0008HL-0n for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaDI-00054G-9l for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:05 -0500 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-86-RKXkyEkzNtus0hIiIiXWnw-1; Tue, 23 Feb 2021 11:03:46 -0500 Received: by mail-wr1-f71.google.com with SMTP id d7so7488606wri.23 for ; Tue, 23 Feb 2021 08:03:46 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id b7sm8570827wrv.6.2021.02.23.08.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096423; 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=H6gI52FLqNUGPgAAMMiiYEtH8SUBM+MxPOhZvMXUJHo=; b=JbGUGyxBPhCHZEkTDittwiS4HK5GciV15dFmEiQeFYKeQC2mgdf0c8WCD3O0AhjrnnnOVo bb2hQieK1+2f3sS2yfWLtiY7r2se2ahmIZIHpEOl7jQW6CJxnmcNqJ3TlLX5TkAx7nImRK G9KpuSwr42XwJCAFN3bWB7I5EnlhTy4= X-MC-Unique: RKXkyEkzNtus0hIiIiXWnw-1 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=H6gI52FLqNUGPgAAMMiiYEtH8SUBM+MxPOhZvMXUJHo=; b=brS+022T6dqoB37KyTFLcxugxtXh3Vs/q0gOtHBhDSz1St/+HQpxtPaPXTx7iwpXdV Hidj8K87KDmv1MHM6XTk4jVlt9HTPshsEkdk6hav7uDBbJipXiz2StTNm8QUj/b3/kKf vGrwcaUAHDQ4lSEL1cZJkvMYd46RolJj2IclzsM5DxV/OYARjR0GVD7lbYP0Py3cxSsU JlLWAwf79JfR2F0et/F7r42D7zwDjbZe7KJMma1l5ftQQ1lUb3ypaOFDTWMuMV1HRMKC dY8tux8un9KwvOx3TLejFWRVLc7BmISbiZ4MjhPIfRU/pd5xGkokpju556gewW6jF2w/ gBKw== X-Gm-Message-State: AOAM531OLUyr8QhE2uIz1a/6h+q3JFi0JkQPeCRYYy9LKNZRT3YJOTFB Brz1nFCQdv+NI1WGvl24HZxwtZ808BdhB5zWho9cz8zM0pyNxkUwPcZ6K1bxnpD3zhNPDUopm54 O61sSFP/TRAyrXgv2FxlQlK4uzEgWZjy3dWBJ3NwInLJ2DCMDhv/RvruKvSYI X-Received: by 2002:a1c:a90e:: with SMTP id s14mr25720760wme.36.1614096224788; Tue, 23 Feb 2021 08:03:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZ5P44wtRIg0eloWnjU2HvWf0WXB4sCWx21CbX9aeNS6xLcMWudiXSEaeHilHgHxHbTT+hjQ== X-Received: by 2002:a1c:a90e:: with SMTP id s14mr25720736wme.36.1614096224583; Tue, 23 Feb 2021 08:03:44 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:42 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 01/17] pci: cleanup failover sanity check Message-ID: <20210223160144.1507082-2-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Jason Wang , jfreimann@redhat.com 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 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier Commit a1190ab628 has added a "allow_unplug_during_migration =3D true" at the end of the main "if" block, so it is not needed to set it anymore in the previous checking. Remove it, to have only sub-ifs that check for needed conditions and exit if one fails. Fixes: 4f5b6a05a4e7 ("pci: add option for net failover") Fixes: a1190ab628c0 ("migration: allow unplug during migration for failover= devices") Cc: jfreimann@redhat.com Signed-off-by: Laurent Vivier Message-Id: <20210212135250.2738750-2-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Jens Freimann Acked-by: Jason Wang --- hw/pci/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a9ebef8a35..fa97a671d1 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2127,10 +2127,8 @@ static void pci_qdev_realize(DeviceState *qdev, Erro= r **errp) pci_qdev_unrealize(DEVICE(pci_dev)); return; } - if (!(pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) - && (PCI_FUNC(pci_dev->devfn) =3D=3D 0)) { - qdev->allow_unplug_during_migration =3D true; - } else { + if ((pci_dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) + || (PCI_FUNC(pci_dev->devfn) !=3D 0)) { error_setg(errp, "failover: primary device must be in its own " "PCI slot"); pci_qdev_unrealize(DEVICE(pci_dev)); --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096786; cv=none; d=zohomail.com; s=zohoarc; b=eQj7FLK//W4C0tmQOiVSddCPRm4Z1lixDHeRIU07xQtnyaBOUrHMHyMSTX0nHVZ16Zl0tF4elvorTZJdd+vndmk0/4YrswgSh9JceaAOiSbPNN7+p95TtFQupD3i0dhV72FJC98YB2f/joakc6U7spO68nWbn7347dEu2qAbBv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096786; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O+g107fz8NyXkf8pQpsEFuy3373s3rquehEYOznfXGs=; b=fOmRldR2oXw+0XWmKvyGeOIBmMf9tMGXNpIzgy1AdWYyk/c0ZIEI69H/gdLrvjT3/+KyXWoINeNfOPBgQYzlrFRYAY6r98yzyvDYFBylgw4C7spWlH05z0rIMagkd4nLEN+avj6g8bdfPUmt1IXlxS8rBoGZYPIgBmsuUtbeeMU= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096786146484.0341270319045; Tue, 23 Feb 2021 08:13:06 -0800 (PST) Received: from localhost ([::1]:48564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaJ7-0006lo-2t for importer@patchew.org; Tue, 23 Feb 2021 11:13:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaCd-0006sj-6J for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCb-0004n6-HR for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:22 -0500 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-559-gD5GFgRxMMi5l0M1tH_w0w-1; Tue, 23 Feb 2021 11:03:50 -0500 Received: by mail-wr1-f70.google.com with SMTP id x14so6884817wrr.13 for ; Tue, 23 Feb 2021 08:03:48 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id z2sm3150450wml.30.2021.02.23.08.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096380; 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=O+g107fz8NyXkf8pQpsEFuy3373s3rquehEYOznfXGs=; b=fVAOnn2AQ/PEZP3crDQSRTcOvnjO9gCBx99OBizoScYe4uOs4MKngmrGjsbj8+fmN7fdCu LvxqxKiOagfhRA1TJSO35eIQGbov8Oi5R0CTF+E4NeACqZ+ybQFIam0X4LJyx4Vxbpxxzb wUwMxaCdNx9t18fOZ+GFf1jgR6HBF/g= X-MC-Unique: gD5GFgRxMMi5l0M1tH_w0w-1 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=O+g107fz8NyXkf8pQpsEFuy3373s3rquehEYOznfXGs=; b=kghJzRl310qflZEiQ+DSU4DkJmi5P095jtPmOFzbO5rP6qP+c4tTfeNi6dT+CO1/Q+ iH30A0rK3Qt5Ru5qpQT915XTvZI44r1bBVGoMkz7cijOPYpPnWonZiYGMXhUSa7W0IdB kxG6M0XbM76aQqhKPIJ5YGYaP87Tolp8jXK0Om1B4IjjNHpyfWpcjlQhFyMfsBabgpdb ClMpTBBgmteKPmAqdgTrUaweajVStIKAdZwVPBVMmfmnU8EPRmO3ptpCYoFbVfuBHuOS D43QXq1dbq+HTcUv+IQUmsrWfhpM69lBw7cTF/mVz88Ekp28WOEv7Y5g7WurW7b2KttR VW9w== X-Gm-Message-State: AOAM533Dc8uvr02IUGG6xNw9xQvXBRvGup7kLLbeVHid+Q7QEwHRxf6G VmRhemrE6dFNvaApN3thu195TmdowaeBa+ORQ3wogMxIsC9MwDRJrbm0khhMNFt/dmL+o3x/v+b qjOYLd88Sc3Tv1wk4LP26r1RDJkTOnjHiYoNMivu5JrNVuMQWaB21IBr0Oncb X-Received: by 2002:a7b:cb45:: with SMTP id v5mr25376560wmj.58.1614096227314; Tue, 23 Feb 2021 08:03:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJxx9Y8xJCUjuwmL+maY5wtZtTIy6/c4yZ/HZR0oMJF87jv4EGknWfanER/HtVs7MBrDekzO3w== X-Received: by 2002:a7b:cb45:: with SMTP id v5mr25376539wmj.58.1614096227083; Tue, 23 Feb 2021 08:03:47 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:44 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 02/17] virtio-net: add missing object_unref() Message-ID: <20210223160144.1507082-3-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Laurent Vivier , Peter Maydell , Jason Wang , Jens Freimann , quintela@redhat.com 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 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier failover_add_primary() calls qdev_device_add() and doesn't unref the device. Because of that, when the device is unplugged a reference is remaining and prevents the cleanup of the object. This prevents to be able to plugin back the failover primary device, with errors like: (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev0,bus=3Droot.3= ,failover_pair_id=3Dnet0 (qemu) device_del hostdev0 We can check with "info qtree" and "info pci" that the device has been remo= ved, and then: (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev1,bus=3Droot.3= ,failover_pair_id=3Dnet0 Error: vfio 0000:41:00.0: device is already attached (qemu) device_add vfio-pci,host=3D0000:41:00.0,id=3Dhostdev0,bus=3Droot.3= ,failover_pair_id=3Dnet0 qemu-kvm: Duplicate ID 'hostdev0' for device Fixes: 21e8709b29cd ("failover: Remove primary_dev member") Cc: quintela@redhat.com Signed-off-by: Laurent Vivier Message-Id: <20210212135250.2738750-3-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Jens Freimann --- hw/net/virtio-net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5150f295e8..1c5af08dc5 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -862,6 +862,8 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) dev =3D qdev_device_add(opts, &err); if (err) { qemu_opts_del(opts); + } else { + object_unref(OBJECT(dev)); } } else { error_setg(errp, "Primary device not found"); --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096582; cv=none; d=zohomail.com; s=zohoarc; b=b1fYmFhvzcv8Z7lGMYWS7Cm5ah6ycOGL56OnlU9K62lLszX2wC+CxngjlOhhDt6tff4DxAQ/XYDNs/vC8y4FnstCd6KwRdTXG+t6XjZ61l8FpqE58Nsp7FxiHf25QDAal4FetN+WOXRuPGVHCX6L9QPOmHAA12+iIol5RMO5eNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096582; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=slEkeZRS7F5sRp+gw4b6tu0+vbYrmEHO5ckjkPv8F4Y=; b=GwbvjbNpTWJL7PfmSLH8ZXudPsPP3VQnuiW/+biMlYKTJa7FDindTkAjXzGfFIWtKMhE58KoBopcp8jyWHdIcGOEHg2YXpaL7nJ6h4NDF+txJjXurSwdA+jFbFr0nmfJ179/59HpgXbRpJ+jYYlrbgM2+OlcPJslceK8UCzJHY4= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096581888405.10254579469677; Tue, 23 Feb 2021 08:09:41 -0800 (PST) Received: from localhost ([::1]:40056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaFo-0003AE-MR for importer@patchew.org; Tue, 23 Feb 2021 11:09:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaBv-0006AE-Jc for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaBs-0004TA-IW for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:39 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-334-oHvJ4ivXO8es22og9A2eUQ-1; Tue, 23 Feb 2021 11:03:51 -0500 Received: by mail-wm1-f71.google.com with SMTP id 13so826754wmk.0 for ; Tue, 23 Feb 2021 08:03:51 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id h12sm39734446wru.18.2021.02.23.08.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096335; 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=slEkeZRS7F5sRp+gw4b6tu0+vbYrmEHO5ckjkPv8F4Y=; b=VBAYJ0sovbYKmCurE2ey1KYT7685pqesY7JaYhEa2VrI6DEQgnj7xQpF4BpB1zQf5s1nIj 5tDeh5hatVQ2VWT8VUYFGXPbQ9ooXrZeMhm2OVtnhZ8W6XM4KzPSZPlRzzS1wYX/Ac5GYX j89mimwIIu97AfgZlMvW7/+Rq2fw7hg= X-MC-Unique: oHvJ4ivXO8es22og9A2eUQ-1 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=slEkeZRS7F5sRp+gw4b6tu0+vbYrmEHO5ckjkPv8F4Y=; b=ZNJimraJc1oUBLcYvtHBxtQa76gcogq5jqYUZGU9O/zZJE4WftcnksAbDYXeLNelpo 7n5sgpc/WxPWtHGl10OeYuw42YYZtv0/CMgEv0l1xyckw4ScZdHOWzh0ccZ/OFNvu7O6 xue3UC4SsaJc4+6WvGlbAbLfD8rIDxHSkGvaZLkyMY2+IBkPTF2nb/1tWOfeovTe3qPK NoPkNtasRTDpp8zf7UpjAyW0CPdYvrFpRVOHcwc2Fcc8rqUa3NvBfxKJiHz7IAvyfPE0 /2GJP9tc3TL5GOZ0t3GaHujcrcoPkVw3xjhWJJmk59lJVKVF25r+1q9r3iLtfEVKDZzC Ztjg== X-Gm-Message-State: AOAM531BsThQXQropQIY4eVPXO45m/dxsyTdx2FRxRYH2cU/ABtT4MH7 IY0xuX9dXg1KAlKrQwBRQHYFnr+IwpoPM6Vv384SHhHRt+pYYWA7LsP3+1D88aPaLGxM/lqNQ7P yKrMjsmLpuRcL4K4m3MceKWftvPCZU2XQrwSx2VvhYpJA4ubtTjLJzT2qrQtX X-Received: by 2002:adf:d850:: with SMTP id k16mr24790364wrl.10.1614096229707; Tue, 23 Feb 2021 08:03:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzv5Mprdz3UKRXPg8EmaUyLayotM+6BA3eFwYdRHy6ApfLQtXOv/oYNkLovwV3FkCJMVj1eMA== X-Received: by 2002:adf:d850:: with SMTP id k16mr24790331wrl.10.1614096229440; Tue, 23 Feb 2021 08:03:49 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:47 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 03/17] failover: really display a warning when the primary device is not found Message-ID: <20210223160144.1507082-4-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Jason Wang 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 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier In failover_add_primary(), we search the id of the failover device by scanning the list of the devices in the opts list to find a device with a failover_pair_id equals to the id of the virtio-net device. If the failover_pair_id is not found, QEMU ignores the primary device silently (which also means it will not be hidden and it will be enabled directly at boot). After that, we search the id in the opts list to do a qdev_device_add() with it. The device will be always found as otherwise we had exited before, and thus the warning is never displayed. Fix that by moving the error report to the first exit condition. Also add a g_assert() to be sure the compiler will not complain about a possibly NULL pointer. Signed-off-by: Laurent Vivier Message-Id: <20210212135250.2738750-4-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 1c5af08dc5..439f823b19 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -855,21 +855,19 @@ static void failover_add_primary(VirtIONet *n, Error = **errp) =20 id =3D failover_find_primary_device_id(n); if (!id) { - return; - } - opts =3D qemu_opts_find(qemu_find_opts("device"), id); - if (opts) { - dev =3D qdev_device_add(opts, &err); - if (err) { - qemu_opts_del(opts); - } else { - object_unref(OBJECT(dev)); - } - } else { error_setg(errp, "Primary device not found"); error_append_hint(errp, "Virtio-net failover will not work. Make " "sure primary device has parameter" - " failover_pair_id=3D\n"); + " failover_pair_id=3D%s\n", n->netclient_name); + return; + } + opts =3D qemu_opts_find(qemu_find_opts("device"), id); + g_assert(opts); /* cannot be NULL because id was found using opts list= */ + dev =3D qdev_device_add(opts, &err); + if (err) { + qemu_opts_del(opts); + } else { + object_unref(OBJECT(dev)); } error_propagate(errp, err); } --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096591; cv=none; d=zohomail.com; s=zohoarc; b=KUC4mliknB4LJ6nmCJ7ji0T81V5X5avypAJFYO17Yotz1jEWXdfpBdKvR8xyHrQMLvOP+HYp9oc/KKeiQkCy3E8ncQixtjqF4vAg6kmPvhGbkp3XlrwlDKfsS/teq5dq5NEHbSmRgYOyJB4Pg/SBrE0soX2p4KGDehvm8TJfd0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096591; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xWK/qkK+5M2CXBX1zyJL7KcI8AwQZ/wcvMefmepxkLY=; b=hhlLWSWJGGl0eNOjRGv47RTkYa6EpXdGliFix25ZZwKCKG2pB7FvxAKZ2zdA9yZgTpJXyz6Xo/TewASO+N2voPTxg4OWIKMerOUXk+amtrCQGqJFK7vQGtrr3juxnVVuVW/8anx9KdXaIDaCRCTrRxoBR9eqc6Teo6vrI4Y/MGI= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096591556484.4951501911712; Tue, 23 Feb 2021 08:09:51 -0800 (PST) Received: from localhost ([::1]:41056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaFy-0003Z6-Cn for importer@patchew.org; Tue, 23 Feb 2021 11:09:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaDg-0000Xh-V2 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaDd-0005CZ-0G for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:28 -0500 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-282-tg4dZcFLNYyM1qHObgp5WA-1; Tue, 23 Feb 2021 11:03:53 -0500 Received: by mail-wm1-f70.google.com with SMTP id q24so1384290wmc.1 for ; Tue, 23 Feb 2021 08:03:53 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id l7sm33822731wrn.11.2021.02.23.08.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096444; 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=xWK/qkK+5M2CXBX1zyJL7KcI8AwQZ/wcvMefmepxkLY=; b=geYKFK1zOHWp+dT74W+Oc1Vye3jsMFMzSg37WGRR93f0MtOWghbWvPNTC9BYTb0785XNww N/qcqCrmOCffXrdlbTN1YJ1rN0pKth3rgTS+3gAnKTEPG6CI3s68TEGVsu7wXpVLrBM1oA jwm8PQN53x25ZVVfK3g/QFOiwE02v4o= X-MC-Unique: tg4dZcFLNYyM1qHObgp5WA-1 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=xWK/qkK+5M2CXBX1zyJL7KcI8AwQZ/wcvMefmepxkLY=; b=HdiM2v8QGgY+o5Yd4GuS5PICF/EVX5qRKlZvCOshh3gewDJi9lSPMqtEaADsOLRIc9 luwIg8VjL89ptwAyahBFxdEe8Ic94+BbnpypocndTgbpW4ENRDcr5EqZcKPaFL4b03H+ Pv8PGWEVGKHyFF9qTCczRHDObyfIdJBuc2ZxtbrDOiaNFmafcbEh9orCqyD3JqBEW2SU IA5WiDtk2t+QEr7Xr8t9/BKjPD8lGHfb9PEFyanBCyVQWoRxsvPjtHJ9kn6/D4vNaUbV t38N4Cr2c4xIOMpGrIhxQcdDnsqGE3XHRcDpJUvoCbOTlGki2YPauV+oqSqy9f7pkkM6 OCMQ== X-Gm-Message-State: AOAM531ehjVsGOM2nOCZ3JXAxGTF2oJZUu0bCg3DKU/3f5iYkpC8WeUU CdPy7+YezW+xB0/O3xlwyY9OssL1n1aPKWtNLpQA7LTc8RkVsWDnlwPMMNaOjb2mOexISD4mnXM x2+/dv3XMbTNreKQqYN7v+AD8p5nBN7l7bu0OO6VKK99ODn2weTVeUikxFo4Q X-Received: by 2002:a05:600c:35c4:: with SMTP id r4mr25044304wmq.138.1614096232028; Tue, 23 Feb 2021 08:03:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQgt2yJwZHTaFy1ZYAsp27BR4VJnaR4BqObvWbOOwlAVScQ8soaiAqBdn4z+gHNdm6EpPe6A== X-Received: by 2002:a05:600c:35c4:: with SMTP id r4mr25044268wmq.138.1614096231680; Tue, 23 Feb 2021 08:03:51 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:49 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 04/17] pcie: don't set link state active if the slot is empty Message-ID: <20210223160144.1507082-5-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Laurent Vivier , Peter Maydell , alex.williamson@redhat.com, zhengxiang9@huawei.com 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 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier When the pcie slot is initialized, by default PCI_EXP_LNKSTA_DLLLA (Data Link Layer Link Active) is set in PCI_EXP_LNKSTA (Link Status) without checking if the slot is empty or not. This is confusing for the kernel because as it sees the link is up it tries to read the vendor ID and fails: (From https://bugzilla.kernel.org/show_bug.cgi?id=3D211691) [ 1.661105] pcieport 0000:00:02.2: pciehp: Slot Capabilities : 0x00= 02007b [ 1.661115] pcieport 0000:00:02.2: pciehp: Slot Status : 0x00= 10 [ 1.661123] pcieport 0000:00:02.2: pciehp: Slot Control : 0x07= c0 [ 1.661138] pcieport 0000:00:02.2: pciehp: Slot #0 AttnBtn+ PwrCtrl+ MRL= - AttnInd+ PwrInd+ HotPlug+ Surprise+ Interlock+ NoCompl- IbPresDis- LLActR= ep+ [ 1.662581] pcieport 0000:00:02.2: pciehp: pciehp_get_power_status: SLOT= CTRL 6c value read 7c0 [ 1.662597] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active: lnk= _status =3D 2204 [ 1.662703] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0010 fro= m Slot Status [ 1.662706] pcieport 0000:00:02.2: pciehp: pcie_enable_notification: SLO= TCTRL 6c write cmd 1031 [ 1.662730] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active: lnk= _status =3D 2204 [ 1.662748] pcieport 0000:00:02.2: pciehp: pciehp_check_link_active: lnk= _status =3D 2204 [ 1.662750] pcieport 0000:00:02.2: pciehp: Slot(0-2): Link Up [ 2.896132] pcieport 0000:00:02.2: pciehp: pciehp_check_link_status: lnk= _status =3D 2204 [ 2.896135] pcieport 0000:00:02.2: pciehp: Slot(0-2): No device found [ 2.896900] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0010 fro= m Slot Status [ 2.896903] pcieport 0000:00:02.2: pciehp: pciehp_power_off_slot: SLOTCT= RL 6c write cmd 400 [ 3.656901] pcieport 0000:00:02.2: pciehp: pending interrupts 0x0009 fro= m Slot Status This is really a problem with virtio-net failover that hotplugs a VFIO card during the boot process. The kernel can shutdown the slot while QEMU is hotplugging it, and this likely ends by an automatic unplug of the card. At the end of the boot sequence the card has disappeared. To fix that, don't set the "Link Active" state in the init function, but rely on the plug function to do it, as the mechanism has already been introduced by 2f2b18f60bf1. Fixes: 2f2b18f60bf1 ("pcie: set link state inactive/active after hot unplug= /plug") Cc: zhengxiang9@huawei.com Fixes: 3d67447fe7c2 ("pcie: Fill PCIESlot link fields to support higher spe= eds and widths") Cc: alex.williamson@redhat.com Fixes: b2101eae63ea ("pcie: Set the "link active" in the link status regist= er") Cc: benh@kernel.crashing.org Signed-off-by: Laurent Vivier Message-Id: <20210212135250.2738750-5-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/pcie.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index d4010cf8f3..a733e2fb87 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -75,11 +75,6 @@ pcie_cap_v1_fill(PCIDevice *dev, uint8_t port, uint8_t t= ype, uint8_t version) QEMU_PCI_EXP_LNKSTA_NLW(QEMU_PCI_EXP_LNK_X1) | QEMU_PCI_EXP_LNKSTA_CLS(QEMU_PCI_EXP_LNK_2_5GT)); =20 - if (dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA) { - pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, - PCI_EXP_LNKSTA_DLLLA); - } - /* We changed link status bits over time, and changing them across * migrations is generally fine as hardware changes them too. * Let's not bother checking. @@ -125,8 +120,7 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev) */ pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP, PCI_EXP_LNKCAP_DLLLARC); - pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, - PCI_EXP_LNKSTA_DLLLA); + /* the PCI_EXP_LNKSTA_DLLLA will be set in the hotplug function */ =20 /* * Target Link Speed defaults to the highest link speed supported = by @@ -427,6 +421,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev,= DeviceState *dev, PCIDevice *hotplug_pdev =3D PCI_DEVICE(hotplug_dev); uint8_t *exp_cap =3D hotplug_pdev->config + hotplug_pdev->exp.exp_cap; PCIDevice *pci_dev =3D PCI_DEVICE(dev); + uint32_t lnkcap =3D pci_get_long(exp_cap + PCI_EXP_LNKCAP); =20 /* Don't send event when device is enabled during qemu machine creatio= n: * it is present on boot, no hotplug event is necessary. We do send an @@ -434,7 +429,8 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev,= DeviceState *dev, if (!dev->hotplugged) { pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA, PCI_EXP_SLTSTA_PDS); - if (pci_dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA) { + if (pci_dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA || + (lnkcap & PCI_EXP_LNKCAP_DLLLARC)) { pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, PCI_EXP_LNKSTA_DLLLA); } @@ -448,7 +444,8 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev,= DeviceState *dev, if (pci_get_function_0(pci_dev)) { pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA, PCI_EXP_SLTSTA_PDS); - if (pci_dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA) { + if (pci_dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA || + (lnkcap & PCI_EXP_LNKCAP_DLLLARC)) { pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, PCI_EXP_LNKSTA_DLLLA); } @@ -640,6 +637,7 @@ void pcie_cap_slot_write_config(PCIDevice *dev, uint32_t pos =3D dev->exp.exp_cap; uint8_t *exp_cap =3D dev->config + pos; uint16_t sltsta =3D pci_get_word(exp_cap + PCI_EXP_SLTSTA); + uint32_t lnkcap =3D pci_get_long(exp_cap + PCI_EXP_LNKCAP); =20 if (ranges_overlap(addr, len, pos + PCI_EXP_SLTSTA, 2)) { /* @@ -695,7 +693,8 @@ void pcie_cap_slot_write_config(PCIDevice *dev, =20 pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTSTA, PCI_EXP_SLTSTA_PDS); - if (dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA) { + if (dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA || + (lnkcap & PCI_EXP_LNKCAP_DLLLARC)) { pci_word_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA, PCI_EXP_LNKSTA_DLLLA); } --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096446; cv=none; d=zohomail.com; s=zohoarc; b=YRy7zR1SMmTgz8eK5tkcQH5MXkBIXeuNizfiMTXywz/+ZOD+aOdckD+uisQY0tY+7kPoPJ0jc2Za/yYsHIA3dahJNhlDEg5u64T8MiRWMCWk0sP0+CeZiz9ubZSePqX8YEFTaaUhdDiYYhll6D+gw4Rrw9qN1m01ly7SfMARSnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096446; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W7iIhzId1IuQhhQJ1K602hukzgZZn8+WgBAjDnNvPnA=; b=JAFcXtaj/B25kQKS7868ESsrQV01Ne3Kc2hu0/PI0IC3bZSyrJSIaOVUj6vnyBk4wjj+UDuXIj6pzIFW4I3BzZFZhmjAQpCsH6YoPJkI7wUIjJLgYHxkxDhkzLsNbDR7Oyt0csVHMdSGAz1LU1kfCUQpN1s/pw2SSczDN5vIAZc= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096445926596.7348906569267; Tue, 23 Feb 2021 08:07:25 -0800 (PST) Received: from localhost ([::1]:59898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaDc-00089e-Os for importer@patchew.org; Tue, 23 Feb 2021 11:07:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaCS-0006XJ-8o for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCQ-0004hN-MR for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:12 -0500 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-251-M9QtlxKAO9GrVaNOnVu2CA-1; Tue, 23 Feb 2021 11:03:55 -0500 Received: by mail-wr1-f70.google.com with SMTP id j12so1929317wrt.9 for ; Tue, 23 Feb 2021 08:03:55 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id x15sm2007186wmi.43.2021.02.23.08.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096369; 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=W7iIhzId1IuQhhQJ1K602hukzgZZn8+WgBAjDnNvPnA=; b=KfoNqVZpYJYPCLwLaoXrLNEu+yMzyufIrjXWrfprKX/mD9kCzoM0HhFuEUSM2KTaUew7Oj ynxQrU6I9dfZm5kepl/tDJ5nN88TYdiwRoTTuBA+BZ9siK2BtG8oL6+pQw9v2wuo8XT25R ORn9FYkljPz28mrIutXHIwMvFlUn7Iw= X-MC-Unique: M9QtlxKAO9GrVaNOnVu2CA-1 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=W7iIhzId1IuQhhQJ1K602hukzgZZn8+WgBAjDnNvPnA=; b=aNO09qba0YiqsekWZZ7YhuPX32kRvQSA3BhcMIob1ySiANuqvl3z2p3aAEKncQeLoe INAxFmCET5THQ6Xi7QWJNscgpsqpLAM7hB4mEEDF3nvvFLHUmdSwOXvvWvxxVgHOpUtd u0kOHwlaUFtndZil3CwpvrhOebCTTNT5bZNhCMzBxuUmHasP6hqSiBsg3lmeYx7CoBVR p0LO8HOWq/cAV5JSL0R+6rgXh41PAHliWOenteLdfR+EjUMLc2rNInoaX6LYo8Xh8o4p GClNlm1VSSL3S5WSC+dZsEKFxUJM5H7vQfDYZxidC5ytQgqZ6b/5rMkWIM7bUjGWGUfL E3oQ== X-Gm-Message-State: AOAM531+hoD5YX6YC7LoApE3ani9/16dEIV6oLuBGzxT/p77bIncNcNJ NSLvVs1iJdOx+Dix7ApiPy+FT9Lnci2Nj8zISR1zckJNcx1T3tSLZhyrLLAO/kRZrdT9+6Ws3Fv gpmsPykAXCJSFlzHkG4mU4z+osQN1BxvmiwzdB0JBxKHdrvpwsF3sCNs6toDx X-Received: by 2002:a7b:c157:: with SMTP id z23mr22508349wmi.176.1614096234196; Tue, 23 Feb 2021 08:03:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJhoC8ojGZxc6RD3AIqY2KgfBf2dvqFVx3gAxfNwoEp19+BkvoruxqALccK03xO5tVl2xXaQ== X-Received: by 2002:a7b:c157:: with SMTP id z23mr22508335wmi.176.1614096234060; Tue, 23 Feb 2021 08:03:54 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:51 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 05/17] acpi: Allow pxb DSDT acpi table changes Message-ID: <20210223160144.1507082-6-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Jiahui Cen , Xingang Wang , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Xingang Wang Signed-off-by: Jiahui Cen Signed-off-by: Xingang Wang Message-Id: <1612490205-48788-2-git-send-email-wangxingang5@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..90c53925fc 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/DSDT.pxb", --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096478; cv=none; d=zohomail.com; s=zohoarc; b=dF4EyzNdsOr+CRk+3yGa/J94nc80294spX/eIwcoW91Cst0TH1lI/muKpy2XGGLZIV+XvxpOjN4P25/H3mDRfcDQDE9J9UJLAKi6cySp//H9z4JMOYJCzOAp85RzE0zdcoBUFP2uZo2p9tnU+7I8kaKajFp8/bHh5sdnB5cFiag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096478; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3FZ7ZRtKozgfzX6BDwaNDLcqm+L2lOrK1/3HIq9dCmY=; b=VEOCKMlnP1rw4snd9XSEpbbW+VhPZCRJ1Tt54UbvPBMptKRujMIVYgjnnb7g7sK7Qln7wrnmGOOaX0cm7RirmEsKpJUwrplmJ1lSmO2zHvy4retts4TNIFSQDCNabphrIiBWq7DLswBVesJ4GZrc8T56xKSEbjXn9DIa0CTcaco= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096478271314.3935665458787; Tue, 23 Feb 2021 08:07:58 -0800 (PST) Received: from localhost ([::1]:60690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaE7-0008UT-Nr for importer@patchew.org; Tue, 23 Feb 2021 11:07:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaCa-0006mz-Km for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCY-0004l9-31 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:20 -0500 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-5-__L6bEE0Ppy5zH665MWbyg-1; Tue, 23 Feb 2021 11:03:59 -0500 Received: by mail-wr1-f72.google.com with SMTP id d10so7480256wrq.17 for ; Tue, 23 Feb 2021 08:03:58 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id x13sm3902092wmj.2.2021.02.23.08.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096377; 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=3FZ7ZRtKozgfzX6BDwaNDLcqm+L2lOrK1/3HIq9dCmY=; b=VSFtKWqEK3M6nbqQGP1FwdWgTYHeA/RCbnEVESDz/0Cj0X01TmnzQbWWCtpy9zXD7KRmoW vSkWwFXOea+/3FSQObDDWVyZQY9xdcMJhJaRIbSbq3TiHHGVEsAzsc9wH2tbwLAWOXeaP/ GMpl14uiDZ8n5vQcMH+qaSzpqC7NxkY= X-MC-Unique: __L6bEE0Ppy5zH665MWbyg-1 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=3FZ7ZRtKozgfzX6BDwaNDLcqm+L2lOrK1/3HIq9dCmY=; b=WlIxiooSbRXknLsm1b4Dwp/3AucFhaeVE/YiU3/sjbRZscCKx/++Hu/pv77goaQSup /MRNQBhIS5Q0Z++EWhMeWNi2VF1S5M0iLEjuqzZhOy96lVYBqxQh6Y/TXY2vCa4Qao3A LtjaeABZuIULPGyEYw0L5AQkQa5d84DzTiwRUHarSU8zgfWaNMK1wMekDEu65WFCysBT fmWWkLtLViYLlQOJfgBDYK6EBCujY342me0+Zln7SY5h1fOyMZuvbc2ENEujl7hkNxaa /GUQ1W8YXUMF2wybAmTz+IqfnLsv0tWhomr+1FsteKLKAYEVAxb/lTRx/tE8iq2MYLxz OHjw== X-Gm-Message-State: AOAM532ifpfKb9J+U1FM6x0hO9Wes7a25f1LLGsYFvb1q5KycfCc20HK ygBaegvBW9V7F07SZXpzws5PcHSSGa/LWJObFfQcqDPO5K/D5epMZpJ+ogFgbji64KgQ1iJkYkh Q1AzOk5MxI2XQYp36oa5hETxg7ka9YJ/8ekwCdCoftyL/c5pz3/qoO1J855uS X-Received: by 2002:a1c:d7:: with SMTP id 206mr25836370wma.68.1614096237414; Tue, 23 Feb 2021 08:03:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZ5Iit4oOq3wOSd8R9IvRC8aFHJj+d/Za6u4NjlQu+DfV+FiCX52zAyuRGQFXeaRc3cCQ8xg== X-Received: by 2002:a1c:d7:: with SMTP id 206mr25836324wma.68.1614096237037; Tue, 23 Feb 2021 08:03:57 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:54 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 06/17] acpi/gpex: Fix cca attribute check for pxb device Message-ID: <20210223160144.1507082-7-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Xingang Wang , Yubo Miao , Gerd Hoffmann , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Xingang Wang When check DMA support for device attached to pxb, the cache coherency attribute need to be set. This add _CCA attribute for pxb DSDT. Fixes: 6f9765fbad ("acpi/gpex: Build tables for pxb") Signed-off-by: Jiahui Cen Signed-off-by: Xingang Wang Message-Id: <1612490205-48788-3-git-send-email-wangxingang5@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- hw/pci-host/gpex-acpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index 446912d771..0f01f13a6e 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -175,6 +175,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *= cfg) aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num))); aml_append(dev, aml_name_decl("_UID", aml_int(bus_num))); aml_append(dev, aml_name_decl("_STR", aml_unicode("pxb Device"= ))); + aml_append(dev, aml_name_decl("_CCA", aml_int(1))); if (numa_node !=3D NUMA_NODE_UNASSIGNED) { aml_append(dev, aml_name_decl("_PXM", aml_int(numa_node))); } --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096779; cv=none; d=zohomail.com; s=zohoarc; b=bzfLUgefKulh/SHCXbJOeD+9DON76sWxVapyYMCDlD5bBVCdvrZfNcrUsHp9NFClBLI8FZTfo0fAZ2Sgf+yX3U62NETLYH+rmAQbOAPv0ndbtJ3hMklpKj06TGuKHbtIN1pSuEiYR1GdG68Nc0LqaijE8oEjNq38urj5Qd+o8LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096779; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z9qHGdV04zeNTc+xnPb71EfvMlhKMC3upZAdBsWl0u0=; b=DvwE+gk03ilkehOw6XUsUYPGTrr/mz7bUqD1kO7UnSTq9v2CNyT7I7HX6Q4fvbaUaqWzjl8KOE8na2LLXT0uGc598SMpfCvOqjZnOIQlACmZq8Epliunw/S7Ibv92W4J2cuJCHAUcuoA7wcRZV2YxU/drnwWnD9PF6rO7S450lQ= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096779542476.6890721055007; Tue, 23 Feb 2021 08:12:59 -0800 (PST) Received: from localhost ([::1]:47968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaJ0-0006Wr-4n for importer@patchew.org; Tue, 23 Feb 2021 11:12:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaCb-0006o3-4L for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCY-0004lW-KN for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:20 -0500 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-567-gEwxob0DP2qUEdURmN35tA-1; Tue, 23 Feb 2021 11:04:00 -0500 Received: by mail-wr1-f72.google.com with SMTP id e13so7530616wrg.4 for ; Tue, 23 Feb 2021 08:04:00 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id q24sm3059295wmq.24.2021.02.23.08.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096377; 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=z9qHGdV04zeNTc+xnPb71EfvMlhKMC3upZAdBsWl0u0=; b=QttjvPPuqbg3Bma7kUYEDre+i4jb5Th3NypuTHktsHNA8kTfOJhCa2lYdBg9Hv6hhS+nt1 0GLRwhQpZgwKIv6vRcQkzrpfxu9b591V4wOKxvIWbpHWRiiNRESMf0DIMTm7cZbIdyVNNP zimxaMrE1eCQ2QV7cwm7FK/huCNs6ls= X-MC-Unique: gEwxob0DP2qUEdURmN35tA-1 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=z9qHGdV04zeNTc+xnPb71EfvMlhKMC3upZAdBsWl0u0=; b=Xqg9LPjDmYyHVClX5kCl3gRM+lW0cJ8Kl1dEIvIb3hYkW5manS2gDPzZB4Ler0NEcS b4EOz2Pz86uh+WcTf7wd714okxb7QHjly9uN0UVpcFx+HGwt1XGGF7Xrqcwc82t+6M4S X6ljV1FeI1NRSOg/r6LlXo1dHjZzknYkTAsnIcO96Qqu0P0q9qa4X4XJakBS56ZevkZm 940cCxbhSE1Fq2WtN9OVkuV4AxGZQ4Ycbf1XiN2lldLfghH7aWm6fuI8SaobHp9hMmiO VV03gd5xefy3lpl2Y9LibQYHuoe8PnqNlx8sK+yDlZO0MgLOAH5Nr29PVJ7R0Zd3zyHF OLYg== X-Gm-Message-State: AOAM530sFMW/aj1Dq2GGAkn7sNjxT+y9AsMI8Dx2/p8VUCC0I9MWzuVX WmSRuaWR4M/FzCLGUn85E1YHuoyOMIGx6rQll5dYB3C5C0EKCRrQuZpFEgW3/PQ0lyWWz+X1Bw0 3rSSZ4m/n7PStU/jtGCuSWZ060HTaf5xeC2cofh80HffYu0VOfwC59ub5gVEB X-Received: by 2002:adf:8185:: with SMTP id 5mr27831238wra.288.1614096239406; Tue, 23 Feb 2021 08:03:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGfRujFjKVQd98znNsyvV49ITcYaOuOaSnIMG+w5C9irhOrqzT2tCdqKFFhXuo7R5D1DzmYQ== X-Received: by 2002:adf:8185:: with SMTP id 5mr27831208wra.288.1614096239182; Tue, 23 Feb 2021 08:03:59 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:57 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 07/17] tests/data/acpi/virt/DSDT.pxb: update with _CCA Message-ID: <20210223160144.1507082-8-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Xingang Wang , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Xingang Wang Update expected DSDT files accordingly, and re-enable their testing. diff of disassembly of changed expected files: diff -ru -IDisassembly old/tests/data/acpi/virt/DSDT.pxb.dsl new/tests/= data/acpi/virt/DSDT.pxb.dsl --- old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-02-23 09:54:18.566= 781350 -0500 +++ new/tests/data/acpi/virt/DSDT.pxb.dsl 2021-02-23 09:57:51.952= 816428 -0500 Name (_BBN, 0x80) // _BBN: BIOS Bus Number Name (_UID, 0x80) // _UID: Unique ID Name (_STR, Unicode ("pxb Device")) // _STR: Description = String + Name (_CCA, One) // _CCA: Cache Coherency Attribute Name (_PRT, Package (0x80) // _PRT: PCI Routing Table { Package (0x04) Signed-off-by: Jiahui Cen Signed-off-by: Xingang Wang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 1 - tests/data/acpi/virt/DSDT.pxb | Bin 7689 -> 7695 bytes 2 files changed, 1 deletion(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 90c53925fc..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/DSDT.pxb", diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb index eaa507b4bba45186d58c03695e46c5bba6a2695a..46b9c4cad5d65cb1b578410fb31= 68b70a05021be 100644 GIT binary patch delta 40 wcmeCQ>9^r>33dtLmt$aHnm3V4nz3u6nj|Nq=3DVS-YfX)8GB^;ao33BrQ0MsA~u>b%7 delta 40 vcmeCT>9pZ;33dtLlw)9Ex<8Rinz3c0nj|Nq^JE9kfX&guc^sQrgt&PC)sYG9 --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614097511; cv=none; d=zohomail.com; s=zohoarc; b=XMN2S3ajHN6hjLdC5NUqBKNYlKb8uXsQGpFgXQFOUcC9m9tMvpX1g3eNak7jogX39r8+lqDAxfnqyzZb1rRQVCIS+0p7RDtAHUPYH6BBxKubguoHAoNLoxZyR9+ma5A5MlVfAMQYbMLsvLveoWM2QrXCFAnqVTjh1LqzzigjZdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614097511; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rRM2VL09H0QIc2reZUXyPE784K6AqgzMJOUxI6K2w20=; b=jqNQJAA2lhjdu4WKo0rEKLH/kAXHxPshDLZq6j9dfBocHWsxYZ9wWYMoN8H1oYw+8XakyT/o7EbTaJx65dt+aNDPrkXYDxJKAVsQrGvpOGPaUQbttemnS97IiCfAhfs9Cv/BWM+H25RZofKxNz+c2mxDw2jIVonq8xeHM5+dV7g= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614097510624712.8205990977822; Tue, 23 Feb 2021 08:25:10 -0800 (PST) Received: from localhost ([::1]:48900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaUn-000293-CB for importer@patchew.org; Tue, 23 Feb 2021 11:25:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaU4-0001bp-5r for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:24:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaU1-00048z-KO for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:24:22 -0500 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-600-AQhWNjeCMuiIZE5-_hERKQ-1; Tue, 23 Feb 2021 11:04:03 -0500 Received: by mail-wr1-f70.google.com with SMTP id v3so1045799wro.21 for ; Tue, 23 Feb 2021 08:04:03 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id n10sm6163119wrt.83.2021.02.23.08.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614097460; 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=rRM2VL09H0QIc2reZUXyPE784K6AqgzMJOUxI6K2w20=; b=ZltIF1vT6R7ty5AZMh4g0EULFw/SIbjehRQdYwNILQd9AcAlXgnbk6QxBrW8fMR86b49tU MJ3TosrxODfS5arNfH763bDPD6qQ72uobxPjcrcPIlYCCdpzlyrkWYhfj9R+R8teLETWP6 6HYT4CFTWPfHKqoDVmnnVAnUa3+3oQI= X-MC-Unique: AQhWNjeCMuiIZE5-_hERKQ-1 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=rRM2VL09H0QIc2reZUXyPE784K6AqgzMJOUxI6K2w20=; b=sf5YsfWyeNNSMwumgdKXDcwiXOm6J5Kqg8W5g2XSJROmxY18mljzeQNIkcQR8P/KgB nL2r8qy0OSkZAEOso18jddAmKd1VD1lg7LRNl7oFgTM/fo1JEWTW+EOTmneDdWNxSU4/ nOA/TKr0T9atR7m0J2DlTZ6mka6gy23tK6uszy+nv/JuI4uaisaotRKWQKO6R5ucUNK/ yU1VfKO5W2ehoj4BR/Tta0BUjCKxY9+AdmmCk//vnXgsFmOJQKn+Oc8Xn1/sWrPYVu25 CTi7ZDzNLgpHdPUx1JxfffATeuxnLxF96kQxM7V9mfTICpP+8Dpc8dHX+JU7pO5dV9cw zaTA== X-Gm-Message-State: AOAM531MrASYA6M2NnatbIICSALp0QKOFE8CDMH1SxjTa91ZmS/rHG1O ueH+9+7WcGAN+6t9tjvMaOeLf7qRORu9siv0ki0fZFvFJ26w5qXIKV8WTwxSxv8CSdiEQMJBqCY aQhWDhZrUTKBKqG4nH57a4e7iMQJf47zjhs3yIhVl2lYppxShuo0iYgyimq1Z X-Received: by 2002:a05:6000:114b:: with SMTP id d11mr26491494wrx.318.1614096241660; Tue, 23 Feb 2021 08:04:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRr3LJzVM9FzVJQAchw4Jlq7N/i6MPYR9waJUvi9eTRNrar6gW/Kro3j76LDdlYMCpNOvvsA== X-Received: by 2002:a05:6000:114b:: with SMTP id d11mr26491476wrx.318.1614096241521; Tue, 23 Feb 2021 08:04:01 -0800 (PST) Date: Tue, 23 Feb 2021 11:03:59 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 08/17] checkpatch: don't emit warning on newly created acpi data files Message-ID: <20210223160144.1507082-9-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Newly created acpi data files(tests/data/acpi/) cause false positive warning. If file names are acpi expected file, don't emit warning. Fixes: e625ba2a41 ("checkpatch: fix acpi check with multiple file name") Signed-off-by: Isaku Yamahata Message-Id: <6899f9ad54cab8e7deca94ff0eeab641680e2b5e.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- scripts/checkpatch.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7f194c842b..8f7053ec9b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1530,7 +1530,9 @@ sub process { ($line =3D~ /^(?:new|deleted) file mode\s*\d+\s*$/ || $line =3D~ /^rename (?:from|to) [\w\/\.\-]+\s*$/ || ($line =3D~ /\{\s*([\w\/\.\-]*)\s*\=3D\>\s*([\w\/\.\-]*)\s*\}/ && - (defined($1) || defined($2))))) { + (defined($1) || defined($2)))) && + !(($realfile ne '') && + ($realfile eq $acpi_testexpected))) { $reported_maintainer_file =3D 1; WARN("added, moved or deleted file(s), does MAINTAINERS need updating?\= n" . $herecurr); } --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096894; cv=none; d=zohomail.com; s=zohoarc; b=mMOGjAya9LsuVZCKPhLeuBgv9Bl1Ch3c2g/rhSx9t1Ws9RuXfUbytb1eO6f3n/vvlsCKRb69CMGWrTIHrKcWn+C2DCh8RJBVSWx+zwuub1niyRsREySCuLi4g+tjnh0D7MIe1XlDG7JUG0x9HrzYbVBcoE/xnq9f1w6MBHkATYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096894; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=07i4A4LgHGvFyYVn0cL1PlwUR1Iqv8XV1F3PqdDQFLI=; b=nQPOwcbwlDeXw7DLTckjiyGuiW107bisrNF7n+XyY5w5sO++CUKGLicQ9K+S/+aiWOaTMOAz9Y0Jv6CNiHLz6EB+BO4LetuWVMM+rRC1RTHEsXkxBXt5Uj1QGtYXJJHSrvpRGX11t2/wSXNEDs/0B0VjoQiziW2BPFDcfg+rZ0k= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096894354376.3254649805788; Tue, 23 Feb 2021 08:14:54 -0800 (PST) Received: from localhost ([::1]:54576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaKr-0000pN-BI for importer@patchew.org; Tue, 23 Feb 2021 11:14:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaD0-0007Wp-HQ for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:21221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCy-0004vw-Jw for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:46 -0500 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-419-kXrUsuntPv6s1E11jEuwKw-1; Tue, 23 Feb 2021 11:04:05 -0500 Received: by mail-wr1-f70.google.com with SMTP id d7so7489044wri.23 for ; Tue, 23 Feb 2021 08:04:05 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id f8sm3107714wml.20.2021.02.23.08.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096403; 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=07i4A4LgHGvFyYVn0cL1PlwUR1Iqv8XV1F3PqdDQFLI=; b=OK8X/z3clajW/IrnRBTBHDO7om0DCU0OmXv3a4tLoyDL5JF/8BP9qqYu3GE2U8JYgNW+UU Eo2ZlrgW7tURuoceORxktc6+/h/hWL6OoA2NP9O3djsyExn/1bw7xzcEAHh1AFrmHy9YsQ lAQ/PHzqimZpYnkTxoWbQt4Rul4g+uk= X-MC-Unique: kXrUsuntPv6s1E11jEuwKw-1 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=07i4A4LgHGvFyYVn0cL1PlwUR1Iqv8XV1F3PqdDQFLI=; b=Lje3si3CqlA1gU7ApRkajJBx1kpMqnwMjovyvxo4Qav+kjhR+5LEwdLRgEGAZziHlu TKC3HQlG2VMbJZngZJtryBBw1Y+SIBZf4SC5AjZoyPEXNv7qlLa9NvyA9gFbUIiXykj9 BGL08yf2GJMNlxB2AThQwaZcln2mfg8ipED7KUqgNAuQgsKAK7/DeRMJvMXBD6Ebs19f YwsgTq7Sl7N0cqstmafqvnDUXEUvjZbI/jeWFCtQPI6BUq13ow083ZcOSjY/YhYXld42 2rBPWjW5Zded9jbahZovaotQuKzKqwuUR9NN+P6hj1SS2a0uzeRbxWbM2rWb06ZbrcVA xDug== X-Gm-Message-State: AOAM533rwCWt+videEKFuZzL4JUHpVs5k4VKMWLqsGL1CIJ5eaSkVUzg OxsVBQLZcNXp86g+71B7uDdeRLAp+17tXRXQvncKU/ZkA10gEBIRPvDuUVM01sAl3A8rXQB7Gbc 2xa9OrqfPo2zo6ZrWVNFs6mAPiZKXn+y6bjLUxcA6m+jAhy0g2yDUtWY76Wc/ X-Received: by 2002:a1c:a98c:: with SMTP id s134mr23980439wme.174.1614096244348; Tue, 23 Feb 2021 08:04:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkzOIGhqxOaHFTfw1LqMGxEnsF9n2UysuxPkpSwj4po5Xm2sXO1S+4rzBH6CFDO2jQba48LQ== X-Received: by 2002:a1c:a98c:: with SMTP id s134mr23980407wme.174.1614096244139; Tue, 23 Feb 2021 08:04:04 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:01 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 09/17] qtest: update tests/qtest/bios-tables-test-allowed-diff.h Message-ID: <20210223160144.1507082-10-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata The following tests will modify acpi tables. prepare qtests to allow acpi table change. add new tables for new tests. - tests/data/acpi/pc/DSDT.nohpet - tests/data/acpi/pc/FACP.nosmm - tests/data/acpi/q35/DSDT.nohpet - tests/data/acpi/q35/FACP.nosmm Acked-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 14 ++++++++++++++ tests/data/acpi/pc/DSDT.nohpet | 0 tests/data/acpi/pc/FACP.nosmm | 0 tests/data/acpi/q35/DSDT.nohpet | 0 tests/data/acpi/q35/FACP.nosmm | 0 5 files changed, 14 insertions(+) create mode 100644 tests/data/acpi/pc/DSDT.nohpet create mode 100644 tests/data/acpi/pc/FACP.nosmm create mode 100644 tests/data/acpi/q35/DSDT.nohpet create mode 100644 tests/data/acpi/q35/FACP.nosmm diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..95592459c5 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,15 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/FACP.nosmm", +"tests/data/acpi/pc/DSDT.nohpet", +"tests/data/acpi/q35/DSDT", +"tests/data/acpi/q35/DSDT.tis", +"tests/data/acpi/q35/DSDT.bridge", +"tests/data/acpi/q35/DSDT.mmio64", +"tests/data/acpi/q35/DSDT.ipmibt", +"tests/data/acpi/q35/DSDT.cphp", +"tests/data/acpi/q35/DSDT.memhp", +"tests/data/acpi/q35/DSDT.numamem", +"tests/data/acpi/q35/FACP.nosmm", +"tests/data/acpi/q35/DSDT.nohpet", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.acpihmat", diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/pc/FACP.nosmm b/tests/data/acpi/pc/FACP.nosmm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.noh= pet new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/FACP.nosmm b/tests/data/acpi/q35/FACP.nosmm new file mode 100644 index 0000000000..e69de29bb2 --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096423; cv=none; d=zohomail.com; s=zohoarc; b=WF41bek3O/uQ5io06GURVXxJrzbKBpQFn/pr99eDFdxBEIyTtlStTHbrXGRHWV0CyCmH1bK0nJbE+mk1RsXSxG8keJtsJ56cvPPigVfJQzDCWp/DJJkGWhVjCN9eIogWi0Lvr4jgdu/T0TpC/PHP8H5RcULy1+eqinWnY7alHg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096423; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QGUvhmdG6O5IIMoBZ5cpMOKjDi8vDKXNdkm4Y1e5d6k=; b=S1yH8wRrgm2bR1s8eeSphXqmB01pzNHbnPY1GzFUnShT+a1DCDmcIzuBAvsWWIP9+9mesz+QOA7gUpNf8b2pIQHdU+ZHeeAPNCiBbqkHZdHC4KaSPLM+ywgzzMhk68A+GDtaE87j2m9QfI6JnSJPbg2801RwZ6R6TL/sOw02GxY= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096423209944.4823260238912; Tue, 23 Feb 2021 08:07:03 -0800 (PST) Received: from localhost ([::1]:57992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaDG-0007Lv-3K for importer@patchew.org; Tue, 23 Feb 2021 11:07:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaBe-00062i-4G for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaBa-0004Fu-FN for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:20 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-36-pcD6x91hOcOQ3dC9mLSoUQ-1; Tue, 23 Feb 2021 11:04:09 -0500 Received: by mail-wm1-f71.google.com with SMTP id p8so1371739wmq.7 for ; Tue, 23 Feb 2021 08:04:09 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id c9sm3120606wmb.33.2021.02.23.08.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096317; 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=QGUvhmdG6O5IIMoBZ5cpMOKjDi8vDKXNdkm4Y1e5d6k=; b=ZPiqOYX3n1+/r3LZrg1VM4gQbgi5T8wQDTEde2394hhrN9h5ANvWhhCOFCsW/RLRnwdaWT EebLPqYB9ePnQSZBcpLLl16ePZ3e5l6IS67UrtMuxljBkw9q0gRZRcrSrGfvBLQd1b4nLB f9gJ2rO4Gnb2N6VB4865VMISveGYCDI= X-MC-Unique: pcD6x91hOcOQ3dC9mLSoUQ-1 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=QGUvhmdG6O5IIMoBZ5cpMOKjDi8vDKXNdkm4Y1e5d6k=; b=CuNyVVsQdyYPWL5n8LeY2KgPsQxKEFzksqyaE1geZ9iUg8GWQbBWO7PeryXMahV+IG 44uMi5DPqI3OBDmcaQzV8tpcln3pEZdgV0DCUsVNl6Z+JUmytu6LorJIep8/8fstM6j8 AWwPeq+Omf164kyTqKijFDtoKsDROg8G4/bR2dW37j/SCwqhRHbWpY9y7FlRcUjivPg1 xfPuFKTQEuuzWNC2KEoogEuHBXkT9ojoBmLaASRojw5uB3O2wVTxUu9eGDx1E4xFiHS0 8WjvRBnVxV1Kh2qgPU4q7MQTHlkegiobJNVAUovFQ+NiUVZZOg2dnAHpE6vHzHFKKieQ vqKQ== X-Gm-Message-State: AOAM5339Qi8H/n+d3iR8uYMbp7aRxz/4bhhYX8ee3sZz4LwQOcDhHPvT fyqaL3TJe+u2u5hEdi5xZWVSijYbbFBaRTxRSuIhF3q/ttoMnNLr0TpezmkHwjysRJFwBLSgwT+ XKOKiHHbdD6XD5fs+21E4VxkqlCxni7B3jvMqubFlP36QqluRHNKtzDU181BM X-Received: by 2002:adf:d229:: with SMTP id k9mr21117312wrh.112.1614096246737; Tue, 23 Feb 2021 08:04:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuE9AeAYCRhReD5wNTvH0LWXs9T9PkaaLenvvJh9sIHG5yTD9SjbMHQ8UM6e/nLTRoMJ9WGQ== X-Received: by 2002:adf:d229:: with SMTP id k9mr21117292wrh.112.1614096246601; Tue, 23 Feb 2021 08:04:06 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 10/17] ich9, piix4: add property, smm-compat, to keep compatibility of SMM Message-ID: <20210223160144.1507082-11-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Igor Mammedov , Aurelien Jarno 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata The following patch will introduce incompatible behavior of SMM. Introduce a property to keep the old behavior for compatibility. To enable smm compat, use "-global ICH9-LPC.smm-compat=3Don" or "-global PIIX4_PM.smm-compat=3Don" Suggested-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: <47254ae0b8c6cc6945422978b6b2af2d213ef891.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- include/hw/acpi/ich9.h | 1 + hw/acpi/piix4.c | 2 ++ hw/isa/lpc_ich9.c | 1 + 3 files changed, 4 insertions(+) diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index 54571c77e0..df519e40b5 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -59,6 +59,7 @@ typedef struct ICH9LPCPMRegs { uint8_t disable_s4; uint8_t s4_val; uint8_t smm_enabled; + bool smm_compat; bool enable_tco; TCOIORegs tco_regs; } ICH9LPCPMRegs; diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 669be5bbf6..30dd9b2309 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -74,6 +74,7 @@ struct PIIX4PMState { qemu_irq irq; qemu_irq smi_irq; int smm_enabled; + bool smm_compat; Notifier machine_ready; Notifier powerdown_notifier; =20 @@ -642,6 +643,7 @@ static Property piix4_pm_properties[] =3D { use_acpi_root_pci_hotplug, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), + DEFINE_PROP_BOOL("smm-compat", PIIX4PMState, smm_compat, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index d3145bf014..3963b73520 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -775,6 +775,7 @@ static const VMStateDescription vmstate_ich9_lpc =3D { =20 static Property ich9_lpc_properties[] =3D { DEFINE_PROP_BOOL("noreboot", ICH9LPCState, pin_strap.spkr_hi, true), + DEFINE_PROP_BOOL("smm-compat", ICH9LPCState, pm.smm_compat, false), DEFINE_PROP_BIT64("x-smi-broadcast", ICH9LPCState, smi_host_features, ICH9_LPC_SMI_F_BROADCAST_BIT, true), DEFINE_PROP_BIT64("x-smi-cpu-hotplug", ICH9LPCState, smi_host_features, --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096584; cv=none; d=zohomail.com; s=zohoarc; b=GHWBEndW4B49BB+L0eECFcgXq/0FrCz/H/bgfeF7e5ziGYqgXn2kg/EFB28tM6GDf+N63q2whA6Hr8reOvnyMiK3oXLlIFJrOgSnqu/iDHLUTeYBChNunMxpH/OoaEWCpN3BFreY1gH3Iybp/Xa6cZtgvg6Hbqz1ByOG7km5Xbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096584; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NrrvOn2GdC903n9L0Q1WcYL9sqmxTBW1FrCpeOujpdA=; b=WMyZPWrLRRKsEsrv4saveA4auZ5Xk/9iyZTWDW/GN8AHXjXBPTcpnO4Z4jdMVrYgAro9sqeyVt+L3wK+ODtH+BWTxnNsZtQ/k6V2hjOq2p70jjDId1GQB6JeNbRWLEzPJwMTOx4EA21QznCnY5rCm2uDfQSHb5HA+dFHu05G79g= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096584473243.564238636592; Tue, 23 Feb 2021 08:09:44 -0800 (PST) Received: from localhost ([::1]:40276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaFr-0003GA-9p for importer@patchew.org; Tue, 23 Feb 2021 11:09:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaDM-0008Nw-P5 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaDK-00055f-L7 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:08 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-lmt0FB8JOneMySmi3INsTQ-1; Tue, 23 Feb 2021 11:04:13 -0500 Received: by mail-wm1-f72.google.com with SMTP id 13so827186wmk.0 for ; Tue, 23 Feb 2021 08:04:12 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id d29sm26593645wra.51.2021.02.23.08.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096426; 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=NrrvOn2GdC903n9L0Q1WcYL9sqmxTBW1FrCpeOujpdA=; b=D/r16JJVdTgzmwwZLbGPW2ART9FcG7AUYv1xtxzPxEvlE3c5hClh/EzuSLzaztvGRZL8ma dMaPccwFf5VTbSRt2BgO8YI1vqFDLdVRP0jhPwsJaXkgGzXhH0gYI3OjZ06Lk9nWRo7BJ3 eL1mrZq2Pnc/kmaf6kpqRZf0S0AYbKo= X-MC-Unique: lmt0FB8JOneMySmi3INsTQ-1 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=NrrvOn2GdC903n9L0Q1WcYL9sqmxTBW1FrCpeOujpdA=; b=VlW/0xYd1AnMFIsK5kTnCeuZyrgzqG1bXBebMt8oUwWAuIZKjD5/lxNJk9GvIlqVRI qcEMh1MDY7sEp8z7/IKbUP7PSBhQWsiSkRUxV0/p3RlgDgd/rwaJgKd4cHZecqYhaNfJ V+JC/VE+QChQqSg7WuFOhEte97AHVJYEphgNZQ35p/eWKLVSqqAC6ATCFsPt8GDbTqWR 4edJ2Fe/1ly1wrhv07HPu+GRUuKl/ALGBJAsQ/JbMItyLy9Az5kGz0ZlVjSLLTlrpP2+ 48j5N91QlegFxqxBogCG1bcYVtNJofOIy46pWOu/L/TAIgZQh9LSoZqoue+/nJrhULwk cjeQ== X-Gm-Message-State: AOAM530aN7oi+UmB4bM8vNPSLl31OJX+Zfdf0TLH2sjxonkMl6x3J4Z6 X+cou7qgiRABzLiQuoD8CzHrJhA3O61QpRyVvNKLSm0UQwA3TdfhAnMNBJ52ybJWQPRiTphyw1K VTyaNqFCQ1MpCevfw8SDlTWArzj0er+rcMHYHyQ25uWUWnVCsxc/MHsUBSPK9 X-Received: by 2002:adf:fe8c:: with SMTP id l12mr24396560wrr.217.1614096249798; Tue, 23 Feb 2021 08:04:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLHVKg16w0boMAQctQSwzyNRoVN2kay1bhy6Kn1H2bMpMS7ohLyR5swIwIX3KiidC8JfsyCg== X-Received: by 2002:adf:fe8c:: with SMTP id l12mr24396524wrr.217.1614096249565; Tue, 23 Feb 2021 08:04:09 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:06 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 11/17] acpi/core: always set SCI_EN when SMM isn't supported Message-ID: <20210223160144.1507082-12-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Eduardo Habkost , Huacai Chen , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Igor Mammedov , Aurelien Jarno 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata If SMM is not supported, ACPI fixed hardware doesn't support legacy-mode. ACPI-only platform. Where SCI_EN in PM1_CNT register is always set. The bit tells OS legacy mode(SCI_EN cleared) or ACPI mode(SCI_EN set). With the next patch (setting fadt.smi_cmd =3D 0 when smm isn't enabled), guest Linux tries to switch to ACPI mode, finds smi_cmd =3D 0, and then fails to initialize acpi subsystem. This patch proactively fixes it. This patch changes guest ABI. To keep compatibility, use "smm-compat" introduced by earlier patch. If the property is true, disable new behavior. ACPI spec 4.8.10.1 PM1 Event Grouping PM1 Eanble Registers > For ACPI-only platforms (where SCI_EN is always set) Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: <500f62081626997e46f96377393d3662211763a8.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/acpi.h | 4 +++- hw/acpi/core.c | 11 ++++++++++- hw/acpi/ich9.c | 2 +- hw/acpi/piix4.c | 3 ++- hw/core/machine.c | 5 ++++- hw/isa/vt82c686.c | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 22b0b65bb2..9e8a76f2e2 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -128,6 +128,7 @@ struct ACPIPM1CNT { MemoryRegion io; uint16_t cnt; uint8_t s4_val; + bool acpi_only; }; =20 struct ACPIGPE { @@ -163,7 +164,8 @@ void acpi_pm1_evt_init(ACPIREGS *ar, acpi_update_sci_fn= update_sci, =20 /* PM1a_CNT: piix and ich9 don't implement PM1b CNT. */ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, - bool disable_s3, bool disable_s4, uint8_t s4_val); + bool disable_s3, bool disable_s4, uint8_t s4_val, + bool acpi_only); void acpi_pm1_cnt_update(ACPIREGS *ar, bool sci_enable, bool sci_disable); void acpi_pm1_cnt_reset(ACPIREGS *ar); diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 7170bff657..1e004d0078 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -579,6 +579,10 @@ void acpi_pm1_cnt_update(ACPIREGS *ar, bool sci_enable, bool sci_disable) { /* ACPI specs 3.0, 4.7.2.5 */ + if (ar->pm1.cnt.acpi_only) { + return; + } + if (sci_enable) { ar->pm1.cnt.cnt |=3D ACPI_BITMASK_SCI_ENABLE; } else if (sci_disable) { @@ -608,11 +612,13 @@ static const MemoryRegionOps acpi_pm_cnt_ops =3D { }; =20 void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, - bool disable_s3, bool disable_s4, uint8_t s4_val) + bool disable_s3, bool disable_s4, uint8_t s4_val, + bool acpi_only) { FWCfgState *fw_cfg; =20 ar->pm1.cnt.s4_val =3D s4_val; + ar->pm1.cnt.acpi_only =3D acpi_only; ar->wakeup.notify =3D acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); =20 @@ -638,6 +644,9 @@ void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *pare= nt, void acpi_pm1_cnt_reset(ACPIREGS *ar) { ar->pm1.cnt.cnt =3D 0; + if (ar->pm1.cnt.acpi_only) { + ar->pm1.cnt.cnt |=3D ACPI_BITMASK_SCI_ENABLE; + } } =20 /* ACPI GPE */ diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 5ff4e01c36..853447cf9d 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -282,7 +282,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->disable_s3, pm->disable= _s4, - pm->s4_val); + pm->s4_val, !pm->smm_compat && !smm_enabled); =20 acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN); memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 30dd9b2309..1efc0ded9f 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -497,7 +497,8 @@ static void piix4_pm_realize(PCIDevice *dev, Error **er= rp) =20 acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); - acpi_pm1_cnt_init(&s->ar, &s->io, s->disable_s3, s->disable_s4, s->s4_= val); + acpi_pm1_cnt_init(&s->ar, &s->io, s->disable_s3, s->disable_s4, s->s4_= val, + !s->smm_compat && !s->smm_enabled); acpi_gpe_init(&s->ar, GPE_LEN); =20 s->powerdown_notifier.notify =3D piix4_pm_powerdown_req; diff --git a/hw/core/machine.c b/hw/core/machine.c index 970046f438..4386f57b5c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -36,7 +36,10 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" =20 -GlobalProperty hw_compat_5_2[] =3D {}; +GlobalProperty hw_compat_5_2[] =3D { + { "ICH9-LPC", "smm-compat", "on"}, + { "PIIX4_PM", "smm-compat", "on"}, +}; const size_t hw_compat_5_2_len =3D G_N_ELEMENTS(hw_compat_5_2); =20 GlobalProperty hw_compat_5_1[] =3D { diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 5db9b1706c..05d084f698 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -190,7 +190,7 @@ static void via_pm_realize(PCIDevice *dev, Error **errp) =20 acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); - acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2); + acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2, false); } =20 typedef struct via_pm_init_info { --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614097350; cv=none; d=zohomail.com; s=zohoarc; b=NFV9FUToRq0TcJnY99yC07elj+j2cmnHfhuP9oIyS5q845a4rrVJ5daWuj1Io+qMfJhac6bXSRgWEViF/iDJK5X43UYlZOOk31nS/aXyfEjT3Pm0Ji2ZMF02sOOvhcfhD5ITSlp1fW/VhL4MZiw4QxXBtbaT2yvKY7MSAVQH7UE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614097350; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8shfiQzKMo3SCes8KTF6skOuPdfQ+1UY9IH2UX4kYd0=; b=HNt9WzyuWmfDlWLT/ufzEOvEi9w51iv6IM50BPK7wJg/VX2aFVNjcp8bSz4eQxb9K+kthzr+azVCXT3IylOHRNOYlfK7XcGyuFw9hncPnlCO/tXKrrjAQ6nzkNlg0kqHiMeMyP03a59II+NlSbHyCVfrnfmdpAwFm8KUZOy7weY= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614097349845165.46990912123238; Tue, 23 Feb 2021 08:22:29 -0800 (PST) Received: from localhost ([::1]:41924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaSB-0007Z4-SR for importer@patchew.org; Tue, 23 Feb 2021 11:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaEi-0001wc-H7 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:08:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaEg-0005f9-Bi for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:08:32 -0500 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-68-Ir4-eQFdNqiQ2KSJATFjGQ-1; Tue, 23 Feb 2021 11:05:40 -0500 Received: by mail-wr1-f71.google.com with SMTP id b7so2843589wrv.7 for ; Tue, 23 Feb 2021 08:05:39 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id c2sm32838399wrx.70.2021.02.23.08.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096509; 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=8shfiQzKMo3SCes8KTF6skOuPdfQ+1UY9IH2UX4kYd0=; b=AG0mNAoiFWUuUrzsqBRBcKojfF1CvNtmMb/SSpTOGvfOi+aPEXd+jLEIWq7jci4cAzoNON 2qPTE0Di3vS7g0rAwLVrcSW3yZszqlQobjZ2xyVbiJwM5oXymMEMbtJj9gf+kiYCx5Xclh QZvnlWUyXctbwk89R0ppvuXUF7CdEqM= X-MC-Unique: Ir4-eQFdNqiQ2KSJATFjGQ-1 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=8shfiQzKMo3SCes8KTF6skOuPdfQ+1UY9IH2UX4kYd0=; b=ip7lsmh7bZc5iClHxErdMOMlehkLdwReE5JyVNyoV/7TGs3nLj2WEYDyhJBZ2lAAPu kYiyS7bLzDEPycWQwbAr4p75tfQE8zVWZC0ZNldM6yUsCGsSBlgp4Xcu0l+vjsu2L9l/ SKtqxhIHMHWGaRA/f6OoR9VvYCS5qZI32jiV+86pv0G2eujiyhHsQa1n5AtdUO36/+kG A2lzSU/sv4r5l5DdF9CKt/a9HTb0M2zXobfYx4AD5i9Ge6WtwZeRAQnsY4/g9W4PpNo8 J3YrtHfOuEmeqX6x5TTTVI/PgT5auWs7+w6pyg9l0HPPJKDuiSQZqTMs1AoV66XdhQfr GicA== X-Gm-Message-State: AOAM530RI4wMmtKndQ6bZx+meeJag2li6yKS5LqPNoSAQMYTJ0C31L9n EJtWN8ZdITJdiTcXmvYxtsWx1v/1TX+kQxOtN25iCakbUjnKftRkZZBGHggkc1mlCCdQn2Ihl+Q 8HCqwQpSZv6UHWMcLvPdNNJXLvaAfuMQT+vyA0kDcaZqNPOWnfnngnClRi/th X-Received: by 2002:adf:ec86:: with SMTP id z6mr18289068wrn.359.1614096338304; Tue, 23 Feb 2021 08:05:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyaknO5UGohw0rRyT4OBR2DaBURfpFDZjW+hfanmXeAaCd7d6XKmLVElN9FqId5zWzrtp/QZA== X-Received: by 2002:adf:ec86:: with SMTP id z6mr18289040wrn.359.1614096338079; Tue, 23 Feb 2021 08:05:38 -0800 (PST) Date: Tue, 23 Feb 2021 11:05:35 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 12/17] acpi: set fadt.smi_cmd to zero when SMM is not supported Message-ID: <20210223160144.1507082-13-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Eduardo Habkost , Richard Henderson , Igor Mammedov , Paolo Bonzini 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata >From table 5.9 SMI_CMD of ACPI spec > This field is reserved and must be zero on system > that does not support System Management mode. When smm is not enabled, set it to zero to comform to the spec. When -machine smm=3Doff is passed, the change to FACP is as follows. @@ -1,46 +1,46 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180105 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * - * Disassembly of tests/data/acpi/q35/FACP, Fri Feb 5 16:57:04 2021 + * Disassembly of /tmp/aml-1OQYX0, Fri Feb 5 16:57:04 2021 * * ACPI Data Table [FACP] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "FACP" [Fixed ACPI Descr= iption Table (FADT)] [004h 0004 4] Table Length : 000000F4 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 1F +[009h 0009 1] Checksum : D6 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCFACP" [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 4] FACS Address : 00000000 [028h 0040 4] DSDT Address : 00000000 [02Ch 0044 1] Model : 01 [02Dh 0045 1] PM Profile : 00 [Unspecified] [02Eh 0046 2] SCI Interrupt : 0009 -[030h 0048 4] SMI Command Port : 000000B2 -[034h 0052 1] ACPI Enable Value : 02 -[035h 0053 1] ACPI Disable Value : 03 +[030h 0048 4] SMI Command Port : 00000000 +[034h 0052 1] ACPI Enable Value : 00 +[035h 0053 1] ACPI Disable Value : 00 [036h 0054 1] S4BIOS Command : 00 [037h 0055 1] P-State Control : 00 [038h 0056 4] PM1A Event Block Address : 00000600 [03Ch 0060 4] PM1B Event Block Address : 00000000 [040h 0064 4] PM1A Control Block Address : 00000604 [044h 0068 4] PM1B Control Block Address : 00000000 [048h 0072 4] PM2 Control Block Address : 00000000 [04Ch 0076 4] PM Timer Block Address : 00000608 [050h 0080 4] GPE0 Block Address : 00000620 [054h 0084 4] GPE1 Block Address : 00000000 [058h 0088 1] PM1 Event Block Length : 04 [059h 0089 1] PM1 Control Block Length : 02 [05Ah 0090 1] PM2 Control Block Length : 00 [05Bh 0091 1] PM Timer Block Length : 04 [05Ch 0092 1] GPE0 Block Length : 10 [05Dh 0093 1] GPE1 Block Length : 00 Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: <09ed791ef77fda2b194100669cbc690865c9eb52.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b9190b924a..49aef4ebd1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -139,6 +139,14 @@ const struct AcpiGenericAddress x86_nvdimm_acpi_dsmio = =3D { static void init_common_fadt_data(MachineState *ms, Object *o, AcpiFadtData *data) { + X86MachineState *x86ms =3D X86_MACHINE(ms); + /* + * "ICH9-LPC" or "PIIX4_PM" has "smm-compat" property to keep the old + * behavior for compatibility irrelevant to smm_enabled, which doesn't + * comforms to ACPI spec. + */ + bool smm_enabled =3D object_property_get_bool(o, "smm-compat", NULL) ? + true : x86_machine_is_smm_enabled(x86ms); uint32_t io =3D object_property_get_uint(o, ACPI_PM_PROP_PM_IO_BASE, N= ULL); AmlAddressSpace as =3D AML_AS_SYSTEM_IO; AcpiFadtData fadt =3D { @@ -159,12 +167,16 @@ static void init_common_fadt_data(MachineState *ms, O= bject *o, .rtc_century =3D RTC_CENTURY, .plvl2_lat =3D 0xfff /* C2 state not supported */, .plvl3_lat =3D 0xfff /* C3 state not supported */, - .smi_cmd =3D ACPI_PORT_SMI_CMD, + .smi_cmd =3D smm_enabled ? ACPI_PORT_SMI_CMD : 0, .sci_int =3D object_property_get_uint(o, ACPI_PM_PROP_SCI_INT, NUL= L), .acpi_enable_cmd =3D - object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL= ), + smm_enabled ? + object_property_get_uint(o, ACPI_PM_PROP_ACPI_ENABLE_CMD, NULL= ) : + 0, .acpi_disable_cmd =3D - object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NUL= L), + smm_enabled ? + object_property_get_uint(o, ACPI_PM_PROP_ACPI_DISABLE_CMD, NUL= L) : + 0, .pm1a_evt =3D { .space_id =3D as, .bit_width =3D 4 * 8, .address = =3D io }, .pm1a_cnt =3D { .space_id =3D as, .bit_width =3D 2 * 8, .address =3D io + 0x04 }, --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096591; cv=none; d=zohomail.com; s=zohoarc; b=g2HOgesHTsQMcwUBo4G6NgPvmcCCnnxk1Q5+IvRlTBpF3HFDnc9QeMPaGqcLSihWij8+0ODe7MDVZEK72NuqgSVBPH4pwb8uctDDp4g4/3hep4qy1wf91dADgmCBvIkPxqSiBToiLsTfJLFOQsWEK2mLWaBpZ7yGthW2JsoeJZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096591; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mJz72UAWY4HQvxcH6TYo9OVXwWF/s6Ucgkhah6WrpZk=; b=FUPpIrD4P26btukQ8nCiYQHXfraBLyFhqANCHl3vc0/Bht1loX2lH8xwSsckOd9tt12J1Jxri8jxBlkTZvLLCfa1REQsdsy3Vu7MktdkZN5vzVquQfsZhShr/6sHvu3lJoCtP78TjuynVVbYpgItglnvsVoIXZddDaWgRppdm/E= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096591363590.3911676560882; Tue, 23 Feb 2021 08:09:51 -0800 (PST) Received: from localhost ([::1]:41000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaFy-0003Xk-75 for importer@patchew.org; Tue, 23 Feb 2021 11:09:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaCb-0006pW-Q4 for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaCZ-0004lj-UB for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:06:21 -0500 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-284-CqwoX504MDucp_EkY8Qz3g-1; Tue, 23 Feb 2021 11:04:16 -0500 Received: by mail-wm1-f70.google.com with SMTP id o18so823323wmq.2 for ; Tue, 23 Feb 2021 08:04:16 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id b6sm18497395wrq.56.2021.02.23.08.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096379; 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=mJz72UAWY4HQvxcH6TYo9OVXwWF/s6Ucgkhah6WrpZk=; b=gq9nfeNhGHTAfs8YF+0LEfSETxCM5aX7h7gxzHgv8xQho38eDpIqaPOjdsh9NIC9GlR3sQ Y/fficM/hEzyBI7xB9qUyx97EmxOem8ORH6xvlV7X6SuHTHtkEBb283ZO4fLDP/26+MNoD Cg/LBxBEqsf21QTE1fS7Pwr3m96xmIY= X-MC-Unique: CqwoX504MDucp_EkY8Qz3g-1 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=mJz72UAWY4HQvxcH6TYo9OVXwWF/s6Ucgkhah6WrpZk=; b=l7n3v57yvb4VCBriJMS21kaBA2prSOGQqOr6H2CCMVD5pwpuAAjCtpxZAojFr+IDy1 IEFFUYLRgzOsaTREHs4eIyY/YtoRPLjqGvWixSnPFG34DVNQ/hr5iw6sO8TsvUlCWKMX 6bdufv6JYMMMVr9BZKk71FpxlHlxqW2s7QlBjfYCrgkxMpLI7iygcJCLaFqqXnZbjpfJ aXRrRtcS84fFsABhm0otXoGn7I4uIdwGulutYIwQrqW7HSN2/SN9tMvqiMQkbDLCuNmk rmGCCrlIW3UJ9URda5Gyrj+PXDVd3NcdZBfbAHQodtJugdKO1/OR+ZtTBpCx3zn1nxCn AEJw== X-Gm-Message-State: AOAM532m0vq//BxAX6GrfEa/41q8lbVOzzd6UHZaM64MPoXyQvyybg+S KJjPU91wnDSWkhbAfTjJ4+oOfqQAnIVHqNpa2huyYU192tYpS5/LV+OcL4ODklnqA/Lu0lcWzaF Pqr+wryMGNGL8Ib0CMByo2+kPN3x1PgYrQdGYtzSCO3/o/85tpJdrSn3ott2v X-Received: by 2002:a05:600c:19cf:: with SMTP id u15mr25603832wmq.139.1614096254689; Tue, 23 Feb 2021 08:04:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpVPuQvXfSB/jcdllQCELDRS5s+uHjvm0AUju1Zv8XAPXIkHkTYL4+OVVogmhvrfORLa1/bA== X-Received: by 2002:a05:600c:19cf:: with SMTP id u15mr25603806wmq.139.1614096254476; Tue, 23 Feb 2021 08:04:14 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:12 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 13/17] acpi: add test case for smm unsupported -machine smm=off Message-ID: <20210223160144.1507082-14-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: <22f774a51255af1608b07b00b257af426adcf4ab.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 76 ++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 77053975aa..93d037c29d 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -973,6 +973,39 @@ static void test_acpi_piix4_tcg_memhp(void) free_test_data(&data); } =20 +static void test_acpi_piix4_tcg_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_PC; + data.variant =3D ".nosmm"; + test_acpi_one("-machine smm=3Doff", &data); + free_test_data(&data); +} + +static void test_acpi_piix4_tcg_smm_compat(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_PC; + data.variant =3D ".smm-compat"; + test_acpi_one("-global PIIX4_PM.smm-compat=3Don", &data); + free_test_data(&data); +} + +static void test_acpi_piix4_tcg_smm_compat_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_PC; + data.variant =3D ".smm-compat-nosmm"; + test_acpi_one("-global PIIX4_PM.smm-compat=3Don -machine smm=3Doff", &= data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_numamem(void) { test_data data; @@ -985,6 +1018,39 @@ static void test_acpi_q35_tcg_numamem(void) free_test_data(&data); } =20 +static void test_acpi_q35_tcg_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_Q35; + data.variant =3D ".nosmm"; + test_acpi_one("-machine smm=3Doff", &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_smm_compat(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_Q35; + data.variant =3D ".smm-compat"; + test_acpi_one("-global ICH9-LPC.smm-compat=3Don", &data); + free_test_data(&data); +} + +static void test_acpi_q35_tcg_smm_compat_nosmm(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_Q35; + data.variant =3D ".smm-compat-nosmm"; + test_acpi_one("-global ICH9-LPC.smm-compat=3Don -machine smm=3Doff", &= data); + free_test_data(&data); +} + static void test_acpi_piix4_tcg_numamem(void) { test_data data; @@ -1445,6 +1511,16 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/memhp", test_acpi_q35_tcg_memhp); qtest_add_func("acpi/piix4/numamem", test_acpi_piix4_tcg_numamem); qtest_add_func("acpi/q35/numamem", test_acpi_q35_tcg_numamem); + qtest_add_func("acpi/piix4/nosmm", test_acpi_piix4_tcg_nosmm); + qtest_add_func("acpi/piix4/smm-compat", + test_acpi_piix4_tcg_smm_compat); + qtest_add_func("acpi/piix4/smm-compat-nosmm", + test_acpi_piix4_tcg_smm_compat_nosmm); + qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); + qtest_add_func("acpi/q35/smm-compat", + test_acpi_q35_tcg_smm_compat); + qtest_add_func("acpi/q35/smm-compat-nosmm", + test_acpi_q35_tcg_smm_compat_nosmm); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hma= t); --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096788; cv=none; d=zohomail.com; s=zohoarc; b=Z4qPJBL1BAJ8JfmTZ8aXrNE7fSSQrKQK0cTOo04Gvi6JlGx8tta3pJQWl3rBK5Z3kfWhJkLaQvz35yW+otGjEajQkyqiyFM6BwrRLg7xA3RZSpzJ0+5BiQWUu+xjNuE2FAWbNB1LcR/X83ad2fYS+792soDRrN4OUlDghPJ8OU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096788; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fxm1hlZ2PuTMxQprkqYrwHIEiC9hf+P1GMEbTuMEdZ0=; b=lJTusUN1NAnFTxfpEihvvmHj3wxaOsVGhvFuazxlgOirFarwzrOI8CU2HYTMSyUxcZvOwHwHShcwXnPsOI8S9spMcbobAvVcZ6TjqRHSWf+B+RY/glS73j8Mcv6zypLEq2wrrnRCI9SB/rmEHVr8D02sYCTyCKPmI7wNVfj3WKk= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096787624562.3036031062147; Tue, 23 Feb 2021 08:13:07 -0800 (PST) Received: from localhost ([::1]:48694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaJ8-0006on-ID for importer@patchew.org; Tue, 23 Feb 2021 11:13:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaFB-0002qK-Fi for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:09:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaF8-0005rS-PE for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:09:01 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-574-2RleMa8dMDKn5CUU_xsHXw-1; Tue, 23 Feb 2021 11:04:20 -0500 Received: by mail-wm1-f72.google.com with SMTP id r21so821034wmq.7 for ; Tue, 23 Feb 2021 08:04:19 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id y1sm32548008wrr.41.2021.02.23.08.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096538; 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=fxm1hlZ2PuTMxQprkqYrwHIEiC9hf+P1GMEbTuMEdZ0=; b=J2GFlonoeecS0Q5opn40VOG4VkZFO57qVxZdPPk/TDbMkCF/c42QxCtVzaXjKlKBzDCgai 9K7zlCeiViw8gXw1Z4EHe8bRc0pBd4riDwleZglDL/nzbPbVPMcUe2U1GlnjZi0Ksm/dbr 96YfZdnKfIVI1voXXcXBs26X8ca+5rI= X-MC-Unique: 2RleMa8dMDKn5CUU_xsHXw-1 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=fxm1hlZ2PuTMxQprkqYrwHIEiC9hf+P1GMEbTuMEdZ0=; b=huGiT1+2OM1k91ea6tJQO8Jh7WKK5pWF0n1krANvGEeeMW3VFGG8bheFeR1U6neZiZ pL6iT4Vm2yOvZrAVWny8hnh7TKjVN4sgjqPdXqs/9tbBqUHREf+5Ky1AJ6zk3hDFDMTb WL+VAfXdDHUQMJQQW6cUiaH99humqX3Ar6Hbg9gAyCVYmdWx5P2JgGL2nWn3onMPI/Yg ka2RNdWG/p+9zMPgbQqwD5/vUE+lHSZVsahgqJRPd49wdrEua5BrqtA3l3Uuf4h+ohZD D0K9KI5zFdwM7rlVYR3bcz3CfVV4DfDMFKNK41hDIQ3tSNa2AiE1K4epyCd8cv1D3m9f iX4A== X-Gm-Message-State: AOAM531XmeKssK2m+/XNQjyx89nWppcHm34NBmf01CEBoN+HpfRXrrfe GcojvyPjaV/yIXuaDG/mp6zI1A7nLj9ToO2jB7LmTL8UNQOyE5y4MDLRE6T+bPrG4TBMJ+jahGd xyoEiZunLXaqQy/a0iPL+ZjdFt/3bljeajuppQ7uaYDjsOnyRpaUwYc1WaOfo X-Received: by 2002:a5d:58ce:: with SMTP id o14mr25990839wrf.424.1614096257306; Tue, 23 Feb 2021 08:04:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyc3nD5iIdwFiIo0TnFcYJqo3PDubwEY4Bg3S+113+HqZ6RUZiR634GMulkcSEBUWzh/xKejw== X-Received: by 2002:a5d:58ce:: with SMTP id o14mr25990816wrf.424.1614096257096; Tue, 23 Feb 2021 08:04:17 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:14 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 14/17] hw/i386: declare ACPI mother board resource for MMCONFIG region Message-ID: <20210223160144.1507082-15-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Eduardo Habkost , Richard Henderson , Igor Mammedov , Paolo Bonzini 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Declare PNP0C01 device to reserve MMCONFIG region to conform to the spec better and play nice with guest BIOSes/OSes. According to PCI Firmware Specification[0], MMCONFIG region must be reserved by declaring a motherboard resource. It's optional to reserve the region in memory map by Int 15 E820h or EFIGetMemoryMap. Guest Linux checks if the MMCFG region is reserved by bios memory map or ACPI resource. If it's not reserved, Linux falls back to legacy PCI configuration access. TDVF [1] [2] doesn't reserve MMCONFIG the region in memory map. On the other hand OVMF reserves it in memory map without declaring a motherboard resource. With memory map reservation, linux guest uses MMCONFIG region. However it doesn't comply to PCI Firmware specification. [0] PCI Firmware specification Revision 3.2 4.1.2 MCFG Table Description table 4-2 NOTE 2 If the operating system does not natively comprehend reserving the MMCFG region, The MMCFG region must e reserved by firmware. ... For most systems, the mortheroard resource would appear at the root of the ACPI namespace (under \_SB)... The resource can optionally be returned in Int15 E820h or EFIGetMemoryMap as reserved memory but must always be reported through ACPI as a motherboard resource [1] TDX: Intel Trust Domain Extension https://software.intel.com/content/www/us/en/develop/articles/intel-tru= st-domain-extensions.html [2] TDX Virtual Firmware https://github.com/tianocore/edk2-staging/tree/TDVF The change to DSDT is as follows. @@ -68,32 +68,47 @@ If ((CDW3 !=3D Local0)) { CDW1 |=3D 0x10 } CDW3 =3D Local0 } Else { CDW1 |=3D 0x04 } Return (Arg3) } } + + Device (DRAC) + { + Name (_HID, "PNP0C01" /* System Board */) // _HID: Hardware ID + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, + 0x00000000, // Granularity + 0xB0000000, // Range Minimum + 0xBFFFFFFF, // Range Maximum + 0x00000000, // Translation Offset + 0x10000000, // Length + ,, , AddressRangeMemory, TypeStatic) + }) + } } Scope (_SB) { Device (HPET) { Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _H= ID: Hardware ID Name (_UID, Zero) // _UID: Unique ID OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400) Field (HPTM, DWordAcc, Lock, Preserve) { VEND, 32, PRD, 32 } Method (_STA, 0, NotSerialized) // _STA: Status Signed-off-by: Isaku Yamahata Message-Id: <6f686b45ce7bc43048c56dbb46e72e1fe51927e6.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 49aef4ebd1..96497475d1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1072,6 +1072,46 @@ static void build_q35_pci0_int(Aml *table) aml_append(table, sb_scope); } =20 +static Aml *build_q35_dram_controller(const AcpiMcfgInfo *mcfg) +{ + Aml *dev; + Aml *resource_template; + + /* DRAM controller */ + dev =3D aml_device("DRAC"); + aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C01"))); + + resource_template =3D aml_resource_template(); + if (mcfg->base + mcfg->size - 1 >=3D (1ULL << 32)) { + aml_append(resource_template, + aml_qword_memory(AML_POS_DECODE, + AML_MIN_FIXED, + AML_MAX_FIXED, + AML_NON_CACHEABLE, + AML_READ_WRITE, + 0x0000000000000000, + mcfg->base, + mcfg->base + mcfg->size - 1, + 0x0000000000000000, + mcfg->size)); + } else { + aml_append(resource_template, + aml_dword_memory(AML_POS_DECODE, + AML_MIN_FIXED, + AML_MAX_FIXED, + AML_NON_CACHEABLE, + AML_READ_WRITE, + 0x0000000000000000, + mcfg->base, + mcfg->base + mcfg->size - 1, + 0x0000000000000000, + mcfg->size)); + } + aml_append(dev, aml_name_decl("_CRS", resource_template)); + + return dev; +} + static void build_q35_isa_bridge(Aml *table) { Aml *dev; @@ -1218,6 +1258,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(machine); X86MachineState *x86ms =3D X86_MACHINE(machine); AcpiMcfgInfo mcfg; + bool mcfg_valid =3D !!acpi_get_mcfg(&mcfg); uint32_t nr_mem =3D machine->ram_slots; int root_bus_limit =3D 0xFF; PCIBus *bus =3D NULL; @@ -1256,6 +1297,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dev, aml_name_decl("_UID", aml_int(0))); aml_append(dev, build_q35_osc_method()); aml_append(sb_scope, dev); + if (mcfg_valid) { + aml_append(sb_scope, build_q35_dram_controller(&mcfg)); + } =20 if (pm->smi_on_cpuhp) { /* reserve SMI block resources, IO ports 0xB2, 0xB3 */ @@ -1386,7 +1430,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, * the PCI0._CRS. Add mmconfig to the set so it will be excluded * too. */ - if (acpi_get_mcfg(&mcfg)) { + if (mcfg_valid) { crs_range_insert(crs_range_set.mem_ranges, mcfg.base, mcfg.base + mcfg.size - 1); } --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614097070; cv=none; d=zohomail.com; s=zohoarc; b=jfMPpLjLIralZKM0+Yg2fUBaC2O+ZD4K3ObilFsmCzv8P/z422ubkf/wUsJe2u61usxYgCFqR00x8SD+jLdrDf9V//MU/HbtfS9D1U6m2+h7GibYkpRswliRFIbzole8BqKpV0vyv+IG5+rzv2QhBkqNR4sfahBg+Ug0hdl2DdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614097070; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C1ukuRVgkofH+UtrMRGSY9YqbsE1ipuouYGmZgQF7Rs=; b=ZMGWgDuqMJuQdkjFO6nfdTNC4E1h0CRYIVElvjtu2tv1URISBfeHtmU863poMIGh/ZKZGyll57INThizIbWjETpYvvNC0/679eHzl258Yr5PjCKRsABadbaFb5mYC/isdPBAkYlgwbjH4th3U6rhunl4Pg89e32grRIvYND3+gg= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614097069952371.74744386653083; Tue, 23 Feb 2021 08:17:49 -0800 (PST) Received: from localhost ([::1]:60952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaNg-0003ZY-Sa for importer@patchew.org; Tue, 23 Feb 2021 11:17:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaDS-0000B7-Ki for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaDP-00057u-SX for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:14 -0500 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-191-WcD6wTWqPf610zwd7CFRvQ-1; Tue, 23 Feb 2021 11:04:22 -0500 Received: by mail-wr1-f72.google.com with SMTP id v1so7540237wru.2 for ; Tue, 23 Feb 2021 08:04:22 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id a186sm3311870wme.17.2021.02.23.08.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096431; 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=C1ukuRVgkofH+UtrMRGSY9YqbsE1ipuouYGmZgQF7Rs=; b=FmvmTSZkYjPTqgmIT2vnFFCJ3w9ihcowGLqbRjR630Z19NOfaGIGcdoPvTRuqNuLIax4o3 jhQKeoRq1QQHA2h4QKqtqRdIVJxPEc6RLoWKc01M9VLKX72+tKidr4LA+W7krzOW43s8Kr Hynq7+9e4DXMXKw42zDq6hUPVb3wRow= X-MC-Unique: WcD6wTWqPf610zwd7CFRvQ-1 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:content-transfer-encoding :in-reply-to; bh=C1ukuRVgkofH+UtrMRGSY9YqbsE1ipuouYGmZgQF7Rs=; b=XyfL7Zawh+7imgy5xaP2JlYhV1Ry/0gD5mLDGF/dFYY6s4Kw3F05GdFgYPrTnz0Lis Qnvn4fTXCaN89pRF3eJD5vPvBhO1pyCu/R7fUDIf7jZlsOTgP9iqNLoBe2+fVahwWULY ujqmcEDHrQBIgvw7TrOOsfsA9avYdfMlNxMGmiffyEUTPWiSvS9wHAgSSZi50osaPDAF NwDb+qP7geB64psbl7GDtyRbQYUCMbXRNrrv7mRX3GTErIN+SzY72IbRbUh4MURhYDBA A8SNNXI6C0NzxmdTEUsVlLmCYZb6yjsrZkcbDY3CGWgmxFHxG4pDwOnaD5JC4R62+lT2 PgcA== X-Gm-Message-State: AOAM530/vWriRtf0H5X2/hGpUztzILtuQtYHbiLZPz/MLg+QGnTyfqn4 gzhHEqNtsqCr8tvJpQC6EZND6NiG1caMeuMsjS0v8WBBBRlSYp6Wi/fYyPzg/6srQGquXcCXy4n tuSHlA9SEelnS56Kh9+x+HcpGixAXz8Wfaw6HX8q8eBDdgGYfVjCXvnTdOWF5 X-Received: by 2002:a1c:29c4:: with SMTP id p187mr25860985wmp.8.1614096259995; Tue, 23 Feb 2021 08:04:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwzDQzjKf0B6ts1GVCJPO8NC054tST/F87FhBGKLfnrVFaD9JUL9260qvr7YdVjyIVdTs0T4A== X-Received: by 2002:a1c:29c4:: with SMTP id p187mr25860958wmp.8.1614096259838; Tue, 23 Feb 2021 08:04:19 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:17 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 15/17] i386: acpi: Don't build HPET ACPI entry if HPET is disabled Message-ID: <20210223160144.1507082-16-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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-Type: text/plain; charset="utf-8" Content-Disposition: inline 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Eduardo Habkost , Richard Henderson , Sean Christopherson , Igor Mammedov , Paolo Bonzini , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Sean Christopherson Omit HPET AML if the HPET is disabled, QEMU is not emulating it and the guest may get confused by seeing HPET in the ACPI tables without a "physical" device present. The change of DSDT when -no-hpet is as follows. @@ -141,47 +141,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS " } } - Scope (_SB) - { - Device (HPET) - { - Name (_HID, EisaId ("PNP0103") /* HPET System Timer */) // _H= ID: Hardware ID - Name (_UID, Zero) // _UID: Unique ID - OperationRegion (HPTM, SystemMemory, 0xFED00000, 0x0400) - Field (HPTM, DWordAcc, Lock, Preserve) - { - VEND, 32, - PRD, 32 - } - - Method (_STA, 0, NotSerialized) // _STA: Status - { - Local0 =3D VEND /* \_SB_.HPET.VEND */ - Local1 =3D PRD /* \_SB_.HPET.PRD_ */ - Local0 >>=3D 0x10 - If (((Local0 =3D=3D Zero) || (Local0 =3D=3D 0xFFFF))) - { - Return (Zero) - } - - If (((Local1 =3D=3D Zero) || (Local1 > 0x05F5E100))) - { - Return (Zero) - } - - Return (0x0F) - } - - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings - { - Memory32Fixed (ReadOnly, - 0xFED00000, // Address Base - 0x00000400, // Address Length - ) - }) - } - } - Scope (_SB.PCI0) { Device (ISA) Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Signed-off-by: Sean Christopherson Message-Id: <66114dead09232d04891b9e5f5a4081e85cc2c4d.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 96497475d1..31a5f6f4a5 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1281,7 +1281,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(sb_scope, dev); aml_append(dsdt, sb_scope); =20 - build_hpet_aml(dsdt); + if (misc->has_hpet) { + build_hpet_aml(dsdt); + } build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); if (pm->pcihp_bridge_en || pm->pcihp_root_en) { @@ -1328,7 +1330,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, =20 aml_append(dsdt, sb_scope); =20 - build_hpet_aml(dsdt); + if (misc->has_hpet) { + build_hpet_aml(dsdt); + } build_q35_isa_bridge(dsdt); build_isa_devices_aml(dsdt); build_q35_pci0_int(dsdt); --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614097245; cv=none; d=zohomail.com; s=zohoarc; b=DBv4nLoMG+a4Ribjxr6hb5hnsZMgMDUo5XB/3im0zeBmcOjo5n9GxrtLpT5G4ke1gSGlS8QS5OmpFNkiTYJtI+vjTc7+gDYkE3Q0WKtNcDNBkBIKnhnzGHGpqNMFHJPozx1ASdbo7PknRyZHR4TlrIBIg40Z6Ndk43QoHdR4hgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614097245; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xRuiajQC1YfeOqX65tuV4EMF3YnUxlH639qCU97W3A8=; b=db4xi8V75qRV/VAUi/OAcTgyJT2p/OlNP+LcOAyEVxHFp0pf1Hi9m9/ww9cJotH1vj8IGNdgQOr2uXiWRSyHBHaQrh3BdQ8UJtVQqDMzi3ES+/1tY996RU9ePTdimR5yfuktuau4WVwyBd/TAcIUrFkyZR1hMkIPXX7JDlO7Luk= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16140972448093.341670164524203; Tue, 23 Feb 2021 08:20:44 -0800 (PST) Received: from localhost ([::1]:37548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaQV-0005ds-RG for importer@patchew.org; Tue, 23 Feb 2021 11:20:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaDz-0000ea-HO for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaDx-0005LF-Uk for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:07:47 -0500 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-575-y53C4rzPP5iP47WsPI2ayQ-1; Tue, 23 Feb 2021 11:04:24 -0500 Received: by mail-wm1-f70.google.com with SMTP id f18so823227wmq.3 for ; Tue, 23 Feb 2021 08:04:24 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id o15sm3088057wmh.39.2021.02.23.08.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096465; 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=xRuiajQC1YfeOqX65tuV4EMF3YnUxlH639qCU97W3A8=; b=IreHDSTzm4O9KS1It/NAqMGOsOdRDRX6EhUTWjDmECVZdP5FDMjfCEUeHoHMriOyzaHIUA PnxT6cTeow9L3IHYkTuhWwiCvtjqVyNjkma1s4mgW9+f/owYmloZ3IHt60EXGKliKda2zT 0KM7yLuWWfB5wAhsxESBBvi3tJS4LUE= X-MC-Unique: y53C4rzPP5iP47WsPI2ayQ-1 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=xRuiajQC1YfeOqX65tuV4EMF3YnUxlH639qCU97W3A8=; b=EzWRYREcN1dWOcQ8RsOYTH/f4Y3SJXZpAiQMWw3limMirSDtxrgCFalV0bU2rBXn8q S/RwKOiOgLcjcDL/ViI7QAhyjgiwNOZpRnIZj3w6gsj2i0xwTcdiLN9hVDm/9VIGdX8n aZyqbxFxyDVfxiEINH54p2GILskbqgJkmVpq+gwhH8bAjF84E1/FQ0xg8SdQQuVAoqxC koGh0AMdsA0TM7loTTqY55jLbVM7PZbreTDbl2XtEtM0RB4lRYfdJysT5BAEzoOrQfUX i7m2Yin1r94Jbq7wrCdRrMH+u9y6RiBmEwcyprR+JKavn+me8fgaRalaclBsHs1ZivWK zEsg== X-Gm-Message-State: AOAM5334BE0lvyxxFH51rHbLYo0zEZAbWKZF5jvFtYiYA1hSpWWSIBP7 rEWCNpmC2CKgBrRb5KWc8D7bFQlhaMhxMSlHwGFAjf+gj8aa1h+xrQbxjMWvWOFJzmJR9wnURlo JfH5bkg5kzAnK39DJqsoG/7EP0G3MMHX3Qk5tahmnbZoTfj6afQJcowef5QfF X-Received: by 2002:a1c:cc08:: with SMTP id h8mr26084208wmb.188.1614096263077; Tue, 23 Feb 2021 08:04:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZFqy+/pwquY7vxo7HiPD9m9n6ccnmIt+etrT4th+Ffe1Wt494X60w1Cl9li9vUmBlmrIaiw== X-Received: by 2002:a1c:cc08:: with SMTP id h8mr26084191wmb.188.1614096262925; Tue, 23 Feb 2021 08:04:22 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 16/17] acpi: add test case for -no-hpet Message-ID: <20210223160144.1507082-17-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Reviewed-by: Igor Mammedov Signed-off-by: Isaku Yamahata Message-Id: <5ef9a81e49793afb42ffd19bbf1f44e269c65e93.1613615732.git.isaku.= yamahata@intel.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 93d037c29d..e020c83d2a 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1006,6 +1006,17 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(voi= d) free_test_data(&data); } =20 +static void test_acpi_piix4_tcg_nohpet(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_PC; + data.variant =3D ".nohpet"; + test_acpi_one("-no-hpet", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_numamem(void) { test_data data; @@ -1051,6 +1062,17 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) free_test_data(&data); } =20 +static void test_acpi_q35_tcg_nohpet(void) +{ + test_data data; + + memset(&data, 0, sizeof(data)); + data.machine =3D MACHINE_Q35; + data.variant =3D ".nohpet"; + test_acpi_one("-no-hpet", &data); + free_test_data(&data); +} + static void test_acpi_piix4_tcg_numamem(void) { test_data data; @@ -1516,11 +1538,13 @@ int main(int argc, char *argv[]) test_acpi_piix4_tcg_smm_compat); qtest_add_func("acpi/piix4/smm-compat-nosmm", test_acpi_piix4_tcg_smm_compat_nosmm); + qtest_add_func("acpi/piix4/nohpet", test_acpi_piix4_tcg_nohpet); qtest_add_func("acpi/q35/nosmm", test_acpi_q35_tcg_nosmm); qtest_add_func("acpi/q35/smm-compat", test_acpi_q35_tcg_smm_compat); qtest_add_func("acpi/q35/smm-compat-nosmm", test_acpi_q35_tcg_smm_compat_nosmm); + qtest_add_func("acpi/q35/nohpet", test_acpi_q35_tcg_nohpet); qtest_add_func("acpi/piix4/dimmpxm", test_acpi_piix4_tcg_dimm_pxm); qtest_add_func("acpi/q35/dimmpxm", test_acpi_q35_tcg_dimm_pxm); qtest_add_func("acpi/piix4/acpihmat", test_acpi_piix4_tcg_acpi_hma= t); --=20 MST From nobody Wed Nov 19 01:44:16 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614096442; cv=none; d=zohomail.com; s=zohoarc; b=BOBUlH1c+X3CSzIE2zAoz7g4q9kS77L6dLRGrWea4sYxHYc4nF9fGSx+EwLVYNEaJ+G9h4F+F0CNVN6nyAvRxZPCUxvp++mSkUBhHDaU6ej1v71BV1zYdhRmW7rdpBN2qllzP3arJYlUainJ5FY8vEfzi6XGjcfP8Webd57ar6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614096442; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BpmWFgvGGDMcVlDwaGRV/hAePZqFoaWhUoNEZ6HDYRM=; b=NsbQ/4BmAxtJhRQ10etcGeDjqIR2ml+xA/1wIRxImOYRb/5gyIdL7CLmG96sNIzMWk0J+9arrZSQkuDLe267pDpNcye2OgIH7moZcR306gjZCai7q3e3wSo7XxnTTqHrYoBCvAJRYARmK/yvFIUQ/ZDUwEDkJPeYOWK7S6BJOGU= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614096442536346.06848896943484; Tue, 23 Feb 2021 08:07:22 -0800 (PST) Received: from localhost ([::1]:59608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEaDZ-000818-9L for importer@patchew.org; Tue, 23 Feb 2021 11:07:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEaBR-0005sI-Hq for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEaBO-00049r-5X for qemu-devel@nongnu.org; Tue, 23 Feb 2021 11:05:09 -0500 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-34-jSWOaKWFNfOicGzVgT19GQ-1; Tue, 23 Feb 2021 11:04:27 -0500 Received: by mail-wm1-f70.google.com with SMTP id j204so1380693wmj.4 for ; Tue, 23 Feb 2021 08:04:26 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id t14sm620183wru.64.2021.02.23.08.04.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 08:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614096305; 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=BpmWFgvGGDMcVlDwaGRV/hAePZqFoaWhUoNEZ6HDYRM=; b=VlBW9PV9wY//R09Mq6yQCTxZBby/R0o1d6AsvOqWTcqScVDx321YttrtujjlBK7UtR0Nik L5t+vvlMhkAwoS54G0hl36UitxaWThA/P18lgjCGmuV0OIf+100ZffwbJp9HEfHPTHvqCY GenOrh5KeXfq39UR7y+HrOdpySl4jVQ= X-MC-Unique: jSWOaKWFNfOicGzVgT19GQ-1 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=BpmWFgvGGDMcVlDwaGRV/hAePZqFoaWhUoNEZ6HDYRM=; b=YPzUHccSZJooY597l8aJUUG6nJ4tnxM2eiHklPF1+mbE9OAsnrdO6m4pP1MVtc/oTu 53C7d8mHhpjcSqILb5t5ntv9ywNnMuEx9f7mBnsXJEaGoxwE5NdmH3AbmzUFlXwRsGQe 9U6S/nz+OFJvqGDXg3o6ef9NYDQBnhFIh0eY2W6z7HzBEtxbMGfloxBkJ8uuMF0/+iqf p4qWmgZjYimFPugqO2SxvFK6p6gd6i7S6bLE/YLBN3/+XsV8G+KDkNz+QsYI22+NIR3e ucHuiJvr/hJ9Ghr0qMofUEtAe1XFMJC6oSyo27yrw2CqqyPQesu5XAsWxrTFEvncpcZD 4qzw== X-Gm-Message-State: AOAM532c6c17t0iaFxq4tgdK0TBWr77AuyaSnBsdRjR65cswFnVHGtAd 6k063M9Pnt1r3trIQIb9fwKcvqjtwh0/elM4sq1WK8k+YYnZqlqw/rMTcFNGVeJC5AVsFnPMmGW 4lIP3XYpVRydd4OtvmTkIr3POF2A/O2rrG8k7b9gQo/ZiKVP8bEijA2rSaFU4 X-Received: by 2002:a05:600c:4c17:: with SMTP id d23mr8271190wmp.116.1614096265281; Tue, 23 Feb 2021 08:04:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzP2/Cveavd0AoWfIy8deKbp6SdY7IqbaeADChrBIGyfFVNcN+Bq9BzeMxU882JlcjxDAihSw== X-Received: by 2002:a05:600c:4c17:: with SMTP id d23mr8271168wmp.116.1614096265054; Tue, 23 Feb 2021 08:04:25 -0800 (PST) Date: Tue, 23 Feb 2021 11:04:23 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 17/17] qtest/acpi/bios-tables-test: update acpi tables Message-ID: <20210223160144.1507082-18-mst@redhat.com> References: <20210223160144.1507082-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210223160144.1507082-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 (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: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: Isaku Yamahata , Peter Maydell , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata update golden master acpi tables and empty bios-tables-test-allowed-diff.h. Signed-off-by: Isaku Yamahata Message-Id: Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 14 -------------- tests/data/acpi/pc/DSDT.nohpet | Bin 0 -> 4923 bytes tests/data/acpi/pc/FACP.nosmm | Bin 0 -> 116 bytes tests/data/acpi/q35/DSDT | Bin 7801 -> 7859 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9126 -> 9184 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7819 -> 7877 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8265 -> 8323 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9455 -> 9513 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7876 -> 7934 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9160 -> 9218 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8932 -> 8990 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 0 -> 7717 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7807 -> 7865 bytes tests/data/acpi/q35/DSDT.tis | Bin 8407 -> 8465 bytes tests/data/acpi/q35/FACP.nosmm | Bin 0 -> 244 bytes 15 files changed, 14 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 95592459c5..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,15 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/FACP.nosmm", -"tests/data/acpi/pc/DSDT.nohpet", -"tests/data/acpi/q35/DSDT", -"tests/data/acpi/q35/DSDT.tis", -"tests/data/acpi/q35/DSDT.bridge", -"tests/data/acpi/q35/DSDT.mmio64", -"tests/data/acpi/q35/DSDT.ipmibt", -"tests/data/acpi/q35/DSDT.cphp", -"tests/data/acpi/q35/DSDT.memhp", -"tests/data/acpi/q35/DSDT.numamem", -"tests/data/acpi/q35/FACP.nosmm", -"tests/data/acpi/q35/DSDT.nohpet", -"tests/data/acpi/q35/DSDT.dimmpxm", -"tests/data/acpi/q35/DSDT.acpihmat", diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d7d21be070c3b879e558193cbf8= ded5a64c15eda 100644 GIT binary patch literal 4923 zcmb7IUvC@75ufE9<>Qi+j?~#wtRyBByJ^xQ<{w*j5TFpbM@qCrisn&CixWUnWKb#y z;DZwZQH7v111O503J5Ct&5I@J=3D3>dRCmDcnz^+)3kOtYKMT9hc*|+V@6Fuy z8v945@%KjK%WoU3>A>y_{dBkKd~@8`1p@8wI-JvkzFfC*b-TAz5yhldUoV=3DG?0>kT z)w5<5wEA|@1pPN35QYGD?`F};)?I4^L&O*=3D_mU#O8(h`P3wIR>B$VB|w~;du?2#%+ zYSprQPOFQm6n2%op6zpDlvr)Pcsbt}TEu`s;kn*B^C zLE!XlC-7z_?5>r6gmt66~}~S44e)boddQ9^t$~nsn0+!uTT}}8=3DNY}FnPUFt$`B{bQ=3DydU*tlkP2P3>(&Pcy zbq=3D34cY!O=3D>gy*h1cg+9&GLo`?f&hP7VF1Onp_>JEogrq9Z6XP#ZFp0Fw*3P8fByr z(00B)*yTEe2Lm{612~6G^mp85;Ixk$P1tXqHSA}%?*z=3DATg+uO1KlGlP@Q!8pi@m4Dyr*36DU5I2d&-#ZJ!SVw zl)ISl&I7-~eR|A&+I63vaG&;ZpB}n5C*5Or`o-C2#@uII_n8Uz86WoSCtzLB}xfUJDOCZGY1;| zn6#dmW&gADn4+Y{8Ri zns=3DvlOfgdH#HhZ1(7%5L=3D2iwyUyCcwm4QJczPI0^Q%PR+jwM963oV**%&ldorYCoW z3**_}oj%N^kl3_++;LKlX&QfY7W4p^(4|MNHs0X+TTHJ}@w-!38- z5vHM@MHEuKLi0srBu8=3DY1^Dl`3jm&-_O-!)_BFZ!;9BG%OB)RS^*_(@@1LLl?(!W^ zN3g+Q@K*` z#(f0kOFQl+M;0y}X~%;E%9nPXWLyN&o^a($`zpy;&eGm>6QgA55BbPgzCU|?W8=3Dj89~5v<@85#X!<1dKp25F13p03!n@jLE>j24S*5X%LSC$bPUM bD$c~f!UAOe=3Dl{bMK@Wv1UWi$#Cv$U@CNt=3D7&sdkGH}E@ j2L%htbIG)eGcfQlGC;tF|NsB*hq47K88%BX#>)Z#Nca{a delta 29 lcmdmN`_qQYCD^R3>k(iG?dShcL#=3D0sxLH2_gUh diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.a= cpihmat index 2723b690089c9e75869708cb92d3081b6bb5ec65..b3c1dd6bc40210425ac37dba88a= 650b0ea60ce1c 100644 GIT binary patch delta 88 zcmZ4H{=3Dl8fCDbMK@Wv1UWi$#Cv$U@CNt=3D7&sdkGH}E@ j2L%htbIG)eGcfQlGC;tF|NsB*hq47K88%BX_9y`WKL-{v delta 29 lcmaFhzRaD=3DCDk(iG?dShcNai0RW8-2{Hfx diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bri= dge index 86711455576518f9ddd1f524d82a447946be32ba..eb5d27d95b2cdeda5f7e1f6b151= cfea02e6bd907 100644 GIT binary patch delta 88 zcmeCSJ!;G466_LkRE~jxv3(*}Dw8YU#KM(U(M=3DXEL5|KG@gANoya9dz2F?bC3>@*! iLBWFZTr%zA3=3DBMs3=3Dpv4|NsB{p=3D^OlhRsrpg|Ywj|NsB}P_{rN!)7T)eR%-yPZZJs delta 29 kcmZp6Jn6vY66_M@*! iLBWFZTr%zA3=3DBMs3=3Dpv4|NsB{p=3D^OlhRsrpSCs+g?G;b} delta 29 lcmZ4K_1=3D@qCDv4q?2i3;>)Z3Qzz5 diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipm= ibt index 8d3ccc3e75164c2884fbe21659100e12fc70ae38..ce07e9f152def6a22ab29b3bde9= 8b7d1f15a0522 100644 GIT binary patch delta 88 zcmX?N`_GokCDv4q;p+3jms{3IhND diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp index f1c545d94b856fa8d19b8433233d80397cb05714..7acf6243f08cd906aa8a02d3acf= 1d720b36385ea 100644 GIT binary patch delta 88 zcmX@%-sHjM66_Mfq{6_!cz+^SDw8YU#KM(U(M=3DXEL5|KG@gANoya9dz2F?bC3>@*! iLBWFZTr%zA3=3DBMs3=3Dpv4|NsB{p=3D^OlhRsrp>y!ZYffaB7 delta 29 lcmZqjIN{Fa66_LkLYaYqar#8AR3>k(iG?dShcK>F0sxF532*=3Da diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmi= o64 index 4fb285f2efea00964ea0f5c4172c213f0817b563..77d46369e48efca9a9e5024542c= 77cd26144beff 100644 GIT binary patch delta 88 zcmaFjI?s*ECDk(iG?dShcKQ}1OSi336B5( diff --git a/tests/data/acpi/q35/DSDT.nohpet b/tests/data/acpi/q35/DSDT.noh= pet index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0b10128e42af0c7b65e01096308= 5bbf690a64065 100644 GIT binary patch literal 7717 zcmb7JTW=3Df38J*=3DtS}m92lA(;6*ml-%Vlx=3D~!YZa@K~B&U_*0$Ics z5W@&yD?sD;p(r9a=3D%Z{XK;PP@_Obp6eXD`~gTD45ekyyu`F7+Pk^&+=3Dkb7p&nQzYC z&T=3DLQgN?T@31R)cvgS9!`O2?b{yaXG5Q4Vp*K4LWMdwjasdueRB4u?RXXG}%Dt7V5 zLFH!M`qOUjt6uN^=3DRIpH65B7lXWLuRXHRk*YSDoyJm2PL>cUpe4WOp0Q zz%BpNvF)zUTS>cH4%))*-fRYr;};eG7+EUmnQa+~(1qs7Ec& zU2dYT7LM+A_OA!+vMqtbxvM&qkfv{Um zzb1-q7r$1tOUV1f`xYGy&;O6SHd^hCR$=3DMhqe3Q?>G#F*>QYtkwuSAQD7e(_Bmn9P zBmo+tkWIP$K28qvVniwsCwZULfvO-W(ZA#-q!Qd1ky23;LMlO(NORK}pW}wlanmQD?$b7W+J;Zt^a-f@oG^S&7(ORVpMbhg$MESGJ{{91pzbqc_{YgGiUk) z)O~t}PtWk_nLYt^pLxS)-td_>eFEw}3x>~v;j>`+1k`;_89t{BpHrq!K;382@L4o` z7EPaky3aF)&ohS4Gp0{K-RHF7bK3AZZTbY%eIlH2^{MC3jNx;}^a-f@JZtzoYxq2C z`UKQ{o|DRQ{3JXlm6iBmcaD|*8%W9^=3DFS?*SwlH%Dgkxnc|&>LP@XrHfV%R6p}b%y zFPKU|U3t+^UNn>!O(meN#A}xJOt>VK>KT8DmFmF_NJ@1E=3DZu@gl?2!Zr%W0SbV!43Yqg#cx)3Q&zo0m{_l z00qQoRDd!!MpRP|P^KOSC?G~8xd>3^#whkEsT810RZ#bd0Of9_5&^1FDL?^LDpG&~ zDxU~Y=3D1L_3RHIUWGF8^300mS&5unVKN(87zr2u8BR8oKfDxU~Y=3D1L_3RHIUWGF2)m zKmpbHM1V3^DiNR>l>(HhQb_>{sC*(onJbkDP>o6f%2cVO00mS&5unVKN(87zr2u8B zR8oKfDxU~Y=3D1L_3RHIUWGF2)mKmnCc1SoT*5&^1FDL|Pjl@y?W$|nMpxl)M$)uB?Ty;@`(Utu2dpGH7W%tQ>Bsu6j1p@fHGGq5uh5C z0+gvzNdXF|d?G-ZE0qXPjYu@1ynu}pv;v@1gJ)(0A;FFQh)*~p9oOqN+kkR zqf&q}RVpb!0hLb#D08I}0jg0cK$$9)6rh00CjykYQi%Z7s1%?~l}ZXwK;;tw%3P^L zfNE3^Q29iF0%-vXqz5RV9-x3)fNDwvsHUU< z)sz&Vni2u3DG{KWk^)pyQh;ho1gNG&fNDw#P)$hzswokmni2u3DJeiTB?YLaM1TUR zvx@))!WokXlL8bFr$Iqds$+`)1yaWr0Scs!Ed?l`I<^#`fS7%l?IJ?Op?e_ztRB%H z(&uCJQ|>(e*_9;yOQpZ<^oQPRwb#o?-1Q25`ScaoVje$L+OE-8oxU1&ajLlejeax%qh&2_&$0YbZ!pL8-`jEM<3x$r25p*Do^ck^~ykX%np3(>J_beMOLq1e0udtadh=3DcXMcsf z^Xv>}kYevn;uPh5t-LSG`vc|u6UzH>`C!1jgBhD|?LN@T2eN!HP(C=3DJd=3DQtf4wg@y zqI^{=3DUzO#n1LdnHl&{9+YlG#}rzl_3%GYH1+Ccf*3FT{X`TAh_u~U?*e0`vN z{e<%MxO`)<{P-!#H?;B%S-vq)zHvhN2Fj=3DCQ8rlKO+1=3D26 zQ#8B7tIAM!+%~eiq5I&B*&W_rhPvank=3D+el*VATqc&Qocj@w3dH*}rOnBCz`XQ(@F zGrRN7Ym?f!aHWFTd(70kNla>cYd3gWzu|1YnbK~xtD(9|9o(GArmWw(Ip6r`e)PM& z-_C#h!M%_6KHmA@p6FP9Yk4WYTCR-! zeseXn{PxPPEWi3*iN0!he73L3v{ybIr}wrX2}t#8rQFQ~JSx zc#zq$-)fdh3ndx`uSKMbd4Hq!e&WzM*cHF`OQq7CVq?t55GFd`*}RfcbN6JF4D|ca z?qD;DMWS~&doZ|zEJRMO*ZJPip5>*ZUU4N&woX^b8te)^jO@QyoAyJ0)jq+7?XOmE z6%zeO>_pb>7eV3RwiSunk=3D2XD){ABLj|V;L*$$d|(avB=3DX?U;^C*^SF*c$4eh;*^S38ik--0aeERf- zb*TZsEa#&o|ip+C9cuECdPhU%B`u_tU#=3DzfbSB^hpR~SkFG82|cych`=3DKMYIP8Q>sW0wEYK1mZ|;EUJyG GwDEs12p4Jq literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.nu= mamem index dd9dc9d02501afb50da7b9e77daabeee8968c340..e4c4582e7f76b072ab1123c748b= 89ea33ea1db87 100644 GIT binary patch delta 88 zcmexwv(uK#CDbMK@Wv1UWi$#Cv$U@CNt=3D7&sdkGH}E@ j2L%htbIG)eGcfQlGC;tF|NsB*hq47K88%BXrpf{UHWn4+ delta 29 kcmdmK``?DkCDk(iG?dShcNDy2LO#z33>nk diff --git a/tests/data/acpi/q35/FACP.nosmm b/tests/data/acpi/q35/FACP.nosmm index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6a9aa5f370eb9af6a03dc739d8a= 159be58fdee01 100644 GIT binary patch literal 244 zcmZ>BbPo8!z`(#<;Nj24S*5X%LSC$X0-f zGcm9T0LA|E|L2FOWMD7?GM2V5Ffej3F#P0!h{7ddihwku0+2v57svwxMxcSn_QAxF TX+{NzJ3wNL4G8yu_%Hwf9PJGO literal 0 HcmV?d00001 --=20 MST