From nobody Mon Apr 29 09:03:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884266; cv=none; d=zohomail.com; s=zohoarc; b=NcTSueXU0Mns+3SgZwywp5t/WAWO1lxeEBOPmwc0he9TsX+Oektxh7bfqJItJPDcM+c/+EupBzANlkzev3717HSKicSNTX/2qjS/jIoMBsQGWOVtFlQxIB/5tFiX5yhVWRqCm2wL8Wvddbrm1R+8hfq1PfKj6uFJW3Rz9tavcuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884266; 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=x9zjpG1DATc/ZyuF1QoNdxW6EFzIE5e1Q0wy1Ill9Rk=; b=GeDR5/LbMGn+a2lCgJec8VMrbSFTeibkCWFAzx4AD1Bqa96QJkq2VCnRulQEilETRVIX7JDFb6VHYfScLrtHr45LpIyzdOJtGTLyXboSmCA8QVPmcr25P2V5CVWnmjLlweC3IWkC04ZNM7+w02FF3TZkHglC4Rolreg/XAzijdI= 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 161088426676530.82887588178403; Sun, 17 Jan 2021 03:51:06 -0800 (PST) Received: from localhost ([::1]:50472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16aH-0003Jz-H6 for importer@patchew.org; Sun, 17 Jan 2021 06:51:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16Vp-0001Ug-8i for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vk-00089P-Q4 for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:29 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-f4pnUJgkM2WPjrRJ8K407A-1; Sun, 17 Jan 2021 06:46:22 -0500 Received: by mail-wr1-f69.google.com with SMTP id r8so6749697wro.22 for ; Sun, 17 Jan 2021 03:46:22 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id r13sm22741502wrt.10.2021.01.17.03.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883984; 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=x9zjpG1DATc/ZyuF1QoNdxW6EFzIE5e1Q0wy1Ill9Rk=; b=WRptZnhLvDFAbmE5q5O4nxku94zyLtCv7nzADwJCPQ29yhjB2heXNS1hvkrm8m/7RZEFLK iTFux0AwEaFHU+TF+LN+fcZ/9RbGF6CIYV0QTAAcBfj6oJahAsoEQ5eX0CSR5D7BQL6+o6 0DgyV8IkwJJ0WynM27L9mi1xyiDGVx4= X-MC-Unique: f4pnUJgkM2WPjrRJ8K407A-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=x9zjpG1DATc/ZyuF1QoNdxW6EFzIE5e1Q0wy1Ill9Rk=; b=W3MSWrWi4+fX/VYOhG2t0qktRfUoN6L7u7R73utCQ/bz/joHUh2U3fe93hiA0DxTe+ CvjQ4y8mcvZaQqHWPMWOngpV75zETnT0EoN5G/lgXgypwoAi1g32royWrUTwk98MKpBc Af+9BL6zu0m+O+C9yE/nxdgg9Rj9ECIdAp5OlExFX0ud4quEpEF6+fEiXsedb/wg+WZ5 1gDJLc+Yg8SMCGMY0z+vad+Q1FZbYCaFIYu5V8rtbZ6BV3Jyg9J45tQ5BGFcFbmeQYWp kr9r0cDoFp4JDWPZBHLsasd/BOGi8bKNuWAOQawjWaamLmbQtKThqv9atLo3v+Hm0YWg 6GHg== X-Gm-Message-State: AOAM531A83HljOVdZq0SAF7GXb3+jNSJfLsZ9cRMYv+v4tGw3eVTttdD CQNg5y4dU+pM1ht6jIKzHI0FXF2pv2aFfyr2D9c6xgoCe3XAi0JA3LYj+OarlzSyWrOnYUj+F2o rN7ahq0BMNCtvjMReN+wXNWEM8B891SjQNl5OIyTjdjPbs2Bpc+8AXliqOyJE X-Received: by 2002:a1c:4d05:: with SMTP id o5mr16997922wmh.85.1610883980898; Sun, 17 Jan 2021 03:46:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtE3ixO5j+Fh760BIJDtAq66R32qHgyExR+h1WbPNnza+PaI8WNW5pZ4j9SqlOuJzdaaAgDg== X-Received: by 2002:a1c:4d05:: with SMTP id o5mr16997909wmh.85.1610883980659; Sun, 17 Jan 2021 03:46:20 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:18 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 01/10] pci/shpc: don't push attention button when ejecting powered-off device Message-ID: <20210117114519.539647-2-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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: Roman Kagan , Peter Maydell 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: Roman Kagan When the slot is in steady powered-off state and the device is being removed, there's no need to press the attention button. Nor is it mandated by the Standard Hot-Plug Controller Specification, Rev. 1.0. Moreover it confuses the guest, Linux in particular, as it assumes that the attention button pressed in this state indicates that the device has been inserted and will need to be powered on. Therefore it transitions the slot into BLINKING_ON state for 5 seconds, and discovers at the end that no device is actually inserted: ... unplug request [12685.451329] shpchp 0000:01:00.0: Button pressed on Slot(2) [12685.455478] shpchp 0000:01:00.0: PCI slot #2 - powering off due to butto= n press ... in 5 seconds OS powers off the slot, QEMU ejects the device [12690.632282] shpchp 0000:01:00.0: Latch open on Slot(2) ... excessive button press in steady powered-off state [12690.634267] shpchp 0000:01:00.0: Button pressed on Slot(2) [12690.636256] shpchp 0000:01:00.0: Card not present on Slot(2) ... the last button press spawns powering on the slot [12690.638909] shpchp 0000:01:00.0: PCI slot #2 - powering on due to button= press ... in 5 more seconds attempt to power on discovers empty slot [12695.735986] shpchp 0000:01:00.0: No adapter on slot(2) Worse, if the real device insertion happens within 5 seconds from the apparent completion of the previous device removal (signaled via DEVICE_DELETED event), the new button press will be interpreted as the cancellation of that misguided powering on: [13448.965295] shpchp 0000:01:00.0: Button pressed on Slot(2) [13448.969430] shpchp 0000:01:00.0: PCI slot #2 - powering off due to butto= n press [13454.025107] shpchp 0000:01:00.0: Latch open on Slot(2) [13454.027101] shpchp 0000:01:00.0: Button pressed on Slot(2) [13454.029165] shpchp 0000:01:00.0: Card not present on Slot(2) ... the excessive button press spawns powering on the slot ... device has already been ejected by QEMU [13454.031949] shpchp 0000:01:00.0: PCI slot #2 - powering on due to button= press ... new device is inserted in the slot [13456.861545] shpchp 0000:01:00.0: Latch close on Slot(2) ... valid button press arrives before 5 s since the wrong one [13456.864894] shpchp 0000:01:00.0: Button pressed on Slot(2) [13456.869211] shpchp 0000:01:00.0: Card present on Slot(2) ... the valid button press is counted as cancellation of the wrong one [13456.873173] shpchp 0000:01:00.0: Button cancel on Slot(2) [13456.877101] shpchp 0000:01:00.0: PCI slot #2 - action canceled due to bu= tton press As a result, the newly inserted device isn't brought up by the guest. Avoid this situation by not pushing the attention button when the device in the slot is in powered-off state and is being ejected. FWIW pcie implementation doesn't suffer from this problem. Signed-off-by: Roman Kagan Message-Id: <20201102053750.2281818-1-rvkagan@yandex-team.ru> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci/shpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 4786a44996..28e62174c4 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -300,7 +300,6 @@ static void shpc_slot_command(SHPCDevice *shpc, uint8_t= target, shpc_set_status(shpc, slot, SHPC_SLOT_STATUS_PRSNT_EMPTY, SHPC_SLOT_STATUS_PRSNT_MASK); shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D - SHPC_SLOT_EVENT_BUTTON | SHPC_SLOT_EVENT_MRL | SHPC_SLOT_EVENT_PRESENCE; } @@ -566,7 +565,6 @@ void shpc_device_unplug_request_cb(HotplugHandler *hotp= lug_dev, return; } =20 - shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D SHPC_SLOT_EVENT_BUTTON; state =3D shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK); led =3D shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MASK); if (state =3D=3D SHPC_STATE_DISABLED && led =3D=3D SHPC_LED_OFF) { @@ -577,6 +575,8 @@ void shpc_device_unplug_request_cb(HotplugHandler *hotp= lug_dev, shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D SHPC_SLOT_EVENT_MRL | SHPC_SLOT_EVENT_PRESENCE; + } else { + shpc->config[SHPC_SLOT_EVENT_LATCH(slot)] |=3D SHPC_SLOT_EVENT_BUT= TON; } shpc_set_status(shpc, slot, 0, SHPC_SLOT_STATUS_66); shpc_interrupt_update(pci_hotplug_dev); --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884268; cv=none; d=zohomail.com; s=zohoarc; b=iIKcMMiKbwOWupp0gQ/ULdy9NQYUCRfvVq6VTe5jyzN+tp8gXT7Fg7U9Qn8HO9eb7WsVlQwf3hQvkDMqLnn5o1qOxNy5OMNK27ph1TtugIskcLtkswDHkjo6bw1GrjYdfjQ9eonucwvidHxapV98McNL09DukqhqZ6Eqel1JR20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884268; 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=JJiWXDHCrLtiiVOj6jLxESuZWEbgyV7pwguWRAe3chY=; b=ETS29cVy8A6LRsG3dcWtDKKSyxufGrFpET1TZOUj4e66RvvtZS24NmCuP09aaZQFSlf7Vh+BH1/1FyS5d2q96yQs+f87mfF1eg49/9TmNgvajyVR40tHThiOjRLkVdjQshwrbZdgx4P2BF44ijV9Ch8QtXJiKYT1WJSdXxGh0mo= 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 16108842683651022.113587752093; Sun, 17 Jan 2021 03:51:08 -0800 (PST) Received: from localhost ([::1]:50558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16aJ-0003M7-5Q for importer@patchew.org; Sun, 17 Jan 2021 06:51:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16Vr-0001Vb-2E for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vp-0008Am-8q for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:30 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-313-grGx5AQjMXGjidzIHwKzYw-1; Sun, 17 Jan 2021 06:46:25 -0500 Received: by mail-wm1-f69.google.com with SMTP id u67so1136785wmb.0 for ; Sun, 17 Jan 2021 03:46:25 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id s13sm23969407wra.53.2021.01.17.03.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883988; 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=JJiWXDHCrLtiiVOj6jLxESuZWEbgyV7pwguWRAe3chY=; b=buNhMyQwdtcPbqMgJ/CE73qtc8/081mJ9C6jrQ/pp2AHPWvHHHFSbwEcKkGgTTtzpZcy2G l3eCdDiuStxEv2LXYqRW3H6kiS5q5e7R6U7RpfJCnQyIeDPDgWW1aGif+lw8vwYBmMllEI ESwxxdVGsMmD6zed6nuAAeSgZAd6Yps= X-MC-Unique: grGx5AQjMXGjidzIHwKzYw-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=JJiWXDHCrLtiiVOj6jLxESuZWEbgyV7pwguWRAe3chY=; b=XMi9I/rQhR5kR1U1QvpspZcd2fLBvY4sWU1P3QQrnkQWDkAgMtKrgHHkFKKB7ySXMo SwwGxIC8XqeKn0ibBo+CyAj1fTF5GxhcFTjNj04y8NnW98XIy7jHPSfc1XmVQXxzD8Cm tR7+rNB0L7Y+fdjtM2bnx+xO2e5Fo8BlS2fJSZW62u+7S+5OmIfeqG2EqSurynZZ4469 TC3lZgk+f/OQn0Fum58vZDtkATnlUkw+cb4PUKvifoykDLuC7KfmofraAnwl0eQ57LVF 98vY2J48ZN16l5zkRjp+X1A01w3aICXgzcpJnhRIqcbsv4JFhkW6bp6UU+1XdTy2wdtW OzYA== X-Gm-Message-State: AOAM531LPM4uvBRbEoSJ4v17pbt7epeKP+UY3/SghCJ0hKu5gsteirJm Pyy8FroB6VIngFUXOurJuCGHE549kqx1A0l3Ef8Ho3ziPvzRC/CXwls3CuX8+wsk8KCgjp1mwC/ 7IApMbAMKps9+eP4dgQcy2+MI3rOtpvoXpEmDY/LuHHTeAKxZmlGE/gYrNHMl X-Received: by 2002:a1c:68c5:: with SMTP id d188mr16930964wmc.64.1610883983198; Sun, 17 Jan 2021 03:46:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzs1jGOGPZfEt1/HmWfRfk3Qhl++w7Ok4+BoE9LLz/r64QLRhFxNt9NjR/xMzO4YNs+6XN9IQ== X-Received: by 2002:a1c:68c5:: with SMTP id d188mr16930950wmc.64.1610883982986; Sun, 17 Jan 2021 03:46:22 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:20 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 02/10] vhost-user-fs: add the "bootindex" property Message-ID: <20210117114519.539647-3-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , =?utf-8?Q?J=C3=A1n?= Tomko , "Dr. David Alan Gilbert" , virtio-fs@redhat.com, Stefan Hajnoczi , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Laszlo Ersek virtio-fs qualifies as a bootable device minimally under OVMF, but currently the necessary "bootindex" property is missing. Add the property. Expose the property only in the PCI device, for now. There is no boot support for virtiofs on s390x (ccw) for the time being [1] [2], so leave the CCW device unchanged. Add the property to the base device still, because adding the alias to the CCW device later will be easier this way [3]. [1] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01745.html [2] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01870.html [3] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01751.html Example OpenFirmware device path for the "vhost-user-fs-pci" device in the "bootorder" fw_cfg file: /pci@i0cf8/pci-bridge@1,6/pci1af4,105a@0/filesystem@0 Cc: "Dr. David Alan Gilbert" Cc: "Michael S. Tsirkin" Cc: J=C3=A1n Tomko Cc: Stefan Hajnoczi Cc: virtio-fs@redhat.com Signed-off-by: Laszlo Ersek Acked-by: Dr. David Alan Gilbert Message-Id: <20210112131603.12686-1-lersek@redhat.com> Acked-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost-user-fs.h | 1 + hw/virtio/vhost-user-fs-pci.c | 2 ++ hw/virtio/vhost-user-fs.c | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-us= er-fs.h index 6985752771..0d62834c25 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -39,6 +39,7 @@ struct VHostUserFS { VhostUserState vhost_user; VirtQueue **req_vqs; VirtQueue *hiprio_vq; + int32_t bootindex; =20 /*< public >*/ }; diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 8bb389bd28..2ed8492b3f 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -68,6 +68,8 @@ static void vhost_user_fs_pci_instance_init(Object *obj) =20 virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VHOST_USER_FS); + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), + "bootindex"); } =20 static const VirtioPCIDeviceTypeInfo vhost_user_fs_pci_info =3D { diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index ed036ad9c1..ac4fc34b36 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -22,6 +22,7 @@ #include "qemu/error-report.h" #include "hw/virtio/vhost-user-fs.h" #include "monitor/monitor.h" +#include "sysemu/sysemu.h" =20 static void vuf_get_config(VirtIODevice *vdev, uint8_t *config) { @@ -279,6 +280,14 @@ static Property vuf_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void vuf_instance_init(Object *obj) +{ + VHostUserFS *fs =3D VHOST_USER_FS(obj); + + device_add_bootindex_property(obj, &fs->bootindex, "bootindex", + "/filesystem@0", DEVICE(obj)); +} + static void vuf_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -300,6 +309,7 @@ static const TypeInfo vuf_info =3D { .name =3D TYPE_VHOST_USER_FS, .parent =3D TYPE_VIRTIO_DEVICE, .instance_size =3D sizeof(VHostUserFS), + .instance_init =3D vuf_instance_init, .class_init =3D vuf_class_init, }; =20 --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884269; cv=none; d=zohomail.com; s=zohoarc; b=A7ql1wIkOKDMMojxOQsKxZ1hqvOT+ndBZZw7VmQ0hHB39ODx0iajN/BagXUPl5NIDnAjvbPARmemTf42ugnaxuFVbRNeStU9AEKJOTGZzoMntMpN5XnMAKHwp0kVSzto3l5P8NJeSp+BIj13EXjdQKLSzxKzPg2TuDZfwY+vqBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884269; 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=qs7ogMByT0cgmdesR1LdPto4mpNAsIOhgrB6/0e9rnI=; b=MzB0W0kHX2hvxcReFQD5+ANgcAIEM+C9aMxIlAXzKDw8eJapkEt7HxDgs74wmaS5gxnyVqoajZS2JAUkEfFgdYlEPId9DoHXQcOMMga2PArw99mcyOtUexQfE8T0tNMhieoJAoVh98OEeZZ3zbuS6PASucfmLLwBTYzAGJgjDE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1610884269662255.56205440062024; Sun, 17 Jan 2021 03:51:09 -0800 (PST) Received: from localhost ([::1]:50590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16aK-0003Mz-MI for importer@patchew.org; Sun, 17 Jan 2021 06:51:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16Vs-0001WC-6k for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vp-0008Bm-MV for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:31 -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-527-V44mx7w3M6q2Zv15s32RQQ-1; Sun, 17 Jan 2021 06:46:27 -0500 Received: by mail-wr1-f72.google.com with SMTP id b8so6770462wrv.14 for ; Sun, 17 Jan 2021 03:46:26 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id w1sm23392739wrr.84.2021.01.17.03.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883989; 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=qs7ogMByT0cgmdesR1LdPto4mpNAsIOhgrB6/0e9rnI=; b=VHFM/jSb9jRvKR0tfNAb1OYJcz0/0aVyAvruLCOFrRV1Qc8ujGrQVwR4Qz7gcmtpAVLKso fjOJZ/Sbmz5mg+C3g2jJphNvXC7oY8UM4NNgH6sZhhFAG5nBMy4oWNxI1gPP8dobmUnk48 WsFEvPOdYa+atHW6c8zsjDyecwT40eY= X-MC-Unique: V44mx7w3M6q2Zv15s32RQQ-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=qs7ogMByT0cgmdesR1LdPto4mpNAsIOhgrB6/0e9rnI=; b=g5n2V9WosbCxkTvwN1vvOg/3IznCWFiw11947Ju6w06atKgbia04gT86WfN05Z4i7H YqF5M1H/+cQ4T0Xa4+B0GKGFUV737YjsnRj3KQRcSnIfVxw9VkAqqJ79FZgesgMRjkSG 0fiiYYZNj/ftf0oYvnQjeBWHm1nQ3nu1FXixmNdmhxkF4cvCJ1Wnivnfirfqx4yb2rVw vRlqBSmXb96/1OncvoLgA82wmSxyNsmnmmxtWwfrnfbkXjD0RiLJ9+WTuYGNsPF5lpB2 UzJpEcNONLTH25FlEKvJ2DzLRPm/yU7WSjYPp9tOOPRZzzpEU2bR4RtcNPmtw0X4M0NN IZpw== X-Gm-Message-State: AOAM531Gau8ENt+IK+SJqk+omkFlaPwCoM+kanrf2QOqBV7WcSnJytop qpkRNU9XPchsKuQp+JJvcKNZR2g1hwyqbp89RTnKXXCnppBiZB0WyI7eNad4gynNEUS0C4o8LyD zzaNCWaWtFMjvgzPv1A3z8RyoXIisqKr+regqkEZWZnmavmwKry3GLEgBNrpL X-Received: by 2002:a1c:2155:: with SMTP id h82mr16346442wmh.132.1610883985634; Sun, 17 Jan 2021 03:46:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJz72L8QUuPCDGLBWF4EGSv0o1wptbruzZxfMiQO3E+/sqIitMNvl0dvIwBJfe5HEb2jbthvDQ== X-Received: by 2002:a1c:2155:: with SMTP id h82mr16346433wmh.132.1610883985484; Sun, 17 Jan 2021 03:46:25 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:23 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 03/10] acpi: Allow DSDT acpi table changes Message-ID: <20210117114519.539647-4-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jiahui Cen Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-2-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..42418e58e7 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,6 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/microvm/DSDT.pcie", +"tests/data/acpi/virt/DSDT", +"tests/data/acpi/virt/DSDT.memhp", +"tests/data/acpi/virt/DSDT.numamem", +"tests/data/acpi/virt/DSDT.pxb", --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884489; cv=none; d=zohomail.com; s=zohoarc; b=OrkPwaM78GzUfE3o3LMx7yDl6R3lLfpWibWD2zLhGIsuwo/DnAP3Rq8vCHypDvI/3H7KfpR/huxJPDvbunVyW0tEz/8Ep/mXU0Qf8IKMX2k4DsKbXZhAE50ndOVaplRxyD1ttnhfTbfMsZHeU3HLTVnXi4/sJyV5uiBovnPB1xI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884489; 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=wtBD/fOgceuFjvjkkNCQvIfgVbHnsWCgQv6uWu9glD4=; b=fItT5MF5BSEpkjMTF0Wm4fNAGZFf0Dys9U6OBSjzpNpvo5ds+AtJGakKj2pQ7eZjF4YNJbNusRejIgP4nWcw61VuwFSl43eo/B67fKVsFVjJJZiM5nCN4KTxzmrTCciw24K/20S6GbQu3V69yz477adsFaBoTyTlXixx0Gk0ZLM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 161088448960635.56873425268884; Sun, 17 Jan 2021 03:54:49 -0800 (PST) Received: from localhost ([::1]:58166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16ds-0006cf-Gi for importer@patchew.org; Sun, 17 Jan 2021 06:54:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16Vu-0001YU-JN for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vs-0008CM-GB for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:34 -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-192-2NVVfRssOdC0lsoI80lpiw-1; Sun, 17 Jan 2021 06:46:29 -0500 Received: by mail-wr1-f71.google.com with SMTP id u29so6797443wru.6 for ; Sun, 17 Jan 2021 03:46:29 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id r13sm22742018wrt.10.2021.01.17.03.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883991; 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=wtBD/fOgceuFjvjkkNCQvIfgVbHnsWCgQv6uWu9glD4=; b=XNLCVs7sY2AmMaDAe5VebZ2Ba65MJb47UMyc6lE+o/mIJmuMlv/XRMe20b6YDiGlAyqE4b KbRuG13W4hdUhLoG+215e1D+f2WbwbyjbHG5im2+zjKwmmTuauSg3/g6E351EoTm0QUCJ2 Effr6GC5c2Q+9MAs9mguWrW7AWbfn00= X-MC-Unique: 2NVVfRssOdC0lsoI80lpiw-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=wtBD/fOgceuFjvjkkNCQvIfgVbHnsWCgQv6uWu9glD4=; b=GwrbgH24o6OZLRVO8lkc48wcwWMUqTRc9GKokT7uP6MWzdqCAifxwhxUAq/SQEixgR FydFNp3VTxy1nZH7lwvFXES9drb3vixson8ZpdWCqgSt8LYetZbgxlY6jzVh+QWjyxix iwEOIoTFyVwUV0Ws/ZSc3exE8fG/Rheg+sNsaSUhB32gquc74WRFpPhUjcb2+Lll1buz aawmse7wvm8L2J908A67GjK+FcPWn9xuWUYayYd9w21vHyR5i/Gv5NAvVxJLMdbgwgBr 8YAmnoymiAULKs23sxoMU6TN7kNHD1r7zZA60ZonxuNS2UuO0RyNj+aJmBMFn/EJNVpG 62wQ== X-Gm-Message-State: AOAM532/FIRCAjPhkMFWwbVSOSsjveCDwg1gybxgri67Xhfu3RDvaatR SYjiVyHt/KL7O2TrIAcWjOyTcO001X7qPVPtXT/jot4BVFH+NpAduahplTBEmUpTAhZbLGSrCdn 6MSXitEn4paZCUW0wor82NPQpCTwcUB6SStxX1RzIVuc3/z/3aKvHZHsTCDOI X-Received: by 2002:a1c:a7c5:: with SMTP id q188mr16249509wme.108.1610883987777; Sun, 17 Jan 2021 03:46:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKqY0j7vI12F70My5AC2OBes/mT7jXru+Vs/V91FemuWaKBlzydZFLanscoNGR1/1/0NMVhA== X-Received: by 2002:a1c:a7c5:: with SMTP id q188mr16249497wme.108.1610883987605; Sun, 17 Jan 2021 03:46:27 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:25 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 04/10] acpi: Fix unmatched expected DSDT.pxb file Message-ID: <20210117114519.539647-5-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jiahui Cen Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does not use the up-to-date expected file for pxb for ARM virt. Fix the expected DSDT.pxb file. Full diff of changed file disassembly: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 09:33:09 2021 + * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 13:34:47 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x00001E7A (7802) + * Length 0x00001DF9 (7673) * Revision 0x02 - * Checksum 0x57 + * Checksum 0x42 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -45,32 +45,6 @@ }) } - Device (FLS0) - { - Name (_HID, "LNRO0015") // _HID: Hardware ID - Name (_UID, Zero) // _UID: Unique ID - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings - { - Memory32Fixed (ReadWrite, - 0x00000000, // Address Base - 0x04000000, // Address Length - ) - }) - } - - Device (FLS1) - { - Name (_HID, "LNRO0015") // _HID: Hardware ID - Name (_UID, One) // _UID: Unique ID - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings - { - Memory32Fixed (ReadWrite, - 0x04000000, // Address Base - 0x04000000, // Address Length - ) - }) - } - Device (FWCF) { Name (_HID, "QEMU0002") // _HID: Hardware ID @@ -665,9 +639,6 @@ { Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardwar= e ID Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID - Name (_ADR, Zero) // _ADR: Address - Name (_CCA, One) // _CCA: Cache Coherency Attribute - Name (_SEG, Zero) // _SEG: PCI Segment Name (_BBN, 0x80) // _BBN: BIOS Bus Number Name (_UID, 0x80) // _UID: Unique ID Name (_STR, Unicode ("pxb Device")) // _STR: Description Stri= ng @@ -1857,7 +1828,7 @@ Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID Name (_SEG, Zero) // _SEG: PCI Segment Name (_BBN, Zero) // _BBN: BIOS Bus Number - Name (_UID, "PCI0") // _UID: Unique ID + Name (_UID, Zero) // _UID: Unique ID Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description S= tring Name (_CCA, One) // _CCA: Cache Coherency Attribute Name (_PRT, Package (0x80) // _PRT: PCI Routing Table @@ -2983,41 +2954,37 @@ Return (0x0000004010000000) } - Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Set= tings + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { - Return (ResourceTemplate () - { - WordBusNumber (ResourceProducer, MinFixed, MaxFixed, P= osDecode, - 0x0000, // Granularity - 0x0000, // Range Minimum - 0x007F, // Range Maximum - 0x0000, // Translation Offset - 0x0080, // Length - ,, ) - DWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, - 0x00000000, // Granularity - 0x10000000, // Range Minimum - 0x3EFEFFFF, // Range Maximum - 0x00000000, // Translation Offset - 0x2EFF0000, // Length - ,, , AddressRangeMemory, TypeStatic) - DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDeco= de, EntireRange, - 0x00000000, // Granularity - 0x00000000, // Range Minimum - 0x0000FFFF, // Range Maximum - 0x3EFF0000, // Translation Offset - 0x00010000, // Length - ,, , TypeStatic, DenseTranslation) - QWordMemory (ResourceProducer, PosDecode, MinFixed, Ma= xFixed, NonCacheable, ReadWrite, - 0x0000000000000000, // Granularity - 0x0000008000000000, // Range Minimum - 0x000000FFFFFFFFFF, // Range Maximum - 0x0000000000000000, // Translation Offset - 0x0000008000000000, // Length - ,, , AddressRangeMemory, TypeStatic) - }) - } - + WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDe= code, + 0x0000, // Granularity + 0x0000, // Range Minimum + 0x007F, // Range Maximum + 0x0000, // Translation Offset + 0x0080, // Length + ,, ) + DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, + 0x00000000, // Granularity + 0x10000000, // Range Minimum + 0x3EFEFFFF, // Range Maximum + 0x00000000, // Translation Offset + 0x2EFF0000, // Length + ,, , AddressRangeMemory, TypeStatic) + DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, = EntireRange, + 0x00000000, // Granularity + 0x00000000, // Range Minimum + 0x0000FFFF, // Range Maximum + 0x3EFF0000, // Translation Offset + 0x00010000, // Length + ,, , TypeStatic, DenseTranslation) + QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFix= ed, NonCacheable, ReadWrite, + 0x0000000000000000, // Granularity + 0x0000008000000000, // Range Minimum + 0x000000FFFFFFFFFF, // Range Maximum + 0x0000000000000000, // Translation Offset + 0x0000008000000000, // Length + ,, , AddressRangeMemory, TypeStatic) + }) Name (SUPP, Zero) Name (CTRL, Zero) Method (_OSC, 4, NotSerialized) // _OSC: Operating System Cap= abilities Fixes: fe1127da11 ("unit-test: Add the binary file and clear diff.h") Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-3-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/virt/DSDT.pxb | Bin 7802 -> 7673 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb index d5f0533a02d62bc2ae2db9b9de9484e5c06652fe..76f5f1c2fd487644c6b4f827a70= ad770edb9fdc9 100644 GIT binary patch delta 70 zcmV-M0J;DAJo!5cL{mgm`5gcN0z#1r8v=3DygktblW?YIa6OPZ6X2_m!G35f{>PNz^q cNt3DxACrg^53`&Ttq27OUqez;vr-%=3D0*oRUFaQ7m delta 217 zcmexq{mX{SCDlgWL> (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 161088448757715.483438688115143; Sun, 17 Jan 2021 03:54:47 -0800 (PST) Received: from localhost ([::1]:58046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16dq-0006Zu-KR for importer@patchew.org; Sun, 17 Jan 2021 06:54:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16Vw-0001ZO-3K for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vu-0008De-8o for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:35 -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-581-Ni2Jh-PDMu2M6DUCbTW2pg-1; Sun, 17 Jan 2021 06:46:31 -0500 Received: by mail-wr1-f71.google.com with SMTP id u14so6791568wrr.15 for ; Sun, 17 Jan 2021 03:46:31 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id g5sm23726445wro.60.2021.01.17.03.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883993; 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=cv8NCSnDR61r/aUfo07trvUlRljwOTJNatKWO9Bv3Hg=; b=Vfe1vBcDZCHx6ZyNOvSsHtwT/fPi0+lFJASv/8uGbbTXXZTS8B5lyIM92MC7ZoddeEQd4u NcLWLvAZr7G7/fucjoWVvQwT4+tZAzUMT4U6G6NnDWYB/9Wh6ohf8wJI1XEyAZfttD4TEG xL5iJglrM6iiHWOz/kfVQ5zoA2dvV6g= X-MC-Unique: Ni2Jh-PDMu2M6DUCbTW2pg-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=cv8NCSnDR61r/aUfo07trvUlRljwOTJNatKWO9Bv3Hg=; b=sSlA+ukVsPcK1X+RCMQzCJEcbz+/4ero7jEL9iVRR6sM90JP+xdMnf0/6mGzM4tJwy rKemdQKxfJ9kdOaguV2bhY1we3tOMcOb7P6WwPf5HF5ZPAemR6dzDqOEuCuVv7Dx4NhB mDe88QPZxKC30sT7jZM4MuSeFXx10hYDfWz5vuaoQPWK596yRKZKH7Gdg8AHO8HSstgy T8qTNJ3ovwh+8G2a25Dht5Ntl00uAW7OofK14CHrLQimuqmUjm9y6Q96Hh0I0aD8XDAg 9ru2PT9I3UpajxZ6x8vgxJ12qsYP2F8EFuNr2WfYEmQ1AI7ik8+qvyjUU4uS15B4temm HElg== X-Gm-Message-State: AOAM531KBjrBuohOVvWwiqfodpf4KQ7Z1ky4zq+lJ34sMIo3z8QAcTRu Iuf3jxrS5F2hYdXZ+ZzM/55hks5mNETQ06337ffSvEtBjJHN9GWtztxgLq/5Y8vRjEZO8fQBoAF OglBjyJjYU6L8E1FusM+QGSxW3nJ8KPVUKGowsnERsRLmCz1MjnDxtnB0PKVO X-Received: by 2002:adf:ded1:: with SMTP id i17mr21064910wrn.190.1610883990123; Sun, 17 Jan 2021 03:46:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJya7GxmacKoZ5ewNMETUO4uvI3qANJnhHbW7tMU9BaIAUVmNl4BZZD+HA8WSeaFiqicPAp7Mg== X-Received: by 2002:adf:ded1:: with SMTP id i17mr21064888wrn.190.1610883989951; Sun, 17 Jan 2021 03:46:29 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:27 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 05/10] acpi: Add addr offset in build_crs Message-ID: <20210117114519.539647-6-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , 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: Jiahui Cen AML needs Address Translation offset to describe how a bridge translates addresses accross the bridge when using an address descriptor, and especially on ARM, the translation offset of pio resource is usually non zero. Therefore, it's necessary to pass offset for pio, mmio32, mmio64 and bus number into build_crs. Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-4-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/aml-build.h | 4 +++- hw/acpi/aml-build.c | 18 ++++++++++-------- hw/i386/acpi-build.c | 3 ++- hw/pci-host/gpex-acpi.c | 3 ++- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index e727bea1bc..54a5aec4d7 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -452,7 +452,9 @@ void crs_replace_with_free_ranges(GPtrArray *ranges, void crs_range_set_init(CrsRangeSet *range_set); void crs_range_set_free(CrsRangeSet *range_set); =20 -Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set); +Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_off= set, + uint32_t mmio32_offset, uint64_t mmio64_offset, + uint16_t bus_nr_offset); =20 void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, uint64_t len, int node, MemoryAffinityFlags flags); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index f976aa667b..7b6ebb0cc8 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -2076,7 +2076,9 @@ void build_tpm2(GArray *table_data, BIOSLinker *linke= r, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, = NULL); } =20 -Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set) +Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set, uint32_t io_off= set, + uint32_t mmio32_offset, uint64_t mmio64_offset, + uint16_t bus_nr_offset) { Aml *crs =3D aml_resource_template(); CrsRangeSet temp_range_set; @@ -2189,10 +2191,10 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *ran= ge_set) for (i =3D 0; i < temp_range_set.io_ranges->len; i++) { entry =3D g_ptr_array_index(temp_range_set.io_ranges, i); aml_append(crs, - aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED, - AML_POS_DECODE, AML_ENTIRE_RANGE, - 0, entry->base, entry->limit, 0, - entry->limit - entry->base + 1)); + aml_dword_io(AML_MIN_FIXED, AML_MAX_FIXED, + AML_POS_DECODE, AML_ENTIRE_RANGE, + 0, entry->base, entry->limit, io_offset, + entry->limit - entry->base + 1)); crs_range_insert(range_set->io_ranges, entry->base, entry->limit); } =20 @@ -2205,7 +2207,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range= _set) aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED, AML_NON_CACHEABLE, AML_READ_WRITE, - 0, entry->base, entry->limit, 0, + 0, entry->base, entry->limit, mmio32_o= ffset, entry->limit - entry->base + 1)); crs_range_insert(range_set->mem_ranges, entry->base, entry->limit); } @@ -2217,7 +2219,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range= _set) aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED, AML_NON_CACHEABLE, AML_READ_WRITE, - 0, entry->base, entry->limit, 0, + 0, entry->base, entry->limit, mmio64_o= ffset, entry->limit - entry->base + 1)); crs_range_insert(range_set->mem_64bit_ranges, entry->base, entry->limit); @@ -2230,7 +2232,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range= _set) 0, pci_bus_num(host->bus), max_bus, - 0, + bus_nr_offset, max_bus - pci_bus_num(host->bus) + 1)); =20 return crs; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f18b71dea9..f56d699c7f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1360,7 +1360,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, } =20 aml_append(dev, build_prt(false)); - crs =3D build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_rang= e_set); + crs =3D build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_rang= e_set, + 0, 0, 0, 0); aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(scope, dev); aml_append(dsdt, scope); diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index 7f20ee1c98..11b3db8f71 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -168,7 +168,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *= cfg) * 1. The resources the pci-brige/pcie-root-port need. * 2. The resources the devices behind pxb need. */ - crs =3D build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_rang= e_set); + crs =3D build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_rang= e_set, + cfg->pio.base, 0, 0, 0); aml_append(dev, aml_name_decl("_CRS", crs)); =20 acpi_dsdt_add_pci_osc(dev); --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884681; cv=none; d=zohomail.com; s=zohoarc; b=QFblClKdYeLoM+Qt7tnQYorGQ+GOK1UXMOAotdNgBfzAAkE+KHJxrBrh7JSEQgncBVV6bJQxHsenAX1Xw2WqZgk5LAoJuwH1GpZbYRbdFYd/5OBccKcAyi7Oz46M2wWE2a8b7+7JgBETHOj7rYvGKWI4BS0Brv0hZ6QiGJ59+E4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884681; 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=64ubvJBtg1XcRnPmbMoHYG7QMqq5ANQsdIveleP9CdQ=; b=VFuKkiO43pFhoBo7OT2nDw21wGuhhszIB34orGczBtFORZ0yZ/DU9IvcdEoDnfMkmQsRjSpxpYmQosshU+uz1vSdKenwKEwR/yH1IV5qjwmcKXZ14JcUEjgJeFRfwfE4UoYT7M6i5hkFNSM0RR0A94anQX1TS1ytCvippBGPwmE= 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 1610884681651789.9517970115508; Sun, 17 Jan 2021 03:58:01 -0800 (PST) Received: from localhost ([::1]:35472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16gy-0000YU-Ec for importer@patchew.org; Sun, 17 Jan 2021 06:58:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16W2-0001gl-Mb for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vw-0008FB-Sq for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:40 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-nW5_rnPcM2qxQnShgf5-zQ-1; Sun, 17 Jan 2021 06:46:34 -0500 Received: by mail-wr1-f69.google.com with SMTP id g16so6803427wrv.1 for ; Sun, 17 Jan 2021 03:46:34 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id b10sm5189931wmj.2.2021.01.17.03.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883996; 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=64ubvJBtg1XcRnPmbMoHYG7QMqq5ANQsdIveleP9CdQ=; b=QPFFhVpyJzMD5VH1yPDKyDEi4kkZzHMlaRsXI1GweVd60SS6Ea/gS7nlR8KMay9ZfdLBX9 7OxjFhTfnzv+nek6vm9uNRRHGabfUy+tyneqBbe2KtGxR4zu2zRExscnxlPh8Ye0S9YwIh BtKHt9+K40M+OQc5mIAyaU4APsDyxOs= X-MC-Unique: nW5_rnPcM2qxQnShgf5-zQ-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=64ubvJBtg1XcRnPmbMoHYG7QMqq5ANQsdIveleP9CdQ=; b=guhjFWph3JoNGbqeecqXjz2YqEAkyNx13+t2NXOmRx/j7GCgvzVE7iGmGkFQzVuw03 dG59CZkk8NaJekYTJuKHxQKLjBi372R2A/YAaqcaJGz6Jw5BGRuE1TUGWAiD5HwnzYA/ DhwBuu7a6OA+e+sNkYonsAA8oQcqyTIuWnS7td0DxdyiUUr/fCauN7Whalis+SOS4r8V PLTm+vxsh6zJiW2v47afeQ23rZU2IPR6hUX349eR/zOh4chSV/YsszTb+JsNpo+HkdsC PpnyE1iB1W5QL65ihZiUmIK16NdArqJDuavL8jlR9Z7lR7muCsFrguRS3VgdCyPqL+bL 4p5w== X-Gm-Message-State: AOAM531GInU24gq1UlHdPB8qdTxgd15jlXrsn2tXznfTprE07AkScI0Z j4SkZ/F7sD33NQnzIoKnrDnXf2bJejjRSh8N5KLvp4wXEUg98YyfN+RBWojbpLL7JWDvDU995eL w65sAe5i04pgOMlCab+iA5GmhAvvlmbnxi1W6fWk4rWvYhgyLIMRYHxBXmDwU X-Received: by 2002:a1c:96d7:: with SMTP id y206mr16746914wmd.9.1610883992497; Sun, 17 Jan 2021 03:46:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxG+sq+B32wLg44yohnDVANTj//6UZ2/gjvCb0JscEGR4tLg5b5Y8M8AlBlor3sB749d/Iogw== X-Received: by 2002:a1c:96d7:: with SMTP id y206mr16746899wmd.9.1610883992280; Sun, 17 Jan 2021 03:46:32 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:30 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 06/10] acpi/gpex: Inform os to keep firmware resource map Message-ID: <20210117114519.539647-7-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , Gerd Hoffmann , Yubo Miao , 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: Jiahui Cen There may be some differences in pci resource assignment between guest os and firmware. Eg. A Bridge with Bus [d2] -+-[0000:d2]---01.0-[d3]----01.0 where [d2:01.00] is a pcie-pci-bridge with BAR0 (mem, 64-bit, non-pref)= [size=3D256] [d3:01.00] is a PCI Device with BAR0 (mem, 64-bit, pref) [size=3D= 128K] BAR4 (mem, 64-bit, pref) [size=3D= 64M] In EDK2, the Resource Map would be: PciBus: Resource Map for Bridge [D2|01|00] Type =3D PMem64; Base =3D 0x8004000000; Length =3D 0x4100000; = Alignment =3D 0x3FFFFFF Base =3D 0x8004000000; Length =3D 0x4000000; Alignment =3D 0= x3FFFFFF; Owner =3D PCI [D3|01|00:20] Base =3D 0x8008000000; Length =3D 0x20000; Alignment =3D 0= x1FFFF; Owner =3D PCI [D3|01|00:10] Type =3D Mem64; Base =3D 0x8008100000; Length =3D 0x100; Align= ment =3D 0xFFF It would use 0x4100000 to calculate the root bus's PMem64 resource wind= ow. While in Linux, kernel will use 0x1FFFFFF as the alignment to calculate the PMem64 size, which would be 0x6000000. So kernel would try to allocate 0x6000000 from the PMem64 resource window, but since the window size is 0x4100000 as assigned by EDK2, the allocation would fail. The diffences could result in resource assignment failure. Using _DSM #5 method to inform guest os not to ignore the PCI configuration that firmware has done at boot time could handle the differences. Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-5-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci-host/gpex-acpi.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index 11b3db8f71..cb13e75d2f 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -112,10 +112,26 @@ static void acpi_dsdt_add_pci_osc(Aml *dev) UUID =3D aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D"); ifctx =3D aml_if(aml_equal(aml_arg(0), UUID)); ifctx1 =3D aml_if(aml_equal(aml_arg(2), aml_int(0))); - uint8_t byte_list[1] =3D {1}; - buf =3D aml_buffer(1, byte_list); + uint8_t byte_list[] =3D { + 0x1 << 0 /* support for functions other than function 0 */= | + 0x1 << 5 /* support for function 5 */ + }; + buf =3D aml_buffer(ARRAY_SIZE(byte_list), byte_list); aml_append(ifctx1, aml_return(buf)); aml_append(ifctx, ifctx1); + + /* + * PCI Firmware Specification 3.1 + * 4.6.5. _DSM for Ignoring PCI Boot Configurations + */ + /* Arg2: Function Index: 5 */ + ifctx1 =3D aml_if(aml_equal(aml_arg(2), aml_int(5))); + /* + * 0 - The operating system must not ignore the PCI configuration that + * firmware has done at boot time. + */ + aml_append(ifctx1, aml_return(aml_int(0))); + aml_append(ifctx, ifctx1); aml_append(method, ifctx); =20 byte_list[0] =3D 0; --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884704; cv=none; d=zohomail.com; s=zohoarc; b=a/KyxF4gXAg/WqVvg77bTdWJxU2XBhtL32zsmxyYPbY0eQHsdRW+fyWSOuhhOtsO6W9vBUYuCVQBWLt5XOQ6qKVAh301B9ulOqjNE7oL2RC7ShVMJubPLLWE8Srw22Mc2DfP5D0sA6QEc3TnNCHmX4Rr5IVlqqoukQXZolvDDUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884704; 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=yM0UVe2zhRG2MUk1cz+zM7uKYIy9ql8KcLv5si30cN4=; b=hQw4ER9UIDzsQXPl7mVO2uT26BYSfK4UXOssloUPw6UYYVCGplzUWL9xWRTbA0TkUb0Ju2ZsP8RZnqw5vSbvNKpEdNA3SPvEjQXgWYoqehjzGx6WfMAcVOomrpjNz7OPAJ811CKQl8Em58SMfnHBEhQHbpufEb7gOUOoDbUcQrA= 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 1610884704546580.0334378781185; Sun, 17 Jan 2021 03:58:24 -0800 (PST) Received: from localhost ([::1]:35584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16hL-0000bO-JV for importer@patchew.org; Sun, 17 Jan 2021 06:58:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16WA-0001qO-Bz for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16Vz-0008GB-E8 for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:48 -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-85-BlhPcC2DMzqBiEPIsO5Mdg-1; Sun, 17 Jan 2021 06:46:36 -0500 Received: by mail-wr1-f72.google.com with SMTP id n11so6775031wro.7 for ; Sun, 17 Jan 2021 03:46:36 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id c2sm18233915wrt.87.2021.01.17.03.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610883998; 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=yM0UVe2zhRG2MUk1cz+zM7uKYIy9ql8KcLv5si30cN4=; b=bUJMXpsBlzhV6HBVJBuv9ArQ7r1r2RzFgnIF78BLbmA83WjCjDrMNxapIs2m2HyFtZBpA2 KA+Y2iMnx1KUztF7Z5Z+9+GFOpUt1RkSwC8pzFjJW10rIx2acTcRCLZyBcQjZIjNMi0Tmc STbOCrI6TTDzof2UiXMvkB9FSbPzH/I= X-MC-Unique: BlhPcC2DMzqBiEPIsO5Mdg-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=yM0UVe2zhRG2MUk1cz+zM7uKYIy9ql8KcLv5si30cN4=; b=rRdf33KP1jF8NKY9CILWbMxhKRUaJoYC2RQvbUdi259/s28BFqiZpOqFTuzSIIW2JA vt8V5/061FgGTLHo5BBdyu/7B1xCsGZ5DgzSNrXSvEprNhLwU/n916sm84RQ24jaYSiz +geMgmdKieFfgZUDKdlx7nYKRsSdyBNmMsSTBZKgxk7gZ7THIAhgYiGeOkvqtI4sdMWk YGF3EHNx9KX1vV890gDtzOjAJosh1ilTfqca3eh7sRDCaJHI0miOoKcZpNQChuAeCTy6 fCAGn2/hUXmBxgOPMguBzjh01xE/MixBUH4263R/tGQGewt4+54IYWtKeEgIA44hoavV O0WA== X-Gm-Message-State: AOAM532ol4czE9okT9DPNJbMn5wzFmP5QmQe8UYFoXJH4lVFstiRMeQF YyTVORQEFXyUnHC1ZFG2/BYrkquDp0kIXo9qJW6SEO65Nj77UVE3HtZdJAW/elKTKh7AD379EEG bnpoA8DjofmJqbRQWAAlfXnsJiy/O07NizrObU0KzWjfjmuIVNsPKyWqOWmtI X-Received: by 2002:a5d:50c3:: with SMTP id f3mr21148312wrt.287.1610883995029; Sun, 17 Jan 2021 03:46:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyx4aVfeK9iUe6JySlrW1Xad/q55NKd51w06jwB5qKj0AcUfJsOuyJJe4xKMsdCg9R5paDWnA== X-Received: by 2002:a5d:50c3:: with SMTP id f3mr21148297wrt.287.1610883994819; Sun, 17 Jan 2021 03:46:34 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:32 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 07/10] acpi/gpex: Exclude pxb's resources from PCI0 Message-ID: <20210117114519.539647-8-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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: Yubo Miao , Peter Maydell , Jiahui Cen , 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: Jiahui Cen Exclude the resources of extra root bridges from PCI0's _CRS. Otherwise, the resource windows would overlap in guest, and the IO resource window would fail to be registered. Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-6-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci-host/gpex-acpi.c | 64 +++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index cb13e75d2f..446912d771 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -146,6 +146,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *= cfg) Aml *method, *crs, *dev, *rbuf; PCIBus *bus =3D cfg->bus; CrsRangeSet crs_range_set; + CrsRangeEntry *entry; + int i; =20 /* start to construct the tables for pxb */ crs_range_set_init(&crs_range_set); @@ -193,7 +195,6 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *= cfg) aml_append(scope, dev); } } - crs_range_set_free(&crs_range_set); =20 /* tables for the main */ dev =3D aml_device("%s", "PCI0"); @@ -211,36 +212,55 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig= *cfg) aml_append(method, aml_return(aml_int(cfg->ecam.base))); aml_append(dev, method); =20 + /* + * At this point crs_range_set has all the ranges used by pci + * busses *other* than PCI0. These ranges will be excluded from + * the PCI0._CRS. + */ rbuf =3D aml_resource_template(); aml_append(rbuf, aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE, 0x0000, 0x0000, nr_pcie_buses - 1, 0x0000, nr_pcie_buses)); if (cfg->mmio32.size) { - aml_append(rbuf, - aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX= _FIXED, - AML_NON_CACHEABLE, AML_READ_WRITE, 0x0= 000, - cfg->mmio32.base, - cfg->mmio32.base + cfg->mmio32.size - = 1, - 0x0000, - cfg->mmio32.size)); + crs_replace_with_free_ranges(crs_range_set.mem_ranges, + cfg->mmio32.base, + cfg->mmio32.base + cfg->mmio32.size -= 1); + for (i =3D 0; i < crs_range_set.mem_ranges->len; i++) { + entry =3D g_ptr_array_index(crs_range_set.mem_ranges, i); + aml_append(rbuf, + aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FI= XED, + AML_NON_CACHEABLE, AML_READ_WRITE, 0x0000, + entry->base, entry->limit, + 0x0000, entry->limit - entry->base + 1)); + } } if (cfg->pio.size) { - aml_append(rbuf, - aml_dword_io(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECO= DE, - AML_ENTIRE_RANGE, 0x0000, 0x0000, - cfg->pio.size - 1, - cfg->pio.base, - cfg->pio.size)); + crs_replace_with_free_ranges(crs_range_set.io_ranges, + 0x0000, + cfg->pio.size - 1); + for (i =3D 0; i < crs_range_set.io_ranges->len; i++) { + entry =3D g_ptr_array_index(crs_range_set.io_ranges, i); + aml_append(rbuf, + aml_dword_io(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE, + AML_ENTIRE_RANGE, 0x0000, entry->base, + entry->limit, cfg->pio.base, + entry->limit - entry->base + 1)); + } } if (cfg->mmio64.size) { - aml_append(rbuf, - aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX= _FIXED, - AML_NON_CACHEABLE, AML_READ_WRITE, 0x0= 000, - cfg->mmio64.base, - cfg->mmio64.base + cfg->mmio64.size - = 1, - 0x0000, - cfg->mmio64.size)); + crs_replace_with_free_ranges(crs_range_set.mem_64bit_ranges, + cfg->mmio64.base, + cfg->mmio64.base + cfg->mmio64.size -= 1); + for (i =3D 0; i < crs_range_set.mem_64bit_ranges->len; i++) { + entry =3D g_ptr_array_index(crs_range_set.mem_64bit_ranges, i); + aml_append(rbuf, + aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FI= XED, + AML_NON_CACHEABLE, AML_READ_WRITE, 0x0000, + entry->base, + entry->limit, 0x0000, + entry->limit - entry->base + 1)); + } } aml_append(dev, aml_name_decl("_CRS", rbuf)); =20 @@ -259,4 +279,6 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *= cfg) aml_append(dev_res0, aml_name_decl("_CRS", crs)); aml_append(dev, dev_res0); aml_append(scope, dev); + + crs_range_set_free(&crs_range_set); } --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884904; cv=none; d=zohomail.com; s=zohoarc; b=GU+wjYXryVoCKezOaejAZBnpvcC09z60qY+9XFbLCyJ1iabaNUIYeX5LQnNeu1wrsrfL0DWdtKikXod7ZJv47g6/LErxFFGvXRTa7bI+Td9tZub2fbmdGc1jIJVNTpXdpNB7gXFmUrs5p8qRICEjOGcOSVf26NyNLe56sKHHjOk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884904; 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=3Ve2ARHYvLFIq8kepyLE4GCsFnzf21hx4ojk8moHaEs=; b=CP8SaqtUwOe8N8CN2t4H0lpjwUzatY7509ULa2J7j2ufNsVTF/KBHGRjrnl2Sx9yUiJvEBl62aeJBQlLBFByXIdLO4tJ7sIfz0rpRGA4tC9pE6CgTvDFk3t4xZZKYrr9oKh5BREwWoGVBKaLAbvJ8u2593lrlMAlLf/yDrQExyA= 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 1610884904565330.5951621487642; Sun, 17 Jan 2021 04:01:44 -0800 (PST) Received: from localhost ([::1]:39336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16kX-0002KJ-OV for importer@patchew.org; Sun, 17 Jan 2021 07:01:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16WA-0001s6-TO for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16W2-0008Ge-Et for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:50 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-qRQulJVkOnml6SnbT7W_1Q-1; Sun, 17 Jan 2021 06:46:38 -0500 Received: by mail-wr1-f69.google.com with SMTP id q18so6784195wrc.20 for ; Sun, 17 Jan 2021 03:46:38 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id h5sm24090493wrp.56.2021.01.17.03.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610884000; 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=3Ve2ARHYvLFIq8kepyLE4GCsFnzf21hx4ojk8moHaEs=; b=IhsJzgE2X/HvIBo8FtMHtDI9JUW8NEI8DzGxXVCvW3FieFaGmb03Iu0b8MLxDMQiNylIbZ TSfb8XDV+TfYgePtnhuhPuEvUg2QY9WZFCmwx1pIT4/OsFqbr5m0LE9EeoTI8zbRgKJxP+ CLEzv1ZHSGM9N3A4kkXxzevYeTSEyp4= X-MC-Unique: qRQulJVkOnml6SnbT7W_1Q-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=3Ve2ARHYvLFIq8kepyLE4GCsFnzf21hx4ojk8moHaEs=; b=Y1adugXrSiqBKRaI2HpzaBqYo37dTSjcQSehubAGR3p27b4dCUcrRHWuHatOu6I+Q+ crFXzN8vZQDEebqSRXk2pgLVbicrghkDucD8jF7gmjW4LKxdrXu7BlLMF/8wLcReqIJW dCpxuLFQsD1v+Ydyc6Y8Jx78lmFSqXwXySbioLZgRgtes+5txKKFN8xILd6f0LC+Vr4x 4GLmwqknLXTupGoEHMGRGa8JBYDAQVPo3dxZ3q4M+aCKyic5xNUl7hUZ4n8kz9s0cmw/ nZGUQ4cCdHpBW/COjQ+biGPk1uS4h1zzZr776LFxM2WhAGgMW/2rbaqjRlLtBn9X/+EL RuIg== X-Gm-Message-State: AOAM5336AUymCxGSFAIm0yAMvlkdqFdYDmEdW9iIBbh4hGV+rjWxwAgG bf+/LhDx9lOk+HGFUTi6CrxPq8Baq2cZAzwigXOMmm7MKOUC6S7dsg7YhWdcDUt9j0+44wzcQcx L91YXVFYmUvv6Q/FPnTcRBYpCvrVo8vt5ElUYT5TLHa7wcmkPL0iNBbBq6Hjx X-Received: by 2002:a1c:3c04:: with SMTP id j4mr16614538wma.177.1610883997308; Sun, 17 Jan 2021 03:46:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7n6EC4+ir/pfsNq4vcfAuhGCPJFrDNHqzY4JP9w7pTBSMhfYWcKVrAM6UcJGxOftH+aHZUg== X-Received: by 2002:a1c:3c04:: with SMTP id j4mr16614524wma.177.1610883997089; Sun, 17 Jan 2021 03:46:37 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:34 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 08/10] Kconfig: Compile PXB for ARM_VIRT Message-ID: <20210117114519.539647-9-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , 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: Jiahui Cen PXB is now supported on ARM, so let's compile for arm_virt machine. Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-7-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/pci-bridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index a51ec716f5..f8df4315ba 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,7 +5,7 @@ config PCIE_PORT =20 config PXB bool - default y if Q35 + default y if Q35 || ARM_VIRT =20 config XIO3130 bool --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610884486; cv=none; d=zohomail.com; s=zohoarc; b=h2iHb6W81cpJ0r/42B5blM6TtWUacVGKmreRZnuJPFMJThRd7AqaTbJMz/65SMc0sd7Lk/dyXs65TcSzH/gxVG4XYC0wIWaeh11NodDJyEjQK6QKninvDCJikkYDJ7SZ5088GyNLyRE6MjcBMcCjTbHIiPZZARUIUwHqNKtzmw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610884486; 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=MqQtAiWC5T/ws37y6nXf0OqujwVirS3Y8UGvrA7Ic9M=; b=HQ8PKl/YVZLdT3DQr2qQMgMQfgglcE+wCp3FAaQ3Y6nEcIbcIb5uckG/MYxO/hoKgT/wBJp4WQFYo54VjpCaAdB/v/gmXuOCtmCq5FGAJF1s3nlXtYVNIagI9DBWmqWa+kxur+G9XOXh7kLdF7gp1u4aBzmfrXZNwdbmlOkyDr4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1610884486172713.321092145706; Sun, 17 Jan 2021 03:54:46 -0800 (PST) Received: from localhost ([::1]:57904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16dp-0006WO-5B for importer@patchew.org; Sun, 17 Jan 2021 06:54:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16WA-0001qh-Fr for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16W5-0008Gz-5C for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:46:50 -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-500-4yAPnoY9M9qvGnTwBXSAig-1; Sun, 17 Jan 2021 06:46:41 -0500 Received: by mail-wr1-f72.google.com with SMTP id v7so6734200wra.3 for ; Sun, 17 Jan 2021 03:46:41 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id i5sm18085138wmq.27.2021.01.17.03.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610884003; 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=MqQtAiWC5T/ws37y6nXf0OqujwVirS3Y8UGvrA7Ic9M=; b=KPkkxrYJViwa1P4YpmNQJSJ1vqJHt2Esrd6LObwUIhDeFSTJgcqWt55K41dVyIORAjPNDm cGHxbDcUYkCkDfiOvuRwBcoyXrmXrUdEd0zPnNYf16wLjTsw9HBNAf2E5+N3yd4mz09Lum a0c9k4htT0rWLUy4baaBVJcYAn/2/rE= X-MC-Unique: 4yAPnoY9M9qvGnTwBXSAig-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=MqQtAiWC5T/ws37y6nXf0OqujwVirS3Y8UGvrA7Ic9M=; b=QW4GuPbmcaDq5oFvXKMHXynhFIYdB8haT1E6PuOCFOl5L8xZlpk0sBlk9u3cK4yVvr SFd0TA/Y62lsHM4OlufZ1mv6WmJLJtaqxGytM91fPLtYNaX1mIFSesDGipjSj/FzNXrH WWaBrAL7to00k9uvc23r7pyDXQfqg2pQJjy1/lO0Utn5wcgpac+yvwGsdVtb2cuYbEBi Li1tKM0XVR+deXQyTGbf+QvnC8r4rF/Y2Hij5AnvL6WNixL0b/7f71/N4G7aBGbPY0yv 3oCOyr0q53LRBtP2YlTTcsbhQePCrLNxUxWTdW3Y5+8QZmyXqe3oISezcYo1wKdDYE6C /f+w== X-Gm-Message-State: AOAM530QYF7z7o/gUohyYqylFUp1Uq4NJrM7jmS10YVvTABewyXE7TEq 806W2HzSN+Mm8j+744T5WOPkuTg5k0P+W4V+jWQJrf6JmJUBZeWzqAyQ87IHsKTnSi2vkzxXt2E +RxArx0XqbGYdPQNv6/ogCrEAFTXkFEF6A70+el/fpl2WAvKEZUA+LHevw//v X-Received: by 2002:a5d:47ae:: with SMTP id 14mr21013439wrb.378.1610883999715; Sun, 17 Jan 2021 03:46:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKNVRsBIXxYuKmHrxr/5tSRtxZmi+9Tj6HTOP8jzaSlPjEUMe1VyE1R/avdmeIA/usEpkh/w== X-Received: by 2002:a5d:47ae:: with SMTP id 14mr21013429wrb.378.1610883999553; Sun, 17 Jan 2021 03:46:39 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:37 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 09/10] acpi: Enable pxb unit-test for ARM virt machine Message-ID: <20210117114519.539647-10-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jiahui Cen No matter whether the pxb is enabled or not, the CONFIG_PXB macro in test would keep undefined. And since pxb is now enabled for ARM Virt machine by default, let's enable pxb unit-test by removing the CONFIG_PXB. Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-8-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 4e026f90d0..669202fc95 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1196,7 +1196,6 @@ static void test_acpi_virt_tcg_numamem(void) =20 } =20 -#ifdef CONFIG_PXB static void test_acpi_virt_tcg_pxb(void) { test_data data =3D { @@ -1228,7 +1227,6 @@ static void test_acpi_virt_tcg_pxb(void) =20 free_test_data(&data); } -#endif =20 static void test_acpi_tcg_acpi_hmat(const char *machine) { @@ -1342,9 +1340,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt", test_acpi_virt_tcg); qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem); qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp); -#ifdef CONFIG_PXB qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb); -#endif } ret =3D g_test_run(); boot_sector_cleanup(disk); --=20 MST From nobody Mon Apr 29 09:03:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610885010; cv=none; d=zohomail.com; s=zohoarc; b=mbrbZNwBrAcyMzlhO1oBrUwRDl4d4pgUJdrmFBKe8KR8OoGPoyCk3akW0oZQ+T/9DnbWpQnVZY3AMt+oOR22NanlGgMgBzivQlCRUoalvAwkUlrBhPtTe1jMxvUZd4+fPyr8RJn46XR3K2Vert9t1LJvzx8LtkDiht+YGuDQ+oM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610885010; 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=OXweFu7zyB4HULBBVa+BgbvF5SsimgWtXkJJQCi1yZ8=; b=VN2ypJxpIMCYTOOQkrZaM4kqaoeYfJXuyx5iwZ1+9dcF9xqZ/y+QrgOa8fvuBuquNIyaStfzhTwGJ6gTUOP39qD11yuUlrlYWNU1K1YReVwTalQV/sl9ORxvw+FUV+PqubGmmnDzVNiy4zJ2GPXwxO4QrA5ovjsFwJuNZ+Q/i68= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1610885010449210.8156259906125; Sun, 17 Jan 2021 04:03:30 -0800 (PST) Received: from localhost ([::1]:41492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l16mH-0003LH-8K for importer@patchew.org; Sun, 17 Jan 2021 07:03:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l16ZJ-0003SM-Qg for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:50:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l16ZH-0001E2-NY for qemu-devel@nongnu.org; Sun, 17 Jan 2021 06:50:05 -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-301-J-n0Q9A_PC2bJwn8CiULTg-1; Sun, 17 Jan 2021 06:46:43 -0500 Received: by mail-wr1-f70.google.com with SMTP id e12so6788299wrp.10 for ; Sun, 17 Jan 2021 03:46:43 -0800 (PST) Received: from redhat.com (bzq-79-176-30-58.red.bezeqint.net. [79.176.30.58]) by smtp.gmail.com with ESMTPSA id p15sm23116730wrt.15.2021.01.17.03.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jan 2021 03:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610884202; 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=OXweFu7zyB4HULBBVa+BgbvF5SsimgWtXkJJQCi1yZ8=; b=UmsF0PhSQLIWGSG+pvaYV/aj8ukhmDjAW3JuTaZH947pmbvlpgkRaCaOGn7T/wPh+wa+4C lZ8ccfqLcNaZ1D5lqKz+XdwRoVD+5u36pu0ymBF9Sr5OPghSbji0WXUJ8rpsBnRcKXmM8B r3MxEX8CT6W96TLNW2t0QT6ZuVELqA8= X-MC-Unique: J-n0Q9A_PC2bJwn8CiULTg-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=OXweFu7zyB4HULBBVa+BgbvF5SsimgWtXkJJQCi1yZ8=; b=S/aOysLUZWncMAOUczl9HuY5GPpG98Vg8aL2RbRYU2fB/y20V6G8tsD4q6Hb4b+m6t YvRrHSPbnxOvytUdPPrTHhgS8RL8sJApXmdkSF/VL1AJvyzTi7ZPQL+GL0inetyHdrKx oP/tFSmcX6ALjbWdNtYRzMcx6TdonQukGJU3Fh8tSlF48Usq2+05E+kvVqFdJ3Wnn7BQ QkLA4IELyXSxXt1Egw1jiBfvvJOgbmXv8CWVPjDmIqFkaQNarkaapM0OmJokWAHENzc+ LNy14Zoh3jQDuU2ij+hEOvlp2OoIfPM/bglHhY/jN8tPggaFqZdrBXUJpcqbdo1lmorD eX1g== X-Gm-Message-State: AOAM5321JNHHXOOOp7QZARCcNB5aSa1CrHtpLkSsFv1xs9OZt21Nql/F AToFc+abQef3aaLbPzdE44+z3DP93KDB9WWD0nc4nLPA6uMwv3ZzWecc75Lgs4eQaZ61QLoRP6S vdVKm8r2QnQus88yQNeFL6gajHfJ4bK9mehPCyjwqpaOOvl98+tFZmhhIy3a9 X-Received: by 2002:adf:fd05:: with SMTP id e5mr21599979wrr.225.1610884001828; Sun, 17 Jan 2021 03:46:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSiJv5zAJUqsqGAWsiHYNlqwfQd4So6crFCNOzWqKEa0psdHtucsGyBqovknlys37zXzd8Yw== X-Received: by 2002:adf:fd05:: with SMTP id e5mr21599959wrr.225.1610884001571; Sun, 17 Jan 2021 03:46:41 -0800 (PST) Date: Sun, 17 Jan 2021 06:46:39 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 10/10] acpi: Update _DSM method in expected files Message-ID: <20210117114519.539647-11-mst@redhat.com> References: <20210117114519.539647-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210117114519.539647-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.252, 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 , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jiahui Cen A new _DSM #5 method is added. Update expected DSDT files accordingly, and re-enable their testing. Full diff of changed files disassembly: tests/data/acpi/microvm/DSDT.pcie.dsl: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/microvm/DSDT.pcie, Thu Jan 14 13:39:35 2= 021 + * Disassembly of tests/data/acpi/microvm/DSDT.pcie, Thu Jan 14 13:51:13 2= 021 * * Original Table Header: * Signature "DSDT" - * Length 0x00000BCF (3023) + * Length 0x00000BD7 (3031) * Revision 0x02 - * Checksum 0x29 + * Checksum 0x99 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -1302,9 +1302,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) tests/data/acpi/virt/DSDT.dsl: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/virt/DSDT, Thu Jan 14 13:39:35 2021 + * Disassembly of tests/data/acpi/virt/DSDT, Thu Jan 14 13:51:13 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x0000144C (5196) + * Length 0x00001454 (5204) * Revision 0x02 - * Checksum 0xF0 + * Checksum 0x60 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -1838,9 +1838,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) tests/data/acpi/virt/DSDT.memhp.dsl: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/virt/DSDT.memhp, Thu Jan 14 13:39:35 2021 + * Disassembly of tests/data/acpi/virt/DSDT.memhp, Thu Jan 14 13:51:13 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x0000199D (6557) + * Length 0x000019A5 (6565) * Revision 0x02 - * Checksum 0x11 + * Checksum 0x90 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -1840,9 +1840,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) tests/data/acpi/virt/DSDT.numamem.dsl: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/virt/DSDT.numamem, Thu Jan 14 13:39:35 2= 021 + * Disassembly of tests/data/acpi/virt/DSDT.numamem, Thu Jan 14 13:51:13 2= 021 * * Original Table Header: * Signature "DSDT" - * Length 0x0000144C (5196) + * Length 0x00001454 (5204) * Revision 0x02 - * Checksum 0xF0 + * Checksum 0x60 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -1838,9 +1838,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) tests/data/acpi/virt/DSDT.pxb.dsl: @@ -5,13 +5,13 @@ * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 13:39:35 2021 + * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 13:51:13 2021 * * Original Table Header: * Signature "DSDT" - * Length 0x00001DF9 (7673) + * Length 0x00001E09 (7689) * Revision 0x02 - * Checksum 0x42 + * Checksum 0x30 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1) @@ -1810,9 +1810,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) @@ -3025,9 +3030,14 @@ { Return (Buffer (One) { - 0x01 = // . + 0x21 = // ! }) } + + If ((Arg2 =3D=3D 0x05)) + { + Return (Zero) + } } Return (Buffer (One) Acked-by: Igor Mammedov Signed-off-by: Jiahui Cen Message-Id: <20210114100643.10617-9-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/microvm/DSDT.pcie | Bin 3023 -> 3031 bytes tests/data/acpi/virt/DSDT | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6557 -> 6565 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7673 -> 7689 bytes 6 files changed, 5 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 42418e58e7..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,6 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/microvm/DSDT.pcie", -"tests/data/acpi/virt/DSDT", -"tests/data/acpi/virt/DSDT.memhp", -"tests/data/acpi/virt/DSDT.numamem", -"tests/data/acpi/virt/DSDT.pxb", diff --git a/tests/data/acpi/microvm/DSDT.pcie b/tests/data/acpi/microvm/DS= DT.pcie index 4b765541e372f4ba4e25529c14acf696516c8f61..e590b98f9960025f75dd0544492= d3088781406dc 100644 GIT binary patch delta 59 zcmV-B0L1^#7uOdGL{mgm*9!mu0-2Et8v;SPu_reH0Z6l70pke>HD5$iO$4ARlS&I8 R2_c{dlWGbDqyUp@3uOk*5ZC|! delta 51 zcmcaEeqNl*CDBB@WX~y=3DAYLc8xe#;j-a&mF##=3D8XjvMf-X>?thI$T+!B G_%Q%yeGTXU diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.me= mhp index 54728e2b4b8b959f3f829386f6a388ef2600e747..897648637cc6c8af47c67a9a349= 477c0240f833b 100644 GIT binary patch delta 60 zcmV-C0K@;CGo>>ML{mgmr5OMK0+5jk8v=3Dlsu_qV_0!FB#K?w>7HD5$iO$4ARlSvaF S2_c{dlWGbDqyV#N6Ep_<;t(eQ delta 52 zcmZ2#JlB}ZCDBB@WX~y=3DAYLc8xe#;j-a&mF##=3D8XjvMf-X>?thI$T+!B G_%Q%yeGTXU diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb index 76f5f1c2fd487644c6b4f827a70ad770edb9fdc9..ce3b67dff277e23f43925b1adcb= b55c9d0b4eee3 100644 GIT binary patch delta 95 zcmexq-D$(+66_MfDaXLTWH6CShVkA;bqP);=3Dh>SbIcqpMOygaGeOVT0PW~n%FQmAD ieR38T>k@_~g3OEz(M@hE7QYkXLQ%sBS2I~m_AvnX%^QRO delta 79 zcmeCQ`DxAN66_N4QJpqx-m^A4a@KHi=3D*GJQ`?4%hocvElo{Mpb ZATuLFbd%rm#ovUuP~;dHC#%Um1^}tB7n}e9 --=20 MST