From patchwork Mon May 26 05:31:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 892601 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1038487wrz; Sun, 25 May 2025 22:32:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7zIfLxys9n1Yg0DTN01uOfX6G6gNg6POALVBe9TqtbtCYoNOHEQU+km7l1UquzhFYapOTMg==@linaro.org X-Google-Smtp-Source: AGHT+IG8/SynT256yUICIKqlGtZAADuvD/vJPZYScJ+7gki5NE6GyDF+RGFPRi3VdJ47+GtoYyRP X-Received: by 2002:a05:6602:379b:b0:85b:4ad1:70e with SMTP id ca18e2360f4ac-86cbb8706c1mr949379239f.6.1748237575767; Sun, 25 May 2025 22:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748237575; cv=none; d=google.com; s=arc-20240605; b=iy2NPIH+0OSEWsGbLufkFmfsskhyWAWPnHG9dYydAw99wT2qsE75fgpOVjROuvLg1V IvMHfX+GxzIkpNolZhg0RY8HjScFSHgjacY19OqjF8RFGkXnMBjMITRKgJdER44k72Ud k2evV195QWB7IHUdG2hBfyd4jXkOXQyMinojQFaZqQDCGFBVAT4lhQYmGkh4ufhNRSS9 /uFDdvoAlaMKYo1Dsh+s7fU9kCNYRi9C2C3Bh4FXgBDWytBDdGVCNoCjGal+Oyxekrbo UIP7pSu6iJFoU5VqexKCbX7cM2axN1Etqk2n/RyptaRm+OjsXJguhGnhXOiOllX9iW+s EAmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=K5vADRSpaCj/9JLSnM/LCtAoOlQ6L/Ad7qAHo51qFbY=; fh=l0mju90xLx6bbDE0/STIK7UKEZKkkMQW8VsWHpVpQ8c=; b=LKHPmq/n9oNfj2JOerOm54DUcLFL8Frsg9g1xluL2Q7kPc305rolY2hwt0NyiLSmmj KivaXmgUMtQ6ocVIPW94t7f++RJwi9SS1woFZmAI+tNovMTwhnGljPfJ4s06BBctLR1w biWbOMv9mbDyzoP1Fb/pLFnMs0ZHlW0MDhnyNqvAGSbDdzXmJXqQsvlSiT1hFz7ud7uf jpQ0JM7LoZh1cYuKOq0LxtxmeD+OkqrcB3fpWd+UXMqkrDzYWJ9QP2Ta31D/JHU4E963 f8xuAEe4voQBbLy8pZ7XcsDb91pwzCEiZvb1CmR+oSpNf0p5Usb9cFyW5PKDDhZw0NVy N47Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R/fIvjEK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ca18e2360f4ac-86a235dfdd6si2251824939f.35.2025.05.25.22.32.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 22:32:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R/fIvjEK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJQRn-0003VS-Fw; Mon, 26 May 2025 01:32:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJQRb-0002sP-57 for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:16 -0400 Received: from mail-vs1-xe35.google.com ([2607:f8b0:4864:20::e35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJQRN-0002J4-S1 for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:03 -0400 Received: by mail-vs1-xe35.google.com with SMTP id ada2fe7eead31-4e130b8b9acso519961137.3 for ; Sun, 25 May 2025 22:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748237520; x=1748842320; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K5vADRSpaCj/9JLSnM/LCtAoOlQ6L/Ad7qAHo51qFbY=; b=R/fIvjEKvMbZfea3G10PL5sEknrHStq6EagxbUJN58xTUyjVwYE7kttFmpgJDDIRVJ Gd4nsuciaxonWimrk3WLw3xo1HeqoGRlSV4KTm/loZ6avBSlzB8QWg9o+ootzjsvlv3U aICCOneAbpOfwFrARljaNVHYOXRlr78rzdiigg3IMkYVoysYTDE0R1Y1fC85DYLHslRC D3IHuqTzHB+EI+yhXLqZ8LzTCiqobqtzKx1ktcwu1pw7Lr5RMFNyxhelpqpIDLu13kfO 7PQHQFyxuv8JPbY551eO8Vnhx8Z/xMUmYwHXiQHnnk3O7wCs+gW0I2LJpGSKhrIHNYAr OPKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748237520; x=1748842320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K5vADRSpaCj/9JLSnM/LCtAoOlQ6L/Ad7qAHo51qFbY=; b=COy/MUCtVsydi25ep8t6umaSCzv/xRZ5K1DCGEmdp4Y5Bq5f3eK01PQpmss+KFQHxk fddI1yTSahilk6EzYsD48aBvgBYqlQ9RJaFxTHtvUewQOwbWiugX3S7o9pQZYTgcm8/9 6l5o9dLLidzgzupjTatF7RNle6CrW8ziBE0628cysxdHEuyRUtWcmEwf7UBaFuIYJ4XF TjDiMAYAIAVyZ+SbvvujfXoi6XjiQzhwzNvdayh/BnktDv9n5g7rKlneL1uQzbk2EpK3 E6Gp8d8eeEfOo4g95sA5otauKFkHUsLDV9M7bhmMwi29jv95rLh/2VIDpjnbgT0tJoC9 nY7g== X-Gm-Message-State: AOJu0Yw8bQ5xUb/Nyk31W1tiLumfBATp15gaB2egRJDKeFD6PJeOQQWy zuMxruH1ccIZYaFw3Lf0Ie9ZZT8F0TpAyCI3CtNkXamDmTZ7XZZW0Zfu4s1o6k9KETkEZOWfaSp ZlHAwUJc= X-Gm-Gg: ASbGnctuqmPdKQaiklhgopncDibL72ORI2/bHMmYoEjTPaKhT6Spa9Wy1FefV7X9Sg/ QGDeFqMAHQfnB58jcyYwiXhoOxmuLQxiEJbLQHFguzBKjW5CVQBqCPT/SVsIdDf/xqfAjB3qvBN euEkximq6UaNKUM59BZ1RZqpxG7vXhlqEGmgvHBo0EnwevY0zk8aTpPcDZYh4O6p/FABEfjKj/l p7gch3cI7iaYKVvyOdJyxsmY07b+r4TdtWJXUU1quOFd8Bk3ieuBUPU6uJR54lkAfy28akWRRl7 Exp0KbBRbOBtnjb2iVrLb8GBCpggHLTLNWtbabC/7yCFVDWsLNoEi/gg5QzNG8rxwqe4sSZczk4 vEEDji3P92rI9S1uksR5PeQ== X-Received: by 2002:a05:6102:6e8a:b0:4e4:3c36:9336 with SMTP id ada2fe7eead31-4e43c36952fmr3179463137.9.1748237519935; Sun, 25 May 2025 22:31:59 -0700 (PDT) Received: from gromero0.. (200-100-75-183.dial-up.telesp.net.br. [200.100.75.183]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4e454da4378sm784310137.17.2025.05.25.22.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 22:31:58 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, eric.auger@redhat.com Cc: qemu-arm@nongnu.org, thuth@redhat.com, gustavo.romero@linaro.org, alex.bennee@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 1/5] tests/qtest/bios-tables-test: Prepare for changes in the ACPI tables Date: Mon, 26 May 2025 05:31:19 +0000 Message-Id: <20250526053123.1434204-2-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250526053123.1434204-1-gustavo.romero@linaro.org> References: <20250526053123.1434204-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::e35; envelope-from=gustavo.romero@linaro.org; helo=mail-vs1-xe35.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit adds to the allow list the ACPI blob related to the base aarch64 'virt' machine and all of its variants, in preparation to adding the ACPI PCI hotplug feature, which changes the _OSC method, the GED device, and adds a couple of new methods, like the PDSM. Signed-off-by: Gustavo Romero Reviewed-by: Eric Auger --- 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..abe00ad4ee 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/aarch64/virt/DSDT", +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", +"tests/data/acpi/aarch64/virt/DSDT.memhp", +"tests/data/acpi/aarch64/virt/DSDT.pxb", +"tests/data/acpi/aarch64/virt/DSDT.topology", From patchwork Mon May 26 05:31:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 892599 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1038369wrz; Sun, 25 May 2025 22:32:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6C0F4Hvyr9yKktqUwBkPn+pUzhCCt6nGkcrNjbeYSPhm2hLCRtt+vq7+V+BHfTCSmZUiI7g==@linaro.org X-Google-Smtp-Source: AGHT+IE4pNH94iu6/LwD9pu9HbMi9+3POlXQ2U8h6CPiGfy58boVlGSHfIcXaAd6hyh4TOejGE3M X-Received: by 2002:a05:6602:4a03:b0:867:237f:381e with SMTP id ca18e2360f4ac-86cbb818153mr612885539f.2.1748237552455; Sun, 25 May 2025 22:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748237552; cv=none; d=google.com; s=arc-20240605; b=kTmhb/2MAOofIrXTXEEzNPakVzzdRrwOJhcP0VzTsM3sDuzTdsDTfMQ9TfMqcrzIBG feaMpuOtcUGqMGgFY0vAEB5YZa5a0YgUYUYrWCt1ELA5jyubDneqgxsZ8x67lsWbh9X4 rp8Tl3wkv5oAmrEOcSqEBpREwj2SfRFSNBYn7vKFfXMY0m/bVrIOqiZ6eAyVLhj8zOsa 45TlyI39ae4pPFMSW5Xm4+o/K1RAkkuG60zuBOwDIO5yT7kFy1kBtZ+W1D/ihUWKRhKc StKL7q99/JlsAE3r5sfZVw9eBIxtmDRTYsj4uRg66h/KvddLNQtxowvy7y5RnQnmR/lM zxyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8BICU4b7QLdbhUSoTdVeRR8JtDxyaYap4Oi2QriTbDw=; fh=l0mju90xLx6bbDE0/STIK7UKEZKkkMQW8VsWHpVpQ8c=; b=XlfpTBWKuB1/TUXJakf7vSBmgB7pZHVgcXT+FvefsyQ3X8rjhjS+ZX2fXtmlIL9cH4 zGLjAsZ7zMPNYO/44n75diVRKnrR37WB8qRQhe/N/hUM2PYNxjAwEPLGUaKqSget7D68 H+wZeMtUdYebgdhW0TUfQT327OW/q7QywXiQdcRTAyE0Zf0h35UG28afX/LeV2RCSNn3 p5LBEqAvgS/pUquB50pz6yBDa7j0Jeu2bs28AQvfSszZbznQs1jS9MYQb953hNWvJHI+ 5Ib7PSP3ll22T+D2eZEfnFeb7JtzqocrXUeOtp+U0E1fqTcQx0OdeXEaE9zWOVx81FGi lI9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sdcu9ZO4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ca18e2360f4ac-86a235b96c3si2199701239f.23.2025.05.25.22.32.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 22:32:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sdcu9ZO4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJQRo-0003cW-Rr; Mon, 26 May 2025 01:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJQRc-0002tO-By for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:16 -0400 Received: from mail-vs1-xe29.google.com ([2607:f8b0:4864:20::e29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJQRR-0002Jk-Ur for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:08 -0400 Received: by mail-vs1-xe29.google.com with SMTP id ada2fe7eead31-4e290e420eeso542643137.0 for ; Sun, 25 May 2025 22:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748237523; x=1748842323; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8BICU4b7QLdbhUSoTdVeRR8JtDxyaYap4Oi2QriTbDw=; b=sdcu9ZO4hek9hPb0l8FpjnRFCO0ZS5UQJqTn8Hpt6KnPRcghZReE1ufFoCx7Q5jii5 HHlazw5nkLzdq9bSPIotIfQ4lrMAUa3PBPIDRROW2Lz9zf+1WGE0dUVdzKOTZcjkIP/f 781BlokpLytAQlewVgrkfVIuW21+u0WhX0WL95UhWLZoNRDeI1p7KU3q771oQoBD/YMX iORoJFhh21zYpLSYxo8E3Xh+BIOpQKl3NIGEHnTsqv6xrvGmTojUq8vDAP3E1Bqbnhvn aR5UXNVOagOPEzJbsp+0njV/GYqKZ6/+ZT8njVK5dL0154qy0WFQCiQgmrN29RBvlLJW 8n3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748237523; x=1748842323; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8BICU4b7QLdbhUSoTdVeRR8JtDxyaYap4Oi2QriTbDw=; b=Ald98YAFfPtD4hm7vUbeDSCFgI1ogUkArXzsCyZtHr4ysk3NrTqTjshZpRpOrdeV1O 63ydQHBlBFgPcrbsPBCB7qoIo6fhOYPAV6/t+z2XYJ6vqBea7fJya8H03WM9Hcc2VOmY n+bkaCnSaKACJtTZ7TDPlC907GGZpKQttPW49U7snq1kxxc02IbtTsaj0sB04eURbVMr DwohWU9WbFoHW5qqWfVJdhEXDZV0ppGr490KVTYgCKFFHq2ix9cofRSyK3j6vVrwBJEY 8jCkdmgvuutvZHFmxTRbVA7MO5Q4iO7TJ9JwuWWOyT9tFP0R3yxa4ewNYGNGQg1Nf+vO atWQ== X-Gm-Message-State: AOJu0Yw2lMVgiEl4K/FM2h4ZMPbic64PeD2so1lSS+f3Vd55xKQ5T4TR TStFp8QXdLSqSjQ/v3z6jcVG9fNMQW/Pn4N/cCEKydlaEDOxDVg15DgduVKrk+8SagIkTgmkpek cBxs6gv8= X-Gm-Gg: ASbGncs1uMMF65KnI21duWpZuUAWGQi23qKHbQ5brBHIX6DoSK2knSVSmcGFpOartHD zSPXTF6FJAKTW0xqyGpCrDSkO3O3f2zNjI8Q1PFyyrxbGxU4xMDO56aipbBGfsayTvUdTu1A86b CcWRjIryO9IdKPtTLG1jUxv3uhr9q8Wbq8x7Pxt+j7zHpGdXW58tk3InMrreVhaIGER3nTEnGR3 2PbCNJnvrk66o+5yFoTXdnl56N+Xh1/fUOnWOJpPlqWU+RK+UDBp3h2V+O18Ycsz8GBGqYp8hbx 3YbMFml5j3B9YJ/LQya37xCLloA4yMMtllPZUBJdLBgWjnO57gduf1rPjKbJXaPuktBeN6geT3E cDkmdfk9rnZsvlGpSVZeejpEG7kgzj+Fw X-Received: by 2002:a05:6102:6c4:b0:4bb:d45c:7f4b with SMTP id ada2fe7eead31-4e4240f9b9amr5989646137.11.1748237523455; Sun, 25 May 2025 22:32:03 -0700 (PDT) Received: from gromero0.. (200-100-75-183.dial-up.telesp.net.br. [200.100.75.183]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4e454da4378sm784310137.17.2025.05.25.22.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 22:32:02 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, eric.auger@redhat.com Cc: qemu-arm@nongnu.org, thuth@redhat.com, gustavo.romero@linaro.org, alex.bennee@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off Date: Mon, 26 May 2025 05:31:20 +0000 Message-Id: <20250526053123.1434204-3-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250526053123.1434204-1-gustavo.romero@linaro.org> References: <20250526053123.1434204-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::e29; envelope-from=gustavo.romero@linaro.org; helo=mail-vs1-xe29.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org ACPI PCI hotplug is now turned on by default so we need to change the existing tests to keep it off. However, even setting the ACPI PCI hotplug off in the existing tests, there will be changes in the ACPI tables because the _OSC method was modified, hence in the next patch of this series the blobs are updated accordingly. Signed-off-by: Gustavo Romero Reviewed-by: Eric Auger --- tests/qtest/bios-tables-test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0a333ec435..216941dbb5 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1626,7 +1626,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) }; data.variant = ".memhp"; - test_acpi_one(" -machine nvdimm=on" + test_acpi_one(" -machine nvdimm=on,acpi-pcihp=off" " -cpu cortex-a57" " -m 256M,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=128M" @@ -1775,7 +1775,8 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) * to solve the conflicts. */ data.variant = ".pxb"; - test_acpi_one(" -device pcie-root-port,chassis=1,id=pci.1" + test_acpi_one(" -machine acpi-pcihp=off" + " -device pcie-root-port,chassis=1,id=pci.1" " -device virtio-scsi-pci,id=scsi0,bus=pci.1" " -drive file=" "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2," @@ -1846,7 +1847,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) data.variant = ".acpihmatvirt"; - test_acpi_one(" -machine hmat=on" + test_acpi_one(" -machine hmat=on,acpi-pcihp=off" " -cpu cortex-a57" " -smp 4,sockets=2" " -m 384M" @@ -2123,6 +2124,7 @@ static void test_acpi_aarch64_virt_tcg(void) data.smbios_cpu_max_speed = 2900; data.smbios_cpu_curr_speed = 2700; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-smbios type=4,max-speed=2900,current-speed=2700", &data); free_test_data(&data); } @@ -2142,6 +2144,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) }; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-smp sockets=1,clusters=2,cores=2,threads=2", &data); free_test_data(&data); } @@ -2227,6 +2230,7 @@ static void test_acpi_aarch64_virt_viot(void) }; test_acpi_one("-cpu cortex-a57 " + "-machine acpi-pcihp=off " "-device virtio-iommu-pci", &data); free_test_data(&data); } From patchwork Mon May 26 05:31:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 892600 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1038470wrz; Sun, 25 May 2025 22:32:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2b8Ci49y4sK4DCw0QC5SvhpAt0krpHmjOIoVkVHvrRMlTEWGenwrNc1aVKpG/OWWPQi/zIg==@linaro.org X-Google-Smtp-Source: AGHT+IHVdthcw6yQ0O8w4cs3NPuqfTZSNuf3TFA9hPqUZfWXzcbxGO3wxH3IlMyfTqSVKT+E/wil X-Received: by 2002:a05:6e02:194f:b0:3d8:18d4:7bce with SMTP id e9e14a558f8ab-3dc9b670ad2mr66200365ab.2.1748237573377; Sun, 25 May 2025 22:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748237573; cv=none; d=google.com; s=arc-20240605; b=d5tKin6yuLflO/+HOF2aA+y8tFTrmIs+btc9Ile4jSJijZqSYVUxYPJlDT5HXP2c13 ZXkaFsDRo5AWCV6E4PN50d+cfUntF5L5HBwmg/eIXRIBkaWsJTfdrT4ljUzhBssST8UW KYC+TWyXNu4ErmCNe7cmo5oJ0E6IqAIRx46KQAhOJVBvdNpDOD00vmmUztqD6Hwt3zwa JAL2lRK7srsqThDiAUfvEHeIDoZM/tffVr/xGWuxZaLad+BEy55XtD/V2Ut2I21oSM1R bjXObdYGqQfU+Fub55hnF5e4NZ9qr4LHjIEmNv9OpemdyqCcbGfbcGsg+nmczgn/EFZJ wCjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jU5MgyvbkVOqi7hQ3tmKxY48Fkr8UfgknyiBYdR8Jdg=; fh=l0mju90xLx6bbDE0/STIK7UKEZKkkMQW8VsWHpVpQ8c=; b=lhAcBuGzy2CdNqrRpUdVsT5OfwfMEB3JJMiVxrXc+Fx/PHnxl27U3t5dy9Q+aWnUIG 6rgpfnnF0CJl4umfbUYIHuWVMfjFoXWeDJcvqaVHgdXS6+wBOGyD/fuqmepihWidIlls SFO4KXiuH6nFddFrKDPw8YMsgbuS3YzrH8E9T+EglgW2UFkkXy/Cokdxiry+Ha9jWSvm Xp3U5j1HiNBrl9UecO9TXKnoDVaW8nQIJw3LZx/99rpVeY/HWgSgAzHZypWGixM8itNj +b+psfvqUqY+aC7xP59K3+w9SHpDGvJZzwHiGk7XT1a+MgEF+UbHNOHLHGdlB3X4f3/a 4f8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wKUA7RhN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e9e14a558f8ab-3dca0547699si42316715ab.86.2025.05.25.22.32.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 22:32:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wKUA7RhN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJQS5-0004jx-2X; Mon, 26 May 2025 01:32:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJQRc-0002uz-Qx for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:17 -0400 Received: from mail-vs1-xe2b.google.com ([2607:f8b0:4864:20::e2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJQRU-0002K1-Sl for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:10 -0400 Received: by mail-vs1-xe2b.google.com with SMTP id ada2fe7eead31-4e290e420eeso542656137.0 for ; Sun, 25 May 2025 22:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748237526; x=1748842326; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jU5MgyvbkVOqi7hQ3tmKxY48Fkr8UfgknyiBYdR8Jdg=; b=wKUA7RhNWm7I1PnzHyrrcDO2RpnDJLxV2cdN7SDj+QsC1k/GsxdOjldwqMFZVuihy+ TKgXHejo5WMiIgsfaE5ZeOWM1i1KmnMupPkfP9QKqg/bQTBQ9yrIngDQMRK5OTeOIKix h+T3GR5pxBxcohX0RCpOhafUNE0NKogks/ozuWLdyCzMqHujX8WktzvOi27veokAeDL6 bpqX39L8nJpK70MRnG8B52kH5JZI0cLCeslsuyXVC4zgC7vmzH3CfUjIBj1J3ItR5N+V r7y54wfOLj9mNrxYiTTY83db5sLJbFLOCkdWOzADcL0x5rG0GCTaibF+jtBbuI9b6iV3 YOJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748237526; x=1748842326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jU5MgyvbkVOqi7hQ3tmKxY48Fkr8UfgknyiBYdR8Jdg=; b=wMSyWGD+RepJ7Fy+Tf7w4zY49Z0FUqDCUuHNySQtVFIBdCMWzm31MABJqQXk2No0GC dPPZ6bq5+5PMk9zQ/PHg9TfsgEOneF5/dERpb3A8goChsZsh5DxeTgByz3024X7M3G48 86yOM6Kou3zSaiuVtonEXQmBeFFqn2rpbJuR6Nm+vq9H6kucsomVqssxFNj3j+XrxbBR UsnsFjUPYdMTBXVnefnM9IPyzkNbUujW90oIezXFBjuiYzi/OW7XqUhPTHDI2Q8n5jRP F62/k2MVeN9+i1CobgyxxAz9kSqbbv4H9hGPDf6+0zMSl7K7V+UchT4lo4PKDNlxqoDL 9+8A== X-Gm-Message-State: AOJu0Ywq131HCMupPbUuzUygOmBUE2AJFgsLsh8tB0Zvkba1gewy0wF7 Zp99puZ/SdrixXxICgwnU9BkkKv2zhV9Qu1FW4p5W9rWPXME1MBxHtVCa/S/a1EQKrYLSvMuwHR eh97TVmI= X-Gm-Gg: ASbGnct8VICGbdOMdSQdO5qZDoxhhj30LouXEaFGv/NdLqOoxdJxERuL6jM1BfxTR/c BNxjuyE8BxXUFdqnJNrDy+i+s1o5TdXieHg9HiCb4GUTH3mOpDCU8vF/t7jfXXurcBorfK7pZXS 7N+KRiBWR8GUZoqmR+9fYEllivNCM9aqtBeuBqCsNeJBxbMGpWLSjWZUzO2/acwhBWNAjQ0hA2R qOb5xoSKIKXc3sqf6fSw8k96EEbjcVZS1wCboWkniYc6Gsa4mmnHoushb8YacHENZCTUrr9yG2l HBrzG8Nkj931RbnntFEOTUI00ys3wB4+qclyiW4wklDuyO0yNSU5xlqwo7gmTyOVDiZzB9sj9dN /wOMsz3sxPaan/tJ4iN4WwqJqRqZlg5mn X-Received: by 2002:a05:6102:6c4:b0:4bb:d45c:7f4b with SMTP id ada2fe7eead31-4e4240f9b9amr5989675137.11.1748237526611; Sun, 25 May 2025 22:32:06 -0700 (PDT) Received: from gromero0.. (200-100-75-183.dial-up.telesp.net.br. [200.100.75.183]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4e454da4378sm784310137.17.2025.05.25.22.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 22:32:05 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, eric.auger@redhat.com Cc: qemu-arm@nongnu.org, thuth@redhat.com, gustavo.romero@linaro.org, alex.bennee@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 3/5] tests/qtest/bios-tables-test: Update changed ACPI blobs Date: Mon, 26 May 2025 05:31:21 +0000 Message-Id: <20250526053123.1434204-4-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250526053123.1434204-1-gustavo.romero@linaro.org> References: <20250526053123.1434204-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::e2b; envelope-from=gustavo.romero@linaro.org; helo=mail-vs1-xe2b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Update the aarch64 'virt' base blob and all of its variants. All of them have the same diff, so only one is shown below. The essential changes is in the AML code of the _OSC (OS Capabilities) method, (variable name from 'CTRL' to 'Local0') and the scope for GED device. DSDT table diff: DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID } @@ -1794,53 +1794,52 @@ 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 Capabilities { CreateDWordField (Arg3, Zero, CDW1) If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */)) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) - SUPP = CDW2 /* \_SB_.PCI0._OSC.CDW2 */ - CTRL = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - CTRL &= 0x1F + Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ + Local0 &= 0x1F If ((Arg1 != One)) { CDW1 |= 0x08 } - If ((CDW3 != CTRL)) + If ((CDW3 != Local0)) { CDW1 |= 0x10 } - CDW3 = CTRL /* \_SB_.PCI0.CTRL */ - Return (Arg3) + CDW3 = Local0 } Else { CDW1 |= 0x04 - Return (Arg3) } + + Return (Arg3) } Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method { If ((Arg0 == ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) { If ((Arg2 == Zero)) { Return (Buffer (One) { 0x01 // . }) } } Return (Buffer (One) @@ -1851,33 +1850,36 @@ Device (RES0) { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000004010000000, // Range Minimum 0x000000401FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } + } + Scope (\_SB) + { Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, ) { 0x00000029, } }) OperationRegion (EREG, SystemMemory, 0x09080000, 0x04) Field (EREG, DWordAcc, NoLock, WriteAsZeros) { ESEL, 32 } Signed-off-by: Gustavo Romero --- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5178 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5264 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6539 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7635 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5380 bytes tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- 6 files changed, 5 deletions(-) diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT index 36d3e5d5a5e47359b6dcb3706f98b4f225677591..5c73e64e0c29d3cea5299929afd00e9a1238e559 100644 GIT binary patch delta 125 zcmX@3u}g!?CD{)oKT&>C7-ZBVAAAF##)dJ7YA5gc+zAbZJYoR699=7B!EN~@=P`s?&1(| P5}{ezuZy0RIZUBV3) zc(702Eu`gV6dW25PyiG$b`A;hsRj{T@*r}7z@*8UjI|)OTpVB>Vv{Dr)Io#=K*9we U#USw|*$eq5OA2>QUM<`Y00vhni~s-t diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt b/tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt index e6154d0355f84fdcc51387b4db8f9ee63acae4e9..b0a875d8da3592b5927095304ca31ceb001b2fdf 100644 GIT binary patch delta 125 zcmZ3aIYE=lCDuv7eGVUd0S*;^zc delta 142 zcmbQBxk!`CCDCPA5Sug^rVb)301_?$ UDF%rz$zI4eIbXPIGNVX80DOQd2mk;8 diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp index 33f011d6b635035a04c0b39ce9b4e219f7ae74b7..21a6b086cbf72298d125d8bfc4c4b7ec9315267b 100644 GIT binary patch delta 126 zcmbPh+-=O|66_MvEy=*ZWIK^dnyJrxqq-XxliTFY`CQfHUD*uIF5!j? z{8%UN7Sb{?PN+`cl22G5FllloV=YLAivuh#JZUnJHco(u34p{35C_EBt^J0I0kqp#T5? delta 143 zcmeA+o@>nI66_K(SCWB&$z~##G*id)jp}Y(Ob$~w=W|(e2)c2``v*I-bY(L*yM!Aq z@L-?3TS&{#C^$4Apa3Xh>>Lv0Qw<`x$gFF?qIa&ga_8F6hG^?;q^U(v{8N>=JIc zz>jruo{W}>aYA(hmwdtkfk~4y8EZi@TpVC|;YpK$v~dDNOaLTSkN^@{$TRtwjP2%6 gLVAo$Zj(1FiCA+`*X%A10XNQ=_+Y2_$py0g04PO4(EtDd delta 260 zcmca?{ok6)CDB?qsb_q9J z;K4rGR!GawC^$4Apa3Xh>>Lv0Qw<`xHUD*uIF5!j? z{8%Tq3Tv4dCsZeJ$tNrjm^3+)u@)r5#Q~NVo-`Rq8z(@-1VCa12_TV$Jd^(lcX0@~ PamK_4JH=0K7wHE8^splO delta 142 zcmZqCnx@6&66_KpCd$CT#6OWsnyJx$qq+b$lf%@_mfY4Hf^MAg{=v>HUD*uIF5!j? zJlH3<3Tycp1&0O%6aYnxokN0rszC&oJcwK%FllloV=YK67YA5}*rdrYbr4|zkZ=J= UF-Uw#_CmhNkA=G?mx}ZQ0C4*#-~a#s diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index abe00ad4ee..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/aarch64/virt/DSDT", -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", -"tests/data/acpi/aarch64/virt/DSDT.memhp", -"tests/data/acpi/aarch64/virt/DSDT.pxb", -"tests/data/acpi/aarch64/virt/DSDT.topology", From patchwork Mon May 26 05:31:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 892602 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1038537wrz; Sun, 25 May 2025 22:33:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+L8/6Kt2+D27CQGrNs538E23WoZ+pVdXgbgJwkgShICqj02t2/I/AwtIVfEBhjqaPc1a/Uw==@linaro.org X-Google-Smtp-Source: AGHT+IGUPu1LPjkYSpKAQ49AWwL1kiFVom8HLxAFheT7PxiqEMigNeiOJXRGl5HNxzk0kvWyjNBv X-Received: by 2002:a05:622a:1f89:b0:494:b1f9:d699 with SMTP id d75a77b69052e-49f3515515bmr134043291cf.23.1748237587550; Sun, 25 May 2025 22:33:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748237587; cv=none; d=google.com; s=arc-20240605; b=A6SFa9QdY2jBnM5d/SoExPZ2aJ/3pX3w2wTIOpkit5n/FKtKg+Ly9xOt5+77OQyDvX Ij6oW6nARp0SlcsxhNs5yDhMO9UcTmJKoxKMzW1pQRGD581nl0HqkdB9b/4hPh0fPRLJ OEbSlhOLVNUHcHvU8KT+F+vbskJ9eQNkKbWgTjovAQ6QUA88e2jqLPvzy6oEW3w2vWBU qyw2ZtT26zGa/NkHcDYdqF2h2IWcDO7u80q3fKGfD5fRz9KTJT1ReoMrGotsPJNJFRYu xrD7wAAZf+h5QnU5nbrDRmMbmqxcXOND319qnF3nCFOF+hwCeoFehndSqxtJcPQY6uIc yZgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JiA6hOZT8dbZS3oxbupOyToDge/JikBtR/d7vAGhdTw=; fh=l0mju90xLx6bbDE0/STIK7UKEZKkkMQW8VsWHpVpQ8c=; b=VVyo0NoEKG6VqJF2hxzj/ibopcfazOI4KtHrzm7UFJB1PJB9ScadagHgTPOTkeaK/D BhXYM7sfObx/U/8GPoSrhXRpUMt61uqnJVmk0gFiScJDvQbP5L7CiAQa7pba4/O1jsbl gl784gywBsg4jXSs4v7qvgiZy5hATDc7jA+SRc5N+HKau+JXmAngs4BJUumzt6IXyUui K3rsrC/VCqXK03CLH2eWktxyQGBt8gyoSfHOWriIhvBLTL+KC+cFL21S41PGOeb4V7Xf rrOIYv4UuwII3PmMTawylbTiGgPMm46L6Lk9/tW4l8O0Cl80/kT6pUo45De1jtP/ZTlW zNQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j3N+UtSD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae56034bsi246463781cf.261.2025.05.25.22.33.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 22:33:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j3N+UtSD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJQS3-0004gk-W1; Mon, 26 May 2025 01:32:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJQRd-0002vH-1z for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:19 -0400 Received: from mail-ua1-x932.google.com ([2607:f8b0:4864:20::932]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJQRX-0002KM-7S for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:12 -0400 Received: by mail-ua1-x932.google.com with SMTP id a1e0cc1a2514c-86dc3482b3dso1898598241.0 for ; Sun, 25 May 2025 22:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748237529; x=1748842329; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JiA6hOZT8dbZS3oxbupOyToDge/JikBtR/d7vAGhdTw=; b=j3N+UtSDkLV/jcYWjBdYSUZHw9wgHc+3xR10vpCeqCMZETBcyXDich5w0lnTrWYJRc D1DSH2WnsRrRdKkIq/pOAYtWJzX1E2X2KwA7DgK8a/nDyqlq77YOuCPQ25PI3CUwMUzt TAvgS/zpSolU6GrPVGkwjE8poVDwycX5CVGH3JK8z57O+D7bOMOruAmMPS2rYJibcWeE X7r/RDOS2bsTXJwBsHG0FSE2ibQW+L7Aq23Mfdgpv8AwNorH1TcP4/yHyEQwi2jjlsVP vY5tMzLD+ObFLY4HXZxFEFSj69120s1aCIu6v6O7aeFcsl5vUvtlvaO39BLQdcFvdXdE vJjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748237529; x=1748842329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JiA6hOZT8dbZS3oxbupOyToDge/JikBtR/d7vAGhdTw=; b=X/ux3wd3+DRABSRqLH/03FT5J57dlipMl0ZhO7frffNnbY7viFi82/vFkxo57KKjYl U8dnse0xNYsoAX1XwEdFKzdMb4vN36maVX/3hKU1b9kuEd+RII2JqndyDFNehu8hCTwi rZXGxWyeDb5Y+/xrB2NDezCA+2xDf5zcIfat/iYSkUUxp9jYWUmhPWqnOilYra0H3uQy uP6n+DlrSpPXdsXEnoBqoEgSmZ+Lbw6jyUaHhgGWMwrry6GHEPnyyEX+L9wBtWLXVnS7 m4IjEXYkRgoAHETI/+J/BzbPkiKNAEJq1nZ/cEGlgiaI26uxc1PDAPvrrktSkpqatJtJ Twtw== X-Gm-Message-State: AOJu0YynC9rc9Vwj7jY0VC/rhWl07qIelZ3yGer4aAfz2zUxKX3pqocJ hHTXBcsBVBK6R3FXO9YLZND4dD4D5IvF+SZ4jpc/ZKwoaHoLy2t1hJ+hzuupsumlEIDeb7OG1zx cK9AAT/c= X-Gm-Gg: ASbGncuT7dDMOfAOTKCJEuk5aLIrZXKjwS+y03y6zzZ3GRENGdqnTY7hJPwYmt2LGt2 Nrrnm5HZ386rshauXHyufgqID8ehP4S+qTSeh5P6Nvkt+9NnWayaMN8OZeR2EM5Juz8ur+OlbNT gdG4m74WU9BjzvmbOwE7+f5RFqxEPQDaGW3xyH6uEYaQcU/UyMR38NCKguvpzwWZcTJc8v2AraX XgqiedB/nEJ78jsYREMH1EAUIpU4gRNCN3MJvo6G3zN/xhohI1ZDoqkgToto74Dg/WPtG8z+4xt q+NJziPCf99790Dr4J6Tfg57SCQz/NRNTzQRU/u2+sNsZXgDPPsFV2N+XmVu3hPMGF6hT8fNBG6 0UL2xmGl3xJL9AwIj9CCuLw== X-Received: by 2002:a05:6102:4407:b0:4e2:82b1:efe0 with SMTP id ada2fe7eead31-4e423d6eda2mr4871280137.1.1748237529338; Sun, 25 May 2025 22:32:09 -0700 (PDT) Received: from gromero0.. (200-100-75-183.dial-up.telesp.net.br. [200.100.75.183]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4e454da4378sm784310137.17.2025.05.25.22.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 22:32:08 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, eric.auger@redhat.com Cc: qemu-arm@nongnu.org, thuth@redhat.com, gustavo.romero@linaro.org, alex.bennee@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 4/5] tests/qtest/bios-tables-test: Add aarch64 ACPI PCI hotplug test Date: Mon, 26 May 2025 05:31:22 +0000 Message-Id: <20250526053123.1434204-5-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250526053123.1434204-1-gustavo.romero@linaro.org> References: <20250526053123.1434204-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::932; envelope-from=gustavo.romero@linaro.org; helo=mail-ua1-x932.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Add a test to verify that the aarch64 'virt' machine correctly generates the ACPI tables and AML code for PCI device hotplug. Signed-off-by: Gustavo Romero --- tests/data/acpi/aarch64/virt/DSDT.acpipcihp | 0 tests/qtest/bios-tables-test-allowed-diff.h | 1 + tests/qtest/bios-tables-test.c | 32 +++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 tests/data/acpi/aarch64/virt/DSDT.acpipcihp diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpipcihp b/tests/data/acpi/aarch64/virt/DSDT.acpipcihp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..dc3ab24d05 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,2 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT.acpipcihp", diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 216941dbb5..1bf45bc6e3 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1643,6 +1643,37 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) } +static void test_acpi_aarch64_virt_pci_hotplug(void) +{ + test_data data = { + .machine = "virt", + .arch = "aarch64", + .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd", + .uefi_fl2 = "pc-bios/edk2-arm-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2", + .ram_start = 0x40000000ULL, + .scan_len = 512ULL * 1024 * 1024, + .variant = ".acpipcihp", + }; + + test_acpi_one(" -machine acpi-pcihp=on" + " -cpu cortex-a57" + " -m 512M" + /* + * We just pick address=0x04 for the root port to avoid + * collisions with other PCI devices on the root bus (pcie.0). + * It could be any other value that doesn't collide. + * + * The 'chassis' and 'slot' options equal to 1 have no special + * meaning here, could be any integer, but we set them to known + * values to keep the test consistent. + */ + " -device pcie-root-port,bus=pcie.0,chassis=1,slot=1,addr=0x04.0x00", + &data); + + free_test_data(&data); +} + static void test_acpi_microvm_prepare(test_data *data) { data->machine = "microvm"; @@ -2584,6 +2615,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/numamem", test_acpi_aarch64_virt_tcg_numamem); qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp); + qtest_add_func("acpi/virt/pcihp", test_acpi_aarch64_virt_pci_hotplug); qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb); qtest_add_func("acpi/virt/oem-fields", test_acpi_aarch64_virt_oem_fields); From patchwork Mon May 26 05:31:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 892603 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1038546wrz; Sun, 25 May 2025 22:33:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWw84fpmOYG2fi/O7qxLmlMyMDOztOhtOXzhtNDAwA5tUd43oCruoX4wroKuwPSAVWO+mFqcQ==@linaro.org X-Google-Smtp-Source: AGHT+IEvLl5696Y7LyQpRVwfgibKHoY6VoCk+6GOPX8F0y6B63IVI5iZ7Fuw6BDAkNV4kQJQSMSM X-Received: by 2002:a05:620a:400c:b0:7cd:4c2f:78c9 with SMTP id af79cd13be357-7ceecc3166bmr1267615685a.25.1748237589350; Sun, 25 May 2025 22:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748237589; cv=none; d=google.com; s=arc-20240605; b=QXKmQObjHvy+EDLj4iM6IXWVxDVq6goCrZbd6QfVUos19Jd2xhqWbBc7OjAaZwLlo7 kR3ehLVEh4E/pfC+7F9MBgo1cwz/6UIwL9G3KPR+tbWPO022DRwcC3onNcbs5X+07gcF p5VKZnoNSdz1srNRuc76WwuWALntwCVwnXw6RQnwtqeirI9Yj55pZyT0VJyYyuE1XNXw 1GnFkRrz6nPkCvArs6IZ5sqKTrvb28z20Sul+pwIH/q4i21wfn52FCuo6dMB6VwUawkf 1P+bpoq9kGlTfdDEheMIutT8kkkGNYcN5Fa2qOAZrFZGHuWR0ut83517gYVQ7jw/BOnX MIzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qOCs6sIHFoENBFWNyjNWt4Qbm+G3lxVEjRLR6eqMmps=; fh=l0mju90xLx6bbDE0/STIK7UKEZKkkMQW8VsWHpVpQ8c=; b=Qu6FMP07QxexX4dvgu/mp6xo9k9gc+eZr9Wqi3WjuH90CLIW/JBEmUbbIN/LKcRaEy /4ZDKx7q15A2eYf5eWfsyAQweVDzOI+EcMC8XPpevQnIZX/jSc4uOih9heo4bzLCftWc alYZun2yks4j0Ul9O8dZLs4U8e6g0N9SS2e7wB05P3CrWSpDnyhH1ZFn8RM9+L0OTSF7 VF94/pEeHH/jyoluftBRhXaKI+k881hjoQP+9+u+GrJwEHeZDwTGaCGIAILGrgoNS9K4 G79+pOy62yOp6RHTEWP3oe7KKkxfSlJVRCuzqqUEJotTabob4+U7/X1woxt18gNMlsXL npEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xKjRl2Lz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7ced7cfce1fsi1092967185a.170.2025.05.25.22.33.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 May 2025 22:33:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xKjRl2Lz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJQRy-0004HL-K3; Mon, 26 May 2025 01:32:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uJQRd-0002vt-D1 for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:19 -0400 Received: from mail-ua1-x929.google.com ([2607:f8b0:4864:20::929]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJQRa-0002Kz-K1 for qemu-devel@nongnu.org; Mon, 26 May 2025 01:32:16 -0400 Received: by mail-ua1-x929.google.com with SMTP id a1e0cc1a2514c-87dfd390745so376121241.1 for ; Sun, 25 May 2025 22:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748237533; x=1748842333; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qOCs6sIHFoENBFWNyjNWt4Qbm+G3lxVEjRLR6eqMmps=; b=xKjRl2LznR2O9lSI6AdoITtgWl5YPxU+TwLG8JYpKKexJhFva2OL/OAzb1WUt+uHG+ 8kYi6T0YV+n9QJLjFQir0UTmmtfKJULxZcUHnZH9WbWhhNe67m/2N9oruHobQkpBLnIb LjwX3AMh8xnXrHMqARnKef0FIk77Sk2h4Zg93pDHopir9PfvARgyCGnUhbCdsoSxROpy euSCAupULulme4VEy7IpxsOupmCLdNrNGJCS60x1lSM5I5LUOAOIscnBj4J9O/RfpA8R W+74T+FTEjmbbE0eGerwEPDvyFNYI1sOkcECBiUSHXPCU8h2strdbe4K/E3bih3Y0IiT de+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748237533; x=1748842333; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qOCs6sIHFoENBFWNyjNWt4Qbm+G3lxVEjRLR6eqMmps=; b=J6E5r1ghAvJzi080TOi5RbSq2LHlPOpWnNxYUhvVMOBo0dK++YEoYBRUbcnkl8cQEo 90GCpuE4dKXXA9ojzCreNBF22W/+M9H2sxDlYXEf8ChSgyfY6jAUH2HmX1DN8e1YBg+C FsloSeI0YGtD43zEj2NITy6jExHUWLb2CPpYsuaz89KfBE7XgLOApnXDdl7ZWPSfXrms HS2oqnm3DUgHk+GcM4UWGaWO7DGdqLJiTdwC3ZmMVR71qm50J8VOirFCfUn+6ZTs2p9i M9Mu9ubUtAssXLstmq6MBqAoPqv5sQEcEwM4fCVb5HeKVl2f6DG9h61S2JyMGD8OhLgq njrg== X-Gm-Message-State: AOJu0Yxbfd0Pgar5tmC/TC0Iqzy6ulRru2K7bS5M2GhSR5FFVO2uA4Ui oTUgCw2QJeK2e/3qquqcmAU8/CuamK3FW9m1W76hMePIXx10rRxl0MFrvkb2jdQX/qvSA+m8ZZJ nPg6kJ1E= X-Gm-Gg: ASbGnctq6eNspApJTKsoZ8CFlHMHC/8Tb0zF8qFI+M5UBftsFG145oamMvPF4r74bx4 v7ktpRSasLDUkPTpIX326q7PK4PzX/sJe5dMMlJc/agmJ8fNCwCWDoBXhbIzqw6l8KuBljAMNqQ q2Ii+Bva3uBkWHED3/xs1hyjDkUt1CpE+e6c3eSP2gm3WIyTQKEEqdNzdK5R3vSshmpoeUMkBJC hwHaTa4WItDO8+998AWbVt1uxWJsg/C9V3WuXoRxRsqGFpeCyBQD5dWZARwNPN7PNTVhi3VpNK9 k2fJXi3PM/6+Dfh52BZtQil/Pe7QgyYoN9yhSZSLZvLxGmWODrUhd6bZ1zzUaLd0T8kiVI7I4ws zj4iSKJNc663FPb0gdDsciw== X-Received: by 2002:a05:6102:3a08:b0:4bb:c24b:b658 with SMTP id ada2fe7eead31-4e424164587mr5887613137.18.1748237533030; Sun, 25 May 2025 22:32:13 -0700 (PDT) Received: from gromero0.. (200-100-75-183.dial-up.telesp.net.br. [200.100.75.183]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4e454da4378sm784310137.17.2025.05.25.22.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 22:32:12 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, eric.auger@redhat.com Cc: qemu-arm@nongnu.org, thuth@redhat.com, gustavo.romero@linaro.org, alex.bennee@linaro.org, mst@redhat.com, imammedo@redhat.com Subject: [PATCH 5/5] qtest/bios-tables-test: Update aarch64/virt 'acpipcihp' variant blob Date: Mon, 26 May 2025 05:31:23 +0000 Message-Id: <20250526053123.1434204-6-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250526053123.1434204-1-gustavo.romero@linaro.org> References: <20250526053123.1434204-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::929; envelope-from=gustavo.romero@linaro.org; helo=mail-ua1-x929.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Update the .acpipcihp blob variant for the aarch64 'virt' machine. Since this is a new blob, the diff is large and not particularly useful, so below is the diff against the base DSDT blob with ACPI PCI off. Main changes include: a) The _OSC method, which now allows the platform to control PCIe hotplug (masking Local0 against 0x1E), whereas previously it was controlled by the OS; b) New regions in _SB.PCI0 to handle bus selection and device ejection; c) Addition of a PDSM method (invoked by _DSM); d) A new device PHPR, which reserves the memory regions used by QEMU's acpi-pci-hotplug mechanism; e) A new event in the GED device used to notify PCI device hotplug and unplug. DSDT diff against base aarch64/virt machine with acpi-pcihp=off: DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001) { Scope (\_SB) { Device (C000) { Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID } @@ -1795,33 +1795,33 @@ 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 Capabilities { CreateDWordField (Arg3, Zero, CDW1) If ((Arg0 == ToUUID ("33db4d5b-1ff7-401c-9657-7441c03dd766") /* PCI Host Bridge Device */)) { CreateDWordField (Arg3, 0x04, CDW2) CreateDWordField (Arg3, 0x08, CDW3) Local0 = CDW3 /* \_SB_.PCI0._OSC.CDW3 */ - Local0 &= 0x1F + Local0 &= 0x1E If ((Arg1 != One)) { CDW1 |= 0x08 } If ((CDW3 != Local0)) { CDW1 |= 0x10 } CDW3 = Local0 } Else { CDW1 |= 0x04 } @@ -1852,53 +1852,217 @@ { Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: Hardware ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000004010000000, // Range Minimum 0x000000401FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) }) } } } + Scope (_SB.PCI0) + { + OperationRegion (PCST, SystemMemory, 0x090C0000, 0x08) + Field (PCST, DWordAcc, NoLock, WriteAsZeros) + { + PCIU, 32, + PCID, 32 + } + + OperationRegion (SEJ, SystemMemory, 0x090C0008, 0x04) + Field (SEJ, DWordAcc, NoLock, WriteAsZeros) + { + B0EJ, 32 + } + + OperationRegion (BNMR, SystemMemory, 0x090C0010, 0x08) + Field (BNMR, DWordAcc, NoLock, WriteAsZeros) + { + BNUM, 32, + PIDX, 32 + } + + Mutex (BLCK, 0x00) + Method (PCEJ, 2, NotSerialized) + { + Acquire (BLCK, 0xFFFF) + BNUM = Arg0 + B0EJ = (One << Arg1) + Release (BLCK) + Return (Zero) + } + + Method (AIDX, 2, NotSerialized) + { + Acquire (BLCK, 0xFFFF) + BNUM = Arg0 + PIDX = (One << Arg1) + Local0 = PIDX /* \_SB_.PCI0.PIDX */ + Release (BLCK) + Return (Local0) + } + + Method (PDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local1 = Zero + Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One] + )) + If (!((Local2 == Zero) | (Local2 == 0xFFFFFFFF))) + { + Local1 |= One + Local1 |= (One << 0x07) + } + + Local0 [Zero] = Local1 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One] + )) + Local0 = Package (0x02) {} + If (!((Local2 == Zero) || (Local2 == 0xFFFFFFFF))) + { + Local0 [Zero] = Local2 + Local0 [One] = "" + } + + Return (Local0) + } + } + } + + Scope (\_SB.PCI0) + { + Method (EDSM, 5, Serialized) + { + If ((Arg2 == Zero)) + { + Local0 = Buffer (One) + { + 0x00 // . + } + If ((Arg0 != ToUUID ("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */)) + { + Return (Local0) + } + + If ((Arg1 < 0x02)) + { + Return (Local0) + } + + Local0 [Zero] = 0x81 + Return (Local0) + } + + If ((Arg2 == 0x07)) + { + Local0 = Package (0x02) + { + Zero, + "" + } + Local1 = DerefOf (Arg4 [Zero]) + Local0 [Zero] = Local1 + Return (Local0) + } + } + + Device (PHPR) + { + Name (_HID, "PNP0A06" /* Generic Container Device */) // _HID: Hardware ID + Name (_UID, "PCI Hotplug resources") // _UID: Unique ID + Name (_STA, 0x0B) // _STA: Status + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings + { + IO (Decode16, + 0x0000, // Range Minimum + 0x0000, // Range Maximum + 0x01, // Alignment + 0x00, // Length + ) + }) + } + + Device (S00) + { + Name (_ADR, Zero) // _ADR: Address + } + + Device (S08) + { + Name (_ADR, 0x00010000) // _ADR: Address + } + + Method (PCNT, 0, NotSerialized) + { + } + } + Scope (\_SB) { Device (\_SB.GED) { Name (_HID, "ACPI0013" /* Generic Event Device */) // _HID: Hardware ID Name (_UID, "GED") // _UID: Unique ID Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive, ,, ) { 0x00000029, } }) OperationRegion (EREG, SystemMemory, 0x09080000, 0x04) Field (EREG, DWordAcc, NoLock, WriteAsZeros) { ESEL, 32 } Method (_EVT, 1, Serialized) // _EVT: Event { Local0 = ESEL /* \_SB_.GED_.ESEL */ If (((Local0 & 0x02) == 0x02)) { Notify (PWRB, 0x80) // Status Change } + + If (((Local0 & 0x10) == 0x10)) + { + Acquire (\_SB.PCI0.BLCK, 0xFFFF) + \_SB.PCI0.PCNT () + Release (\_SB.PCI0.BLCK) + } } } Device (PWRB) { Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID } } } Signed-off-by: Gustavo Romero --- tests/data/acpi/aarch64/virt/DSDT.acpipcihp | Bin 0 -> 5993 bytes tests/qtest/bios-tables-test-allowed-diff.h | 1 - 2 files changed, 1 deletion(-) diff --git a/tests/data/acpi/aarch64/virt/DSDT.acpipcihp b/tests/data/acpi/aarch64/virt/DSDT.acpipcihp index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1ee2699d03dd24b7f56dc6e9f88334ab5aeb3d9f 100644 GIT binary patch literal 5993 zcmb7|&u<&o5y#(>lt?Z~X-U!gWm#hCIBA;JT}rm3xK1i^m$D>_)Rs%x0cezz1GknP zAVlmGa03If3b?Kh1!AH-vw;4P0zLKCTMs?wl7FDLvftTViZk)MWC1RB-kbTn_kBA{ z&Rf@aTgP)s#U51;oE^VZ{nT?xI1Hr}UDLPq=MCdt$FFwUr;Cnl+o{gZuA8ek-Y$#{ zmFgVsx~hG8!#Svr`kM6}+b)-*zEsC)`uRn3?qymLFs&@5{xqo!;~iMf5WBg3*Vzua zzpB*_!CghH->R4y1UnTYMC8q>5D`nyN0F7po#tpt`;F!SLa&d9J&zm@ZmL)`xXlse zaCC{FVc$Z;)EH5Y5LKGRst#esbc_UJta8ShmJ!!6CK+RmGp=bF2^}NF7}q%Cx|T7a zW0;I_oio<8j7c3M%NXmNv7u!ob&M&-*x-y!EhD94Sd6jB86RmGX&s}$7#}f4IeIu` zikYU4QDlr8oS{uq`H+lKeU>qP!5R8I&Fbbc&lop3L!YNP9b=I(KIRO4o=)i)ON{Xe zXXx{ETE|#sj9+qwK2I$jqr@0noT1OtypHiB#;9KH#}43{(Xd3r&|_z7dwI76SOvpU948DpC>^m#g`V_ap7Tb!ZK(|H}kW{e%q z(C6ubjKN;caho&rdAg)yY%<0^XXx|vl8$kMG3t!5 zrq9!59pffrG&n<_rz<+fCya3rF?JLC=LM11@NCE4J}*8z)I3vWCa7~R2mYYG)mEJB z_)Xtvp9ZLCIs%0vgrnZopu)Cu)E><$dU^zkiV@DbqG5$?k`+Bgl7*s#v)tBvz@^jppRin-(|NA0Qys-$duTwMK59jnjq ztq2m7X#{0jsojjx@{Ei)j5SrrC9=bzp(qA^kwsB( zoC^DbIJk~XiUdFKMNJv{MixbmTv0I6h;R)eVN&F1lz0$1nn7GqIF-ZmO5c_ou<%f3Y{o;xlWi|XGZAE z2%QV(O4E(x7W zLMJvTTqjJf^ODecN$9*Jb;9I2mxaz{p%WV#t`jELxgvC~2%RfZC(KZ1(dszWiaNuu zg0i;4KUP#MJ4y5DtDK7A2MWiKPR1XRFIoIw28T5q{*Sh0IEGizV`TBK79RK;#xX>% zpZ2pD#wTijrc(Z)=c$y_YVNDzezJ4mJBinimE+zm4;mBwhxr-PYS;g> z_TQDIt-s!VTKW6O|NhPE$7TW!tN2dgd#y*O?$=#&xjV4l^pB0_6dv@I2QzQ_L3h|@ zQBSW+Eq}{~O@u0+Jud#N)*_MS6}#tQy--JkJMQ{ZWwgJ z>#TaBS@T(;;{>m>sQ6nm?YCATSZS=m%GP)R=nB7+vdoxQ`?KRFOxMK_8yW)@0oF|h|+$an$J}6!wO<_Uc~CrsT=uri>~Qm^>PDu z63f)173vNa-{_a}tUE~l<=Bj!b$jZlM}z#~)#pm#WT^XydfvaU`u9<)A!VK)8As2L zo*8Bmu1BxBN+Eiq|Hw>!Kd@Jb#c0fL#?ig|6wu45S6u^f*6sOw=c`=2Jy8p0y#9kG zY`%!*uoTRpFcDKZ)$IiW&L`MD-Ai~oUNd~36xO}#VXd3PEiCPP@wE5(SHCTN`QXVH zUw!%6gD2=4y$419d((_>+nrRW;x>_W)4shK8psby!>yFR8g-*3p;A@9 zwvYDO#5gQf@edoS_yHw&wpU1?knQ%!FIXPx3>Jv);KSobkGq%+`4>91J=>sEAzx}M z7Ti0HR&0>@`k|p-(g4TS6&k;|;yI0$>M6=3@}YD!q6^oI7m>v1|MgXJrc2AsMX#H; zGT}|RRdXS1{MNZlI|aOT&Y=TW<6TwU_#k*@+9$OpHWE;s3ZDZqof@WE!p-f}?zGZ9 zvhbVG$8Q5w=r6sy&8m4axJeDDJFNEQdq0nl9=z~rU=1|U_WP`XJldxVL>b>($9BS* Gs{aE@PSiaB literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dc3ab24d05..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,2 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT.acpipcihp",