From patchwork Mon Jul 8 11:47:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=ZRw5GvFp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9J18dtz1xpd for ; Mon, 8 Jul 2024 21:50:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmqn-0001le-Qo; Mon, 08 Jul 2024 07:48:09 -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 1sQmqb-0001Wk-HD for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:47:59 -0400 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqY-0000zB-OH for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:47:57 -0400 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-37613975e20so16930945ab.2 for ; Mon, 08 Jul 2024 04:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439272; x=1721044072; 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=yavw6aCB+cL8jfGAWIFAWUU098X5XflaXF6SwWqsWrI=; b=ZRw5GvFpJ+tw0UbHgWnccG9XLYqiL10Imn2zqruVXr2fOc2qS8ZTINBROxjHXRRPaO SsuBZaLxPao4Sow/P/+XmD3uPyArBPtRHZTlVZmQoQN0qJHDD4ZkbJ9A/dNC/Hg/od8N jALeZPE6usUZTg+Cw6T2ZX0nUquw2mev4HzRHv2F5/8Z5eL8cya7h3P592Fnexw0Eh28 dlID0JR/4a/w1HiAPAzPIW9Slh5P6W9UcTiTSdtr+7BBJjVen7j4y0iEBz3Yzon4UJrJ s7PBbVbkFTPWrq+e9RS7pEUsJX72uPShZvGbVS1obts7lzl8mg75DpzJtDm7RBmtZiD0 LEKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439272; x=1721044072; 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=yavw6aCB+cL8jfGAWIFAWUU098X5XflaXF6SwWqsWrI=; b=IbqVaUwx5A3zM62QfRG3Tr0JO6QGUdlZZu7BdyPPx5rQWMbCdhyaf4rDb5EsiMAC0G YoVStdjZg3GYgADM3ht8p2yOxTKHOBp+E9C7PJSOEtvNgRpQdFuNJwCtDXBbXTo7TlIL MeLdx8iQIe5YzcCzp4un1r8v35lbYHUMqwQlYVpgRXcJSL9BZBht3CLBnsWOkqO8me4N MQTtcs6ZFej6Hc6V0V7dF/ZpTHtAHCcG+aTlosj98O3jXv77K9WhtHfYkmnbwU64yp6K npF5eQhXIV2hoBMGG5HHg48DPHzmPJrqj8PpXbc3l75Km9Qb2o391Qc+RfU6e6zPiblj B8hg== X-Gm-Message-State: AOJu0Yw0PlBOu/NGfIYYksLf7wuQHelcyn5keRX2HIZYrBLe6kcA1y8a K55vn9EfrKtAuG242R1dUccIS1lOXQYmEOQXaTvu6mpPxW8UiBCoJ4Wp5PrlosLk9Gd0aY1dNyX Y X-Google-Smtp-Source: AGHT+IGv4vGfBmcPrKYwIoaZuLU4rFy6FeNL3UozVweyRstjMcTt5Qg5dP56f6ahf7jlg3pMUqigyw== X-Received: by 2002:a05:6e02:1a8c:b0:382:a99f:fd16 with SMTP id e9e14a558f8ab-3839833c683mr160097885ab.4.1720439272467; Mon, 08 Jul 2024 04:47:52 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:47:52 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 1/9] hw/riscv/virt-acpi-build.c: Add namespace devices for PLIC and APLIC Date: Mon, 8 Jul 2024 17:17:33 +0530 Message-ID: <20240708114741.3499585-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=sunilvl@ventanamicro.com; helo=mail-il1-x12c.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org PLIC and APLIC should be in namespace as well. So, add them using the defined HID. Signed-off-by: Sunil V L Acked-by: Alistair Francis --- hw/riscv/virt-acpi-build.c | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 0925528160..87fe882af0 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -141,6 +141,52 @@ static void acpi_dsdt_add_cpus(Aml *scope, RISCVVirtState *s) } } +static void acpi_dsdt_add_plic_aplic(Aml *scope, RISCVVirtState *s) +{ + MachineState *ms = MACHINE(s); + uint64_t plic_aplic_addr; + uint32_t gsi_base; + uint8_t socket; + + if (s->aia_type == VIRT_AIA_TYPE_NONE) { + /* PLICs */ + for (socket = 0; socket < riscv_socket_count(ms); socket++) { + plic_aplic_addr = s->memmap[VIRT_PLIC].base + + s->memmap[VIRT_PLIC].size * socket; + gsi_base = VIRT_IRQCHIP_NUM_SOURCES * socket; + Aml *dev = aml_device("IC%.02X", socket); + aml_append(dev, aml_name_decl("_HID", aml_string("RSCV0001"))); + aml_append(dev, aml_name_decl("_UID", aml_int(socket))); + aml_append(dev, aml_name_decl("_GSB", aml_int(gsi_base))); + + Aml *crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(plic_aplic_addr, + s->memmap[VIRT_PLIC].size, + AML_READ_WRITE)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); + } + } else { + /* APLICs */ + for (socket = 0; socket < riscv_socket_count(ms); socket++) { + plic_aplic_addr = s->memmap[VIRT_APLIC_S].base + + s->memmap[VIRT_APLIC_S].size * socket; + gsi_base = VIRT_IRQCHIP_NUM_SOURCES * socket; + Aml *dev = aml_device("IC%.02X", socket); + aml_append(dev, aml_name_decl("_HID", aml_string("RSCV0002"))); + aml_append(dev, aml_name_decl("_UID", aml_int(socket))); + aml_append(dev, aml_name_decl("_GSB", aml_int(gsi_base))); + + Aml *crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(plic_aplic_addr, + s->memmap[VIRT_APLIC_S].size, + AML_READ_WRITE)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); + } + } +} + static void acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap, uint32_t uart_irq) @@ -411,6 +457,7 @@ static void build_dsdt(GArray *table_data, socket_count = riscv_socket_count(ms); + acpi_dsdt_add_plic_aplic(scope, s); acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); if (socket_count == 1) { From patchwork Mon Jul 8 11:47:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=KiMcmSKV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj83033Fz1xrP for ; Mon, 8 Jul 2024 21:49:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmqr-00020o-4h; Mon, 08 Jul 2024 07:48:13 -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 1sQmqp-0001vX-FZ for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:11 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqd-0000zX-5x for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:11 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-70b2a0542c2so828327b3a.3 for ; Mon, 08 Jul 2024 04:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439276; x=1721044076; 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=VrHiIjwct91ht0i7PHZglY7Dj7SLTZxWTqnnPukeXL0=; b=KiMcmSKV/zXN1fmVB12IrfAge2RP7iMw2zKzj18Hg9e2yei2SXQh0dJG9ZKj1rwlkW Oz0I0+nkgyGJFQjhcjAZPwrW837CNyjqK7YU6SL4NedCg9XSGcKXIfHWzqSP6GPEJ0Qy FRIFPZTosb+PHg0Ylr5VPsyG18tz0ofmvImTMjsmcVz+C64CrRx9JcifbJoVhKVhfehh QMo1G665m7el+FiqWoWPKXokqQBQI75RlT/9+78AfO3oflhdIYXrYdESdML52hRhEkCz E85bts3VCt2jeFRlJxnBd+SewvrFvt4IHTUz6oL+VdcIK0sWJYToP1IKCZ+HBI8Lejn0 sYcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439276; x=1721044076; 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=VrHiIjwct91ht0i7PHZglY7Dj7SLTZxWTqnnPukeXL0=; b=VbokqSooUJ/pO6x6MEYt1va4ZOIyHy3mdbXPApwJvmF3M/66VvTxc6VqfJ/eKx+jSv xA1hp6hKl5CqEc5S52K7M9ZRjPp/3aEBLADnOxnZEwwPhKIZoEC1/xL2yKaw8r3M92jV Lx5e0lYZCG3iZ95cTHvd8y9b+hr6Il3TpC76zWH7AS4GOLN/HS/AscMZy+wYfOi9G4dn DPWbcmVjyLvEd8pHqvs/ZTc8S8Fxvt/2Ugmf2wx2NSe7SgdqOpuIvhTi1rt4bpGuiRVN TH/CMLrnBjOBcRST4UJyA9KBGxCDfrKIgvU5+p1QbkdFGDWRI9KrKr86kaRMzruZ2v0T Drzg== X-Gm-Message-State: AOJu0YzvyaGPb5KCOm/T8n40QGFrgBFBTGszQd9FUI8FeU6gVYdF4xiS QK0PGXRNdCbZWslimmOCyKjNjygHt4ODTaaCajJkmg6MFdvBF5uM0H7RlyFzX4goz8HbSO2fd54 h X-Google-Smtp-Source: AGHT+IHFlU+rWwSr6KtFsPmwPzz0lGrvPirNNcURX2ncYjd0ANVTO+zJXJY3S9fVvYAWII6Nx36ouQ== X-Received: by 2002:a05:6a00:4b16:b0:705:be21:f2be with SMTP id d2e1a72fcca58-70b00960b21mr15176007b3a.18.1720439276283; Mon, 08 Jul 2024 04:47:56 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:47:55 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 2/9] hw/riscv/virt-acpi-build.c: Update the HID of RISC-V UART Date: Mon, 8 Jul 2024 17:17:34 +0530 Message-ID: <20240708114741.3499585-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x42c.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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The RISC-V BRS specification [1] requires NS16550 compatible UART to have the HID RSCV0003. So, update the HID for the UART. [1] - https://github.com/riscv-non-isa/riscv-brs Signed-off-by: Sunil V L Acked-by: Alistair Francis --- hw/riscv/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 87fe882af0..939f951e45 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -192,7 +192,7 @@ acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap, uint32_t uart_irq) { Aml *dev = aml_device("COM0"); - aml_append(dev, aml_name_decl("_HID", aml_string("PNP0501"))); + aml_append(dev, aml_name_decl("_HID", aml_string("RSCV0003"))); aml_append(dev, aml_name_decl("_UID", aml_int(0))); Aml *crs = aml_resource_template(); From patchwork Mon Jul 8 11:47:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=k/bymEKK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9V0vm7z1xpd for ; Mon, 8 Jul 2024 21:50:22 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmqx-0002U8-Dp; Mon, 08 Jul 2024 07:48:19 -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 1sQmqw-0002Ol-Ad for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:18 -0400 Received: from mail-oa1-x34.google.com ([2001:4860:4864:20::34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqg-000102-T8 for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:18 -0400 Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-24c9f630e51so2430289fac.1 for ; Mon, 08 Jul 2024 04:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439280; x=1721044080; 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=qevKJQpjtteUldtR7LJxAGzsp0+tuZOokGrtY3Qi+7o=; b=k/bymEKKPp0++brrkzoBYMTOos1iCw8WPrf65W9kf6/l+Oj55T50B7NE9szEmRy8Qm U1Qa3VyFOyY1VLrekLr/38IOYSL5H9eH9N51ZnQSyUI8JHahCj8LCoiL+grLoAmUX4oh jj5IzAU5QnBW59pqoY5vBqdcyexbQ01J3JHg8XwzhYM6z5FMc/lzMGpHJAJptxk/A5R+ F1GIsC/1HAMLt1KrQ8S6mFg2T5Y9jF92mhcC/aoNHLHGItT3Rp5EBgd+zqyx8F7IzxjH ONb+CPE661/fkwAo+ZFirlB8PgExJqiQzO22K5yOAw9SBHpKsihczeDMQjFKkXZsKRC1 eTcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439280; x=1721044080; 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=qevKJQpjtteUldtR7LJxAGzsp0+tuZOokGrtY3Qi+7o=; b=aacI3LZ3tANwPd6mqIFXLxMq4isjtqytRp4uvEQKpCv5X/BWL7b/llra7QbkwqA+Q/ 1SZL7ebtegFxBp5ILBxcYTa1k+CCr8E+rFbi1StB//xxAiWZFHHsiUMQVsuB9jqFkY37 zfTcFgxlB9agOoO4JYHRP2zWqykuNyX+0p1d5vUmmbTWY0NP/4CLRZA1kvqEnRNo0Yrr mfCQuHU/GKrI1uKfppb10NU2OfeUHux8SfSN86oUFrsNy5PKhxL9ED1ucyou6az3AC+d 7Jm6Xp8L4+qDSMYypKsbLuttgUgukR8a2KCjAlAkrp8DwW/y/UNc6up1o2JDRg/GP1/r 8gDQ== X-Gm-Message-State: AOJu0YwAnzBF80bP/VyzAmOlnbgs0jTVsNGLly4O/5mhgZN1nbG/jawf vQyitT+ayXyVWNfJLxgITmfh4ycWyeMjyQay7cB14cL+2c9FJ2+LnL0UaYfNdjr0GNmpzFzCZci p X-Google-Smtp-Source: AGHT+IFvpJn4KMcBXXykKweTrbJwHmpyOXy6l8Fu5w3dAa28Mp502SmEnqqMbLwg8u6jK6fF89txhQ== X-Received: by 2002:a05:6871:24c2:b0:25b:3e23:e5e7 with SMTP id 586e51a60fabf-25e2b8a7442mr9931574fac.3.1720439280253; Mon, 08 Jul 2024 04:48:00 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:47:59 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 3/9] tests/acpi: Allow DSDT acpi table changes for aarch64 Date: Mon, 8 Jul 2024 17:17:35 +0530 Message-ID: <20240708114741.3499585-4-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::34; envelope-from=sunilvl@ventanamicro.com; helo=mail-oa1-x34.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, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org so that CI tests don't fail when those ACPI tables are updated in the next patch. This is as per the documentation in bios-tables-tests.c. Signed-off-by: Sunil V L Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..9282ea0fb2 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,7 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/DSDT", +"tests/data/acpi/aarch64/virt/DSDT.memhp", +"tests/data/acpi/aarch64/virt/DSDT.topology", +"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", +"tests/data/acpi/aarch64/virt/DSDT.pxb", +"tests/data/acpi/x86/microvm/DSDT.pcie", From patchwork Mon Jul 8 11:47:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=iABe8DlI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9K1j1fz1xpd for ; Mon, 8 Jul 2024 21:50:13 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmqp-0001uy-HD; Mon, 08 Jul 2024 07:48:11 -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 1sQmqm-0001hp-3q for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:08 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqk-00010P-Ds for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:07 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-70b3c0a00f2so216930b3a.3 for ; Mon, 08 Jul 2024 04:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439284; x=1721044084; 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=zW963OfHAGZhsxxm7NT5xfRi2/UE5cMEXprCk/murZI=; b=iABe8DlI3J9sfLKmTaKgxxGmkUXfKFVI+4KNAzFaCa5sbUJjibVEKwh/7RmCwzdb1O TpSbPJvc5aB1UwW7hW++NmGqkZJjUtqAkr8z8lz5lF+qq9kuqVnkuqhU/SW3WvPP9vO/ ajhri5PzhADTTTBc3rIfzX1zXzV22x6BmWBcx6AnuwKb7vmqFUQt3YJXrA9MhQ6CB1JJ srasSyMMi/3P7hltxWPs+qwexZjNE8pw5u7dpl8fnNmhiJjpMU8rRc1F5zEPSsosiAya I0BQMYeOgZ0cDeACj50utJRb1tgOTroSVx14YzYG9kzyDmGzwJAJjUv7uZL9SphNffKc 9laA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439284; x=1721044084; 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=zW963OfHAGZhsxxm7NT5xfRi2/UE5cMEXprCk/murZI=; b=cEODjdjEoiyiCwvsgyaHFmL9PPh5tOSNkkTAwaYdJnmKnzR0UTCm/Hc7VHcWp9t7wr p+3GOKKPlOBla3CkkwEMlVjfU+UFj+vnuT5Kf7o2fQoytgP4nV6RAHjJmYuWSvoDMLAq AV2+Km1QRh6Y4ViUOCgCcR3LRV3go5W/oHgoxn+jnRHL3d5W+ys9ndewxhQKhgvhVitZ 3ip2YkkP2poh4syUPA8PliT38vEQSHEs5uCBH4OAlh2bjApC9HPkgvS3+JSMV9X/c7K6 TrBIKvXrt/RhgSzhhCRY0JPaGdLvDS8+RaRvCSO6uF2/oUDFLcLYHnO7JOjiiAyolxE6 0v6g== X-Gm-Message-State: AOJu0YxWIhOkGPYbe+2fLigSL1jkuHtdPMSsndW8s9tn9SrqRHjHd2uU nOrUZdXgIDmDqfeNk6+uw9HVXkrkc9ogU5A/mtfUOUsgh/U1/Lc6Y/icr96CJRgJR5QBFF3KwOL t X-Google-Smtp-Source: AGHT+IEst4kCThUOBw1TxDQvABP9F5OpN76W2cKyU/ujOB/oQN8xicqXvE9FiPC/Xk48Gk+r0O4o1A== X-Received: by 2002:a05:6a00:189a:b0:70a:fe2d:473a with SMTP id d2e1a72fcca58-70b00921341mr9235713b3a.2.1720439284153; Mon, 08 Jul 2024 04:48:04 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:03 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 4/9] acpi/gpex: Create PCI link devices outside PCI root bridge Date: Mon, 8 Jul 2024 17:17:36 +0530 Message-ID: <20240708114741.3499585-5-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x432.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently, PCI link devices (PNP0C0F) are always created within the scope of the PCI root bridge. However, RISC-V needs these link devices to be created outside to ensure the probing order in the OS. This matches the example given in the ACPI specification [1] as well. Hence, create these link devices directly under _SB instead of under the PCI root bridge. To keep these link device names unique for multiple PCI bridges, change the device name from GSIx to LXXY format where XX is the PCI bus number and Y is the INTx. GPEX is currently used by riscv, aarch64/virt and x86/microvm machines. So, this change will alter the DSDT for those systems. [1] - ACPI 5.1: 6.2.13.1 Example: Using _PRT to Describe PCI IRQ Routing Signed-off-by: Sunil V L --- hw/pci-host/gpex-acpi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/gpex-acpi.c b/hw/pci-host/gpex-acpi.c index f69413ea2c..a93b55c991 100644 --- a/hw/pci-host/gpex-acpi.c +++ b/hw/pci-host/gpex-acpi.c @@ -7,7 +7,8 @@ #include "hw/pci/pcie_host.h" #include "hw/acpi/cxl.h" -static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq) +static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq, + Aml *scope, uint8_t bus_num) { Aml *method, *crs; int i, slot_no; @@ -20,7 +21,7 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq) Aml *pkg = aml_package(4); aml_append(pkg, aml_int((slot_no << 16) | 0xFFFF)); aml_append(pkg, aml_int(i)); - aml_append(pkg, aml_name("GSI%d", gsi)); + aml_append(pkg, aml_name("L%.02X%d", bus_num, gsi)); aml_append(pkg, aml_int(0)); aml_append(rt_pkg, pkg); } @@ -30,7 +31,7 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq) /* Create GSI link device */ for (i = 0; i < PCI_NUM_PINS; i++) { uint32_t irqs = irq + i; - Aml *dev_gsi = aml_device("GSI%d", i); + Aml *dev_gsi = aml_device("L%.02X%d", bus_num, i); aml_append(dev_gsi, aml_name_decl("_HID", aml_string("PNP0C0F"))); aml_append(dev_gsi, aml_name_decl("_UID", aml_int(i))); crs = aml_resource_template(); @@ -45,7 +46,7 @@ static void acpi_dsdt_add_pci_route_table(Aml *dev, uint32_t irq) aml_append(dev_gsi, aml_name_decl("_CRS", crs)); method = aml_method("_SRS", 1, AML_NOTSERIALIZED); aml_append(dev_gsi, method); - aml_append(dev, dev_gsi); + aml_append(scope, dev_gsi); } } @@ -174,7 +175,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) aml_append(dev, aml_name_decl("_PXM", aml_int(numa_node))); } - acpi_dsdt_add_pci_route_table(dev, cfg->irq); + acpi_dsdt_add_pci_route_table(dev, cfg->irq, scope, bus_num); /* * Resources defined for PXBs are composed of the following parts: @@ -205,7 +206,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg) aml_append(dev, aml_name_decl("_STR", aml_unicode("PCIe 0 Device"))); aml_append(dev, aml_name_decl("_CCA", aml_int(1))); - acpi_dsdt_add_pci_route_table(dev, cfg->irq); + acpi_dsdt_add_pci_route_table(dev, cfg->irq, scope, 0); method = aml_method("_CBA", 0, AML_NOTSERIALIZED); aml_append(method, aml_return(aml_int(cfg->ecam.base))); From patchwork Mon Jul 8 11:47:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=h4vquB/O; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9F6Fl0z1xpP for ; Mon, 8 Jul 2024 21:50:09 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmr1-0002uC-1B; Mon, 08 Jul 2024 07:48:23 -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 1sQmqy-0002f3-T3 for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:20 -0400 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqp-00010x-Jy for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:20 -0400 Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-7eb895539e3so166517339f.2 for ; Mon, 08 Jul 2024 04:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439289; x=1721044089; 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=fTj8JqwW6HZgP5hs1FYsc9VV2SpEFSu80LfSG1MxQFQ=; b=h4vquB/OEvh1aKp6vx58XR3hYyDau6VpOghEfrValtlB5tJm7Q12iv9JJk5f3bpdKS isbASP8BAcCaQFgtyUF4csu0n4WrOWaos3mLTCXAdYinznVHYkvlvY7Vd6ZrU8SXM5tU JaCUredK2lMAACarPZCHxh3qtIZPjnjEQVECm9PkQ07NiLCXJ197LPWnw7rJMcayUALx XMMKJvkkrwLOD2vrODjJp/x4f2ekckL9BMhttq+b5cXHyv3CUzXG84zEU3fKzwITiKzH JA66B3wKDk2ctyc6cyU6iRhD1WYiz5YvX61aLn6KN2GHw6m0+Cz4aFPYM60EBCUQVMBJ 5p4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439289; x=1721044089; 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=fTj8JqwW6HZgP5hs1FYsc9VV2SpEFSu80LfSG1MxQFQ=; b=F3hPG2CU57+lStTlXEXIOWFRmEWEgbT5is2koU5273lEFCD+9rlsMLQu3J3kuhnuU+ PeJlzTHz48NJB5Sc6YoJg8U4EyJq9p75/8SMHRVAbU/Z9sdKnjtIciAYTyTzcSuac78n +K8fIJ+eQ4og2Bfo+VlGxecCXHqf2u++I4ey72YhwuIuxz5azsoIiN2VRCt3d3DSxoIk HsE3+OS9DpmazTjMFQaqpRGagkiQn3b6EcLW0wnTh6fmDv1rDsHugYd2ocGV2nU+Rk3L bOfyKXLgULyDL3omo0CCHKHTenT4n+qjt9JHDd6oLaHNisrhDcJwYq9qOPM+6NHshoYc +15Q== X-Gm-Message-State: AOJu0YyZy3ODPo2KnTFQNMlBvSDrNYruQ72MKzSAn+FpxNpi/XJxIfv/ uSEb42kDypW4FEWCljKRi7URGAkankJBDYgGBAd2kARCrv8zuE9n7Vl5Tc6TJByPzI+UODU/dIn 2 X-Google-Smtp-Source: AGHT+IFKmEC2FDsG1pWA0qs6ioFOoZmMBBegSrrXf0jrLNz3aFI58MyE/s1gWIxkTGR39n3MfmqlNA== X-Received: by 2002:a5d:8e0c:0:b0:7f5:bd0c:aada with SMTP id ca18e2360f4ac-7f66e026dc4mr1431314539f.18.1720439288579; Mon, 08 Jul 2024 04:48:08 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:07 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 5/9] tests/acpi: update expected DSDT blob for aarch64 and microvm Date: Mon, 8 Jul 2024 17:17:37 +0530 Message-ID: <20240708114741.3499585-6-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d36; envelope-from=sunilvl@ventanamicro.com; helo=mail-io1-xd36.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org After PCI link devices are moved out of the scope of PCI root complex, the DSDT files of machines which use GPEX, will change. So, update the expected AML files with these changes for these machines. Mainly, there are 2 changes. 1) Since the link devices are created now directly under _SB for all PCI root bridges in the system, they should have unique names. So, instead of GSIx, named those devices as LXXY where L means link, XX will have PCI bus number and Y will have the INTx number (ex: L000 or L001). The _PRT entries will also be updated to reflect this name change. 2) PCI link devices are moved from the scope of each PCI root bridge to directly under _SB. Below is the sample iASL difference for one such link device. Scope (\_SB) { Name (_HID, "LNRO0005") // _HID: Hardware ID Name (_UID, 0x1F) // _UID: Unique ID Name (_CCA, One) // _CCA: Cache Coherency Attribute Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings { Memory32Fixed (ReadWrite, 0x0A003E00, // Address Base 0x00000200, // Address Length ) Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) { 0x0000004F, } }) + Device (L000) + { + Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) + Name (_UID, Zero) // _UID: Unique ID + Name (_PRS, ResourceTemplate () + { + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) + { + 0x00000023, + } + }) + Name (_CRS, ResourceTemplate () + { + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) + { + 0x00000023, + } + }) + Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings + { + } + } + Device (PCI0) { Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID Name (_SEG, Zero) // _SEG: PCI Segment Name (_BBN, Zero) // _BBN: BIOS Bus Number Name (_UID, Zero) // _UID: Unique ID Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description String Name (_CCA, One) // _CCA: Cache Coherency Attribute Name (_PRT, Package (0x80) // _PRT: PCI Routing Table { Package (0x04) { 0xFFFF, Zero, - GSI0, + L000, Zero }, ..... }) Device (GSI0) { Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) Name (_UID, Zero) // _UID: Unique ID Name (_PRS, ResourceTemplate () { Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) { 0x00000023, } }) Name (_CRS, ResourceTemplate () { Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) { 0x00000023, } }) Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings { } } } } Signed-off-by: Sunil V L --- tests/data/acpi/aarch64/virt/DSDT | Bin 5196 -> 5196 bytes .../data/acpi/aarch64/virt/DSDT.acpihmatvirt | Bin 5282 -> 5282 bytes tests/data/acpi/aarch64/virt/DSDT.memhp | Bin 6557 -> 6557 bytes tests/data/acpi/aarch64/virt/DSDT.pxb | Bin 7679 -> 7679 bytes tests/data/acpi/aarch64/virt/DSDT.topology | Bin 5398 -> 5398 bytes tests/data/acpi/x86/microvm/DSDT.pcie | Bin 3023 -> 3023 bytes tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 7 files changed, 6 deletions(-) diff --git a/tests/data/acpi/aarch64/virt/DSDT b/tests/data/acpi/aarch64/virt/DSDT index c47503990715d389914fdf9c8bccb510761741ac..36d3e5d5a5e47359b6dcb3706f98b4f225677591 100644 GIT binary patch literal 5196 zcmZvg%WoT16o>EFlh__VVmr?J;S@^6GqU5nTG|qO>?AIBVmwKMluE9IK$L7EQ6ZHI zDP++?b~J)@kn)Ehv0}%LMb~Wj2iRfGojc?Fj&erwc+Si{-`sC}Y@eCBSKn(Dl#0yM zcHM1nq4sIVU7*EMO6hI=o_$%f9`(Fh@9=cmEtN{~-gdK|uDYEj1#2qa+i%v@;prWB zw;dkqwzo^Aayd8_@3~zsH|y4lB#LLD4hHUEe%#Hx2ibMth&QOO)&F zRh=XyyH(2|a!$q|B8kZ$vuZ!=hErz3r$f$^nsKgisMgtci@6#K-_+4H@eqBQ7zrz*tAdZIO|X7ii7^k1kB}kPX;xw^ z0Am9ga-HTR#v8z>B15jzyu`Q(j2bfJIvtf5w}9aSV@a;lg2Z?m7%eFsL$1>~iE#%QZD3U7I-QpocY(2k47pB=65~EFb^}J!ZVeiu z&Q7P~mNo~?M~8ZzjFa^HoHzaPM7_4JFx>OHo^^QYqk`!$6g44;x+$Q{z5(iio>lPe zVJO{=!?R9fSXSSnU)l{FW1y!O~owmMFPt<4ht~A7N(>mR~(bm__Nj_;O`+cQ98)ddF z+AgbnO7C|f`tpQ9l!A)Nr|nd~Zz-KaG?lL;Xw&b!K>$sGk|mAgXj`I5cW9X{et`q0Xck`Dd~H%y0&_pBWCN1~ahqGbu#R zA?7*cXNI0bCNrEoh3GlVJgJ4J`GiBMAw^FL(KE(8W6U$gJt;)bIP;7%PikP%lS1@N zFi*PqFjvpNBnj?GA$mH@(_x;}@S-P$=$T}mN#>d4o)n^Iig~7(CpF0ENg;ZsnP-}L zrnx7D=$T=j8Rkh1HF{Ero+He2gn5o|PYThKZvIS-`&FD}p45P&Cxz&lW1czYnd6=m zqGz6Y=9woo?C41$dX6&BQRX?yJt;&_x~&G!0`sH>A3Z5V&oSmX#yrQkCxz%a&OFDN zC*2UBCxz%a!8|9J=LGkp5IyNu96TqPC*44xCxz%a#XP5&=M?v(5Iv`v=QQ)A8xHiO z5Itv@=M3|l;hq$t=PdJ_WuA0{f}Rwj=N$8#W1e%|lS1^IXP)!SlWu6xlS1??GS4FO zEOJi@jb|a-b8A&~NxupzyJ7xVsbkrWIZuB`s|fu-(bCr|>m}7oivBPCCEM@+r*F$> z=`Yd|D@FfmW}&}fTKaUAJdB;U9I%~XDaUPcRDKW?sZ$Lu$k!XdaiwT zq}=*J`C>bE{$*~|$sV>}SN<)|Zv1lawEEku~MDKBWuN><@bM!_)`Q4_Wb!{M|UtUItSgFb8>h(r8msUOhf1ft=j+5 C#r7@$ literal 5196 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 diff --git a/tests/data/acpi/aarch64/virt/DSDT.memhp b/tests/data/acpi/aarch64/virt/DSDT.memhp index bae36cdd397473afe3923c52f030641a5ab19d5d..33f011d6b635035a04c0b39ce9b4e219f7ae74b7 100644 GIT binary patch delta 1923 zcmY+^OOD!55CzZ&HXna5*!=%npg}#0ltdy@kTOeV*+cK3^`vYd1Jpwn(aI{ak}QMV zS9XcIBm0WFxQ-3Joo=V}{Qdmnwsfxj;XQp$I+ys{;c)#o`Wl7fv8<1;;NYq(&hGaX&YxVBhx4?JaMTcLCsz&P98=EKb4>~@3>Nig(!;36(8Tx4 zY+IU`ZBl4@oozd*Vpgh%p^9~6IFhQa5V=s*(Wq`>RGNsPsh5eRsVl_N)X~_bzHv$w z*-ASk?MPLno%*7>J))I%N!pdBj&=#^@5ol#BWaJMJ(eO`X`iHhlJ@JSZjabNz1-e} zqzOqAmLghdO45|1DM{~$7Me*jJbzgsBWcD`L@Uinnv*nVDPkj)s|*M_aINtB*Sj)c zDWa7YBrQlZs1JWzWGk&mT9LG3 zDWa8*NjfI!n4yTF>9LbMnF&cJB%QDn(MqQzosx9=kOnBCh0dI7p1-UxBk7E#h*ml$ z>71l6)Z# zmLgi|hNK&UZW^d>-rC4kx+UqBq+6CETIr6YyN49e9YYbLkLHH%NxCQLo~4Mj^iNU! G?)?X92B*>h delta 1922 zcmY+^IhNW`5CzcRk{C1~K+JR2v2BibfCrLJy0hLxdkOy>Z=eHWV#hw-fY;&8;P*?v z4)r2++*`^WUD&A6!#r_a9wTh4)2* z@JU08aCFTet1#tUI~P-EVX$t$lO9Gjh9-_Lvxzh@8&ha{olTrnF)LNXP{lejoJv(! zNL{GvXxcV0Dow=D)YD|r)D<#m>S*Q)ADvP~w$ctsJ5p6?r#-1|k7%V`l6Ix3qg{gf z8?u%5NZKQ5kEMuK+9zqBr2V$3+apG(m&==zG$(1!Qba2)NLrAzAn6U!LQ83e`!6e$ zBrRErXr&cNE0R_$MT}B8%YdK*_Yi*ndQ}E2MYPhIq%}!vmLgi|P?`!I64Vb_ifE-H zl8#6^Vkx4Pj!8O}rb5Ses1JWzWGih*+K{wiDWa85NID_ugrSI`>9LdCnJG!9B%QJp z(Mo3|oso2Qmj)=Jh0dLe_g_|+lXT8fL@Qm8bV1SuOA$j;p-Y1LB}tboMYK{pym26X zCay@jVkx4PuBE9ftnW~dtFmS(qLpq)x*_R?rHEF#CFz!++X(gXsf}!zn>+Fjs%K?a#p@VvND}_?kQXJ#wcT)Vn(eQ+~NzPIOn-8kw5kUV~!MB)YfO z8fNF<#MIcKbPqGoghEujXz2n6ik|&G2aZDNaQS34`A)m%C^5^b>C^W zZh`JRtPQqmUJ4fbwTP9-ds!hMMnY&@lo|_8jRBX2 zCo~qM#wDl5pi3hyG%iVvMW@D)OCu{Z7Ny3LQzPNh$O(-lsd3qL$AC|MVy+gb}Irl0(ZL(^~zX zBCQ2bBDKytwCu4{E&p-bU+RBqs8uU3!PW8sCT&%Ps$Spl_6aHRCD`iZC%v&f^Oo342ALB|nR8O*oK!g{bxtT{&MB31O67#F88Ro7GUv3)IjwR| z>zq)^oHHutjLHdLOJq(cWlp%Q0#_*fjX$e$&gz^{%A99Z&NC_}e2tMgp_DmGDrZUM zEa{w3+ME_kM!mx0jETapBeM_x4BV-CU=qQtcH1QUt&2mA9$pjhTHV6}b?{9Ur5@swSHkDx+>@hw zkuTs(g}N)pV^5C4K6^NaC-<-!kDu)RkhRBgNabX=_(r!8wBpBSt(#vKfBqv__`LP) z_@AxGpZwNw^5|o8l8;3q_yo6_fU{2TVJV;io{&8AY{&+8x$K<*CG}j$2KT%iQqPBM zP{;Wh`!&4*uv5(+}r`E8H;b$-4je2QilvajNL-0new36VBry#ts1B5qj zC3vG&T1oK6QxM+R0m2)%61=f_f;XOm@Wu`h-nfW55Z>4U!W*{|ys>$LH=cs<#tsnPxRv0I%@e%w6ofZ+ zfbhnx1aEAf;Ekssys-m>H*O_(WAg-WJO$y69U#1ME5RF^CwSv22yg5F;f-4f-q<|B z8&5%aV+ROt+)D7q<_X?-3c?#ZKzQR;f;To#@WxXR-q-=c8@Cd?v3Y_wo`Uek4iMhB zmEeud6TI;hgg178@W!nKZ)~36ji(^Iu>*uRZY6kQ^8{}^1>ubyAiQxa!5f<=c;hJu zZ|nf!jav!c*gU}-PeFKN2MBN6O7O0Hrx^$Y^5Lr6i(K`}PhB7S4B+aNmif})JNON1 z|Ese;bms#8XX=e+qicE3{!eNJ?|uP3W#B|#-`+ipMP9K>_nRFcE%=j@NP6*|uToh0 r&7iqHSDfuOZ*L{{u(*4iJ9>E6LxOqK-tN@B{hfnJd?Vq~x3kPYFGd+# literal 7679 zcmeI1%WoT16o;=LiS6+tw&OgUms2Pe&&rRcNlRN|kDbINPK+mQkW$GN2t>&y5*4CU z2$MyD>}Vu5Y=RVtKLaFI?AWnDEZOi6uw(e$xiif<%Gt6(o=EnbnR~vOZ*mf!d);)J zJMO$v;U62@_J*_Ac)M#aVhbsy^uB)29{mxz*LNEIy~7#1TrS7^8|`MgZg<-VmQ}oe zr`=S0hu7`xPH?W**(jGQ75`kkZ}*(sj5YNnp)@d|vPykDszRX)h#nz#Wo_49Gu*dY zojc%Gk?ZW#tt67|ddMJhR>mO0iD^Hx9=+QOZfSF?w~f@Lv&%lqJiEB1!v4j}6j3o( z=Lmh-bBM4yLsWc3L*GSJLRevm5haW&WzWPjh!e&Y%2*N^BND?R zj3vsrDl$eTMv5@5QpU2#h)IkLVJuU|ipYpdj4WZSP{uWpk&qa9!nj5l75|TemzZTq zi~?a?rwp-7`5#G8>XU@=I%UXpnv(8gnlNrqhFqs7>MXl`z&QL$1>)iE)`Q)+s}-(`kuOCX5Zrkn6N4F{*^o zrVP1GXC%fI!njQta-GgfjH`t4CS}NVIwvt!2xF5n z47pBA65|$OZ2OG*cU^nMzmM)#w_Go;p!u-T9+{|ysL|N6240h--<+LZu4qjjs87^8 zYEd=Sd+KBLK)s81rBl6jqubjV-~7lL#B99T~=m4g#C)jr}S|vjG!6>5d<}r zPe)U(izdsA^CO*wff;ko%frwh)S2LWW6>L#v3{g8gP~}A^c6AG%S5O%aW~%Bh?g1M zK}6}yU}(f-VyKsiP-o(fyv(SV8QekC%M6C1QSvRlOoY^Pgn5p5nStks$qa5DA@v+( zo@hmJKfzEmR@4(A^^7sk81syAPlVJn&OGDH6O9=4L`Xdo%o9ztd3xR>NpMeu)YD>~ z7V|{oMm-Ty&m{9qGS4LUL`XeT%rnJ2(dbc6gw!+5Jk!iG%{>uP&kXa-Fi$jw)Dt1~ z9Alni%yW!;BBY*}#F!fQsyNF$(MVEHgw!*~Jaf!5$2}2J&ph+YGfy<0)Dt1~9A}>6 z%yXQ3BBY)L=2>8#XjG{uLh3oeJSUjv1ouQpJtvvxB=baLOFa=%&nf0P#XP6DCqn9p zDJA)RPBTw5!qgKX^(->aBJ(VAPlVKShI!5~Pc+Wd6Cw4SWuCLlbC!D|q@HukbB=kU z(WagVsV5c+@PvZ@`18zjo_ivso(s%#fq9}ar=AF@XNh^1m}iN5A~c?RhwZ5TRhmhg z{wTJ~Yxs243l;Hx7mE=YE9osjJnwyw<8$}ivBGHI={X@E<@X5;h1CIyx+tK`v1h2; z`mX%8mZ9`20cE`)u*@;e^4nX^!fF9!T@qO4n9nly6ITAKvgWR~4-Rt~b`@1x^`t9z+`cF51d;e(Pief+& z?{U1>4s@V7dZ(sQkM)aH(yu4kr^gRMpW#f!8(le>e0m&=Gl#SKI9A3vzpOuTgjU1DqFSDsx7MWuz4FcZ+<^JY~J+5V%WU7?yz~&l`w4HTzA;K z=}H(jZ+@TopEYlVY~OCw)hQ;xD!Ymo)6H$ftcO86r_|>-K2Tp`YLvp#khf)B_aD8I zj?KM{Gocg~aLk4kCu}axhSbq3B*!~F(C75#MQ1Pi`2VtD>_mGlhfO8)cawU;P_xSC zo{#rCz|$$Mo;@19hs6T(Rc9l1@3Q_fb-mT>oB4_PCbgp13Nb-Rz;IXdkt%_cUaUrbTVX{ HYpH($%hpa? diff --git a/tests/data/acpi/aarch64/virt/DSDT.topology b/tests/data/acpi/aarch64/virt/DSDT.topology index 501314c91be01d927fd125e0c72e919fdd85592e..029d03eecc4efddc001e5377e85ac8e831294362 100644 GIT binary patch literal 5398 zcmZvg%WoT16o>EFlh__VVmr?J;S@^6GqU5nTG|qO>@+TMVmwKMluE9IK$L7EQ6ZHI zDb1olb~J)@kn)Ehv0}%LMb~Wj2iRfGojc?Fj(bMRc+T8=zL{_4*f}$Guf8`vrc`94 zw(D+r3$;(%?gA~AQc7>@&+PME>tWZcbq`Oc-BPI(?`}2g>8jgqQn04t-Th`=nX$4o zW*wf+P~MU>=0wb3MI4Np!DVsKHiIkT;E)+y6$gjS;F>rXJ3PJR?zTe9PHU@FDwhMx zc-QTCxoKzOMMCLIlTcZuejHYob&aB@bQRV&58O=y{-n{`rz^BXx!zvYNm8;~wG1NX zWDFvbm<%$j_JdA%akqCmyOg?eb=ZF9)xjMV2@YODL~su{LLc@uL_}R7$^oLL&my>0 z9N|PHh7F7*WCV9~fDx4#!@#H@Be?Mc3|nHvfw7E?pgsl|LlVOQ#tJfmG8$kEON4?Ob2gXOpkn1!n zF&2Qafeg7$a}whXU{sMI*J)m2Tn9!C8FHPDN{k!8aDlNT*J(jwybX*xGUPfPlNj#; zqk#;$PRAw2`@q;lhFqr;5@Qh<_mCmi>7>Lc0b>gpa-B{|j3r<+ks;UVw8U5j#(iYS zbvh$4R)O&`GUPg)l^E;5*hYq2r*jhH7BE`CsK|9XFEMTdV+R>>ofaj=U1016jHbQa zZ|&MU?UGyC>^C26>UlCw((iNL^yd@xwS9%*uGjIX+4E7s=`a*EA&9yzpv=BL>b^d! z;M>Dcx*0*%TLR1M_Qe2sgw zuGMz>*U{VSM1OVK`bIrgpV6n%5Wh`pclJiNzjjXYNjur=DSdC0 z*|uoAtnw+n--+nU69!QVDk`70Q@x(0bPml6BArDOGiJ=sqp4x2Gl}odrJmBv4I-Tx zPNjxXACac|nH1{G@F-C~GdzQ+(wX7ZsL75IyIa=REVI2O9LG z5Iu{`v&cM)+>=7%S;%(XT2)=ruY$^Mn18I)v24YhCqJZBgnpoC>FJgAJ=IH!{$Kh_ zw%7YlKbFzbTci;yMgP^zLjQ(o>CvdA&fbF@fA~a?>BWz(R(k(a75DbrZ54O-I@_wS zndt6%u6=f--1t3Wp32T9=2Xp{w>aK{BrQ5`rDnqzBoH_Y?`n{pK!6ZGiJX&Ncr-p@Iklk zwd{*)=4}34`{QqK<=fUz6aTcPes^0JiSw`2WiD!2dPOg~T6U-5K?~&iFS>MFSaC|P zT_67*(A6n!TwNNyMZcity;&{xa8bWwyw|9A@x5GGw^HEFlh__VVmr?J;S@^6vl`n?la>}@kDbINPK+mQkX*@?5QvgZB`Ty+ zA*ERq=#EBW9i&M78%V6!v17rS4gUZ;%(-)ClHYO9NEy$Wd(SuX%^YWrr|CEMr>B&P zoiz5mZGWZlN!MGU#ZpS?ZT*>lwrAZR_>DpTc;0heH#yjDH?wuG+ooVmB?ougO=ZR^ z(wNmhUZA|HH0H$2U`-s1o55@1plt?M#lbN%cwHPEH-l^9V4{C~)7$Grmc7ol>sBhE zWpd#4{KC95^E{>WrAev0Qa_9<%eq9-6S@lPn+M*e0e{@;+@&j2rCfi%?xZQ%t6K(9 zaB>C_OU;Ivb^Bf~y0|;Ly*)}@y*TW7=EcDs6$=mUA|kv89H9^U3L>U15S0+o&}R|e zDvoes62k^Y6&c|j9bv>J#yBu)$Ov!z2*Z{bNnl(zR@(?8Au)2mSVP9TDXbAjQexzRv5t%zA|oX+iom!5j7s?B7 |Vw8Y!6B%Ne z@-InL>eIk@9~p9;W~B3&1;#C8$aR{P81ulmjSRU?a}r|_7#|=*uG0yLu?&n4ks;S< zUSg~OV*?p-ofagz}P{CT&GJC<0ddVz^KV}x-2nn0b>^#a-EhX#s|RI3mLn= zbiH z3nQIH6LV%P$fK!Is56Nl%%v{L%nc)*8BL`YNFR}=2ALG<%;+fbATv6HxYC)?)VRr{ zsX-=%I+M;QIEo!)MrU9LnbA~gnL^7TlS1?yW1eF{X5=|$GNY5H5Ix74CpD#XKG9Ta zvCxx3^h_|%1oKRAPYTg9$vl(HlUg$Lq!2w*%#+$_bM=BtlH#5eqNl?=9p*_b9C}iS zo@wTpW}a#8Ng;Y>m}iE0Qp<;)6ryLAd1jesmU~i&o;l{3W1iF^q9=vuIl(+9nCArd zq!2yn=ZvZGpo;U%lUhpjq!2v|%(K8e3*3`J^ei&ZBJ-pc6g??K&q?Mv$vh{yCxz%) zVxA@DNi8dSQiz`PW0|f{^dDl1c}{Up3ej_#c}_D=YH`t%LiC(ro-@pIhI>+op7i4q z?&mD?q?Q;xDMZgX<~hea=eQ?@=sC|k=b0z9(CA4adM+@}1?IWHJt;)bMdrE4JgMbI zPYTgLGEjoHqh@NHUS!SMP?n$BX>>syneJjn+H~mod+|Ba` zahG08=+n|-V-3|vVb!C&QW*tS%nQQL+SSg z$a+IynSGoUHoBZe?+uW3MPQkIA*+-hc#XO`qyM2Qzd-$9U!Fws%AgYI@7Sl8%-Q_0_WR%d>NlMqXa4ET{pNK}Qzu`lvqIdm^om||b?jctXVs`* zbm^L_IqoahC%6Z6b;=tTmqu^V^Txb4Yb5Sp)$bU$TFrqear1()q8m?o!I-6ikZ@GArKLgZ-hS$l4j!E5Po6$-bien!d(dk*NB!eD My@B5+&m2qr5A>`*Jpcdz diff --git a/tests/data/acpi/x86/microvm/DSDT.pcie b/tests/data/acpi/x86/microvm/DSDT.pcie index 765f14ef3d1e54d3cadccbf0a880f8adb73b3f1f..8eacd21d6ecdf9a3cd3e4f03cf1b40748dcbf53e 100644 GIT binary patch literal 3023 zcmZvezi%T&6vyA%>v%o>k+tK*aeg^mi$LpG(a|8Cy>=2KJ6XKW1>uwSBn09}6A6R_ zC!~<#fOMQCY9r+jprt#Bii+zfD7c1(hLWq!eBVwsnkTZ7XXiWf-rM(iv$LLV*d70t zCrb4?NB%*$-FYwYw{clS#C^WI{hy<-6HPAO+&l62oamt6Exy|u9($g*LrxTq+bZuw z{wORLmD;!5jGM6vU(n=Y$3Gf2WBWq;dB$?0<9-({J1lAkR~7fIm+6;ja_+dqK7)n* zUN_PYY5PIn^O`L@1fE4qpvTWCsr+{fl(urn4o>I2QE#6LM6*}Qo_w8W>G#6kV7s~* z_3n>zXDlAh-09=*;4tuf&)3gFA|3nw$h)iO28W{~(C+F< zl|>eQ8zh{|nyNj?kwvASUQvn&d0AFX=XKGy2XHgv?_I}tqTq(ZvXDABOtxgKx)6n< z(3UAijVTLN+5=xKVgnEaw+PNhwm6EYax5Uz8GFI!hSZNt+@s?P6>?T%c z8u)#qT5azwt_fD2f!iLx2O$>Pi8`G_w0I|YWIQT2)J8x)_31;}CJ(9xT5G|?{?ZSMH&7keB6??(3q~~Hk zm?n}v5kI!Yi=l0=6?-P8{6cEe*b|aHkxguyjy;nM(!`#K8k?rICrlH`p2#Tnv}4aC z13UIiOl|F%BoAqFW&~#@_DoDO+A~QW(&StaoY)G;Cox@+oRB7GR&ZtoXI64Tnw*Z{ zbOfg(IU!9>d_IgyV-xG@#l_4?PDqne2~H(AmE?ppIq|L4HHp_KFF5m(6Vl|wM*^P7 zdKLs{L2^QxoY?;cXHjq#B`2iGiQTSi5@%ZyoF&N#X>ww38=Q-Rb5U|anw+lSbOom? zIU!BXvfwNW&a&i$G&w7Rvm!Vvk`vP8ToRm1f^$i7LYkaa!C4iYRmllyaxM$bWx=^D zIU!BX6~Vb8I9DVmq{)fDG-Ew$g0m($Ax+Lz!MQ3pS0yK;$ypbib-`JeoRB8xn&4a$ zoNJO3(&Sthoa=&fU2;O2oEw63LvU_LPDqn;Q*dqy&P~Y)X>x7}&Mm>YB{?BY&W7M@ z2+oG&gw&kXLgaVabj8P&7y7hvm{IS4Tci{Z5zV==zQMav;DaMy&*t;_pSnxim#-T$ zdKxV(@NX=ydyqI0g~vfajz1m^sJfSnjzZtQJSD$-(wrS+ryrM>lsg&z(fYTsaqowd z&)U!4{{5rNQ)R%aKJS#J6XU6s?8#SM;? wLwnQhprDg6jOkcjLl0lI!ET5BLPM8&$Hl!oN2C2j(D$9{>OV literal 3023 zcmZveJ!~UI6vyA%>v%o>$oeDSAI{O94y|oPM}ri5?IcEVvUr^f!bp1(0&%2?1VVxn zQb=(?IxZ5mks@kZx|67=xDF%=uA!l!R7|2Yaf(fI83?IVBNiFW(l;@iE!q33x`a-wk5R(U7# zhhe#>)Q;t5+>BNDoW^HO|6tIF?F;Rv8OwEG&!+J8}IFc;9QWLkS6D%;9L}( zi;@%470C%{a;^%_Rl&I`IU!BXHNm+i zIM*a6q{+E1IM)T|y5xj3IqQP6E;#Fw6H;@I&-ylRK`%eizPEk-Ar7vO8kU8<3P%n7 z$=An^WUMw5g~QOg3Z>6G@%Q~Y6iy0eC~RIgLg}&VP;YTo%~xclQZg2{vm3GWn2gnW zRjjm(g$?dTEIoD=t5%5oPMa>d7SD7k_A~0;Z;F)SA)+Za*4OxF75L!D*OTdV`j_s~ z#`$eyMo*)K1)R^pMFFq<)l{+5%+4`@( zy7m3hr|l(&$ue6&cA#&E__kAKCb&7oWsqilC>4iIP^boV5A=a diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 9282ea0fb2..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,7 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/DSDT", -"tests/data/acpi/aarch64/virt/DSDT.memhp", -"tests/data/acpi/aarch64/virt/DSDT.topology", -"tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt", -"tests/data/acpi/aarch64/virt/DSDT.pxb", -"tests/data/acpi/x86/microvm/DSDT.pcie", From patchwork Mon Jul 8 11:47:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=mbfaaYDB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj8b0BHgz1xr9 for ; Mon, 8 Jul 2024 21:49:34 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmqz-0002c5-Iz; Mon, 08 Jul 2024 07:48:21 -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 1sQmqx-0002SK-6A for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:19 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqs-00011C-Kw for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:18 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-70b04cb28acso2436630b3a.0 for ; Mon, 08 Jul 2024 04:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439292; x=1721044092; 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=4vibiRM2Ycijj39xNhYMRluwpiZKY+DashjwuFIx1pE=; b=mbfaaYDBucueC15Jq1E/PJfaB3XGgprjChqHc7XUWIaTd3gMg6Up94gtPORTHQCD/c CpkH1TPYX3NztBqa79U39cP66nVotnmrcxvwpPyyuVr7UvzNWBeEHCPunNTBfBRkilmE aIE4VtZW00ayon5foPy9LmjTeUI1LRNDkom5O3MHDOyu2eQBx+z5qFCYTuysGlqWQYl3 EYWqTVxYxepRor85bzl7nC4RDeQaRRX71wjg3QXffYee5ar7ubPmtJXVsGQtjaWWJPFi vdVPaPo5X0bW/LdaigUCLKn5TqY9Bpr43+8fSihAPc848bipYjMZ9/BCzrQnu4V7R5nX AseQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439292; x=1721044092; 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=4vibiRM2Ycijj39xNhYMRluwpiZKY+DashjwuFIx1pE=; b=FAg6vrf0tTXEwEwZ+Vg8e9vSgJ5U3uUtz9Vn7+u6mogUzITpziUDRSgU/IF5juyswb Uso9imY5/AHh+TXb588aq9JwshI7Sw1ELrNYrXKwHTXR1EXkjYz3Jd49wc3lUVoFTlpN Xb3/LO4YOC9GcaI1+TNprL4KhCrvCTpQTcNuzMEK14Wc9MOMx5IYcQG+/fw+PgVaQwTh dY9LC+S/k/J73hW05a9Crl9SfsCdc6sXxmIPBdqGk1gvvSsjUuCOeMmQ1RaaVz2Pfmnl Lj4jakdCDL97oejMvHBjcMl8qxNgE4Lu+/09a6pwlcS0pnt38Kc/7gh6Cq7z3bAR7+qM /q0Q== X-Gm-Message-State: AOJu0YylmjEg4v4ROGzweyZamOEfawN+jP19yzgQUF042uXMUf0b48eU /bfc0hrErRBgMZDCdlXdHaIuKEv11jiAOO7U8OzWHVTdC5sw6NTlaDOCmPTMKaGcDImvKcAc+oK J X-Google-Smtp-Source: AGHT+IEOWb8i779e6ujRsvtbNIOuwfeLh54eaHFi0UPEGCuVJS0veX3Zkjs45LIjX0COOcLyNwb0xg== X-Received: by 2002:a05:6a00:17a7:b0:706:738b:2c3 with SMTP id d2e1a72fcca58-70b019a52c2mr17200162b3a.2.1720439292443; Mon, 08 Jul 2024 04:48:12 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:11 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 6/9] tests/qtest/bios-tables-test.c: Remove the fall back path Date: Mon, 8 Jul 2024 17:17:38 +0530 Message-ID: <20240708114741.3499585-7-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x429.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The expected ACPI AML files are moved now under ${arch}/{machine} path. Hence, there is no need to search in old path which didn't have ${arch}. Remove the code which searches for the expected AML files under old path as well. Suggested-by: Igor Mammedov Signed-off-by: Sunil V L Acked-by: Alistair Francis Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index f4c4704bab..498e0e35d9 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -267,15 +267,6 @@ static void dump_aml_files(test_data *data, bool rebuild) data->arch, data->machine, sdt->aml, ext); - /* - * To keep test cases not failing before the DATA files are moved to - * ${arch}/${machine} folder, add this check as well. - */ - if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) { - aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, - data->machine, sdt->aml, ext); - } - if (!g_file_test(aml_file, G_FILE_TEST_EXISTS) && sdt->aml_len == exp_sdt->aml_len && !memcmp(sdt->aml, exp_sdt->aml, sdt->aml_len)) { @@ -412,11 +403,6 @@ static GArray *load_expected_aml(test_data *data) try_again: aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, data->arch, data->machine, sdt->aml, ext); - if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) { - aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine, - sdt->aml, ext); - } - if (verbosity_level >= 2) { fprintf(stderr, "Looking for expected file '%s'\n", aml_file); } From patchwork Mon Jul 8 11:47:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=Hv7sfqND; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9J5yCLz1xrP for ; Mon, 8 Jul 2024 21:50:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmr0-0002or-Es; Mon, 08 Jul 2024 07:48:22 -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 1sQmqy-0002bC-Dh for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:20 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmqw-00011S-OL for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:20 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-7201cb6cae1so1766469a12.2 for ; Mon, 08 Jul 2024 04:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439296; x=1721044096; 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=XZLIH3mFjpLuh9fKHfryw3QA5aXbXOhCFMCJ9YY9hgg=; b=Hv7sfqNDtERx+3RApek/E+Ge6x8PSH57vkODo8yzOJQ1wSGWdn/k4iDGm/VshLI2ng otgLMdkRw+y16yO296z1vFcEq9VXScm95kDYqadb/o6QrdUK0aMTrwAYLom8lyy675SX jJcmEUsGqfyJ7FSZKqVqYc7kGt7DHRqj2iGVD8Iq4dCgUz83cooSA4rwydwI9hI70Yoh fjso/2c4UuJ7hBbGmBFIoaLcY3IPwedJdG6iHTx0JPaU4LuR2lriv+dzvDuC01xbeAis TNhw/QHIlR3nUdcjr/Fr89+vkFxqUwi6ojyEqYgE7Ea0yjCZQZEJO3H0hb9WbM9NDcEB KK/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439296; x=1721044096; 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=XZLIH3mFjpLuh9fKHfryw3QA5aXbXOhCFMCJ9YY9hgg=; b=s1Su6xVWfO/Gk158GH+LJHAWHmL4guBlA6LJnTB/DaKiK5DppaGFnbBNTgE0tLJy0w 2Bac9eI2X06eo4c6rpsFISSXLptJLoY2Tf9HLtVVNLJ1XuFzc+VNsoPxaCNzd2WuqV7u UvcLiXN4QwU2m6QjLk2DAKeJU0fzclNndpy40BFIUXBNrCzNWPrB2sUBU/KIVbql2/zc gCqVy7zJ8voHQTPTHU7ACrVZRTMfvPuQmOgbdwv6cfi8jXs/Yg+HWzUIIxR73dHoY3u3 ZKalxVdycyybSU/0J3HCZTUen02PaKd1awS1IO0jXjWryK7OLZMIoH68hMOZodK0YW6M fZ8w== X-Gm-Message-State: AOJu0YzXn9NYCUO0EvdRiXVnycVm72KDrDqJHQXgshphYuK6987zgVQG rmhzZEEg++hdcC/W+hmhJ564I3pGOdN89rSpMCGnPjvv0sC/M28ywGsN6mymGp6jB5zXvEmUgsW U X-Google-Smtp-Source: AGHT+IHdFdG+XqRMUqAjjg0IaygwKlzNcSPpLOFDo6nxWgmLJHIRIvI+qM5vkts6luHjZqldXZqn1w== X-Received: by 2002:a05:6a20:3945:b0:1c2:8919:b935 with SMTP id adf61e73a8af0-1c28919bc46mr1636180637.34.1720439296288; Mon, 08 Jul 2024 04:48:16 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:15 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 7/9] tests/acpi: Add empty ACPI data files for RISC-V Date: Mon, 8 Jul 2024 17:17:39 +0530 Message-ID: <20240708114741.3499585-8-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=sunilvl@ventanamicro.com; helo=mail-pg1-x529.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As per process documented (steps 1-3) in bios-tables-test.c, add empty AML data files for RISC-V ACPI tables and add the entries in bios-tables-test-allowed-diff.h. Signed-off-by: Sunil V L Acked-by: Alistair Francis Reviewed-by: Igor Mammedov --- tests/data/acpi/riscv64/virt/APIC | 0 tests/data/acpi/riscv64/virt/DSDT | 0 tests/data/acpi/riscv64/virt/FACP | 0 tests/data/acpi/riscv64/virt/MCFG | 0 tests/data/acpi/riscv64/virt/RHCT | 0 tests/data/acpi/riscv64/virt/SPCR | 0 tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 7 files changed, 6 insertions(+) create mode 100644 tests/data/acpi/riscv64/virt/APIC create mode 100644 tests/data/acpi/riscv64/virt/DSDT create mode 100644 tests/data/acpi/riscv64/virt/FACP create mode 100644 tests/data/acpi/riscv64/virt/MCFG create mode 100644 tests/data/acpi/riscv64/virt/RHCT create mode 100644 tests/data/acpi/riscv64/virt/SPCR diff --git a/tests/data/acpi/riscv64/virt/APIC b/tests/data/acpi/riscv64/virt/APIC new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/DSDT b/tests/data/acpi/riscv64/virt/DSDT new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/FACP b/tests/data/acpi/riscv64/virt/FACP new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/MCFG b/tests/data/acpi/riscv64/virt/MCFG new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/RHCT b/tests/data/acpi/riscv64/virt/RHCT new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR 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..70474a097f 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,7 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/APIC", +"tests/data/acpi/riscv64/virt/DSDT", +"tests/data/acpi/riscv64/virt/FACP", +"tests/data/acpi/riscv64/virt/MCFG", +"tests/data/acpi/riscv64/virt/RHCT", +"tests/data/acpi/riscv64/virt/SPCR", From patchwork Mon Jul 8 11:47:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957923 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=Vg786pNW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj9K3GJFz1yNs for ; Mon, 8 Jul 2024 21:50:13 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmr4-0003Fa-Mk; Mon, 08 Jul 2024 07:48:26 -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 1sQmr3-00039B-5j for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:25 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmr1-00012B-Jz for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:24 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-70af5fbf0d5so2311947b3a.1 for ; Mon, 08 Jul 2024 04:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439300; x=1721044100; 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=/4tYSD3kmwvsTXZv9JDOMjH919bSCwsQC+O4tYKQ71A=; b=Vg786pNWngVFGMDBQ/xRkpOrYMZOeAqkk1QhV415QkEolIJlF4WYR1cgobWsMEaTGJ XKackv6H2z2CwPLfcn08MTbHnNMm/gcga1SGLkWF/XvgrIdbkMiB8rt/fpgss1CRcogQ 5TiMeqLQtu7LmrLOfk1Y/vejuOH+GJc9+x5adk9E6HKN2CxSAH2de92G5UJxe01sONYs VF2OCTnrJg5SO6YtvTVrTIl5yuLR0rLC7skUlECRpeUJvcfsV1M4gx6lwdPEzgFgehpL YDjOOKS+vrXGAgtFXOrEZKwhZdbr7ukxDbD3sUzXzYfMTCI6SS/y8zpvK7pnCPqwGnVJ hMPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439300; x=1721044100; 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=/4tYSD3kmwvsTXZv9JDOMjH919bSCwsQC+O4tYKQ71A=; b=qFePtf/J5oeOqa2OAFylHKEl1jIizAllF+s6i+aKdAzv7Ony8y0s+Z0vwnmQOrKUtm Bpx6F9pfMlspP/cJ//49rja3dCcz44g3slP0wF0tMHU9ReKuQysErl+LyQRLhVbnGDk8 vpb5imYvXqJsECiqoOJwi3JnWgjbGjQ+AJHC9X07CC8UMNCGAHaeJMlr5l1wBP69FSjv m+XCzsCP0ANWMpV0m4EIEg0K76PQEAk79keyDcBcb/r/HeTZW5HHaBETLBxC6ikj/+rQ s2wyh6NqTyFmPE9RJ4iKOAMVFA8dqpKm5RyDLo1iSdHeOJ53yUr+r5B2KSmFjmlze4sT gGRQ== X-Gm-Message-State: AOJu0Yzn9fGZpPzGV6H2II30B8xy8uyiP9QkGpTG0xu/RS3ewFLrElfy zylQTCwvHTkfnQqtupQKktBMjXke55XdomrnqXTl9cZiQ7jXVnNiY3voL+S/enZC3/iMHTeMPjk N X-Google-Smtp-Source: AGHT+IE9rYOSRhcQc5gSdZdcKWqO1Ojiayn5hxBBIXlBfNmQ2DHE4H3txR8hEwR/rOVNjm6NvlrT4A== X-Received: by 2002:a05:6a00:4b01:b0:706:1f67:64d3 with SMTP id d2e1a72fcca58-70b01b66715mr18830017b3a.14.1720439300155; Mon, 08 Jul 2024 04:48:20 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:19 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 8/9] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V Date: Mon, 8 Jul 2024 17:17:40 +0530 Message-ID: <20240708114741.3499585-9-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x433.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add basic ACPI table test case for RISC-V. Signed-off-by: Sunil V L Reviewed-by: Alistair Francis Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 498e0e35d9..36e5c0adde 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1963,6 +1963,28 @@ static void test_acpi_microvm_acpi_erst(void) } #endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg(void) +{ + test_data data = { + .machine = "virt", + .arch = "riscv64", + .tcg_only = true, + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .cd = "tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2", + .ram_start = 0x80000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + /* + * RHCT will have ISA string encoded. To reduce the effort + * of updating expected AML file for any new default ISA extension, + * use the profile rva22s64. + */ + test_acpi_one("-cpu rva22s64 ", &data); + free_test_data(&data); +} + static void test_acpi_aarch64_virt_tcg(void) { test_data data = { @@ -2441,6 +2463,10 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); } } + } else if (strcmp(arch, "riscv64") == 0) { + if (has_tcg && qtest_has_device("virtio-blk-pci")) { + qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); + } } ret = g_test_run(); boot_sector_cleanup(disk); From patchwork Mon Jul 8 11:47:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 1957916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=V72IjQYY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WHj826q0tz1xr9 for ; Mon, 8 Jul 2024 21:49:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmr9-0003df-IG; Mon, 08 Jul 2024 07:48:31 -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 1sQmr5-0003MG-Lk for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:29 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQmr3-00012c-Pv for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:48:27 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-70b31272a04so485567b3a.1 for ; Mon, 08 Jul 2024 04:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1720439304; x=1721044104; 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=dq7QFPQUVP3Ynbd/KPSkrs4w0szD0VlYjXKC1M1eAR0=; b=V72IjQYYIMdnGiKf19tPZbsPg7PK92UZRM+yjJ/hx9lu7ELtnulyg9XFwVotqr4VSm LhhtkKCwnF7zpoqKZbfaE/MhfD2g6veMtIIk97YMwNApczltiR5pZR+s88jomAlk8zA5 LQ3lES9Meegj50Qx3Q4mYSo7S33niT5dYWQD6smOPHtMOrcbS0lv8b88Wxc9deAW5jdL w40N9S7+p+HkLQKwa+a9iFJu+HIOuhLAAKPDzCO2aCe1CNToehZG+GRW97daHRMgrVYk uoVtPbT15AZgXDTl3p7rJkOVZGJNlTA6flLtWG8yGXgOjspvmnPCH06Snv/hyPoUQiyy LRgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720439304; x=1721044104; 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=dq7QFPQUVP3Ynbd/KPSkrs4w0szD0VlYjXKC1M1eAR0=; b=hq75GawgNngU6pfQAn3URmHzGGT9ggEUYhlA3hofrUTZW+46pOFAOQt469iSyveDVl BRNwC6dZgYUGZ65VSIYBW9MJ9nesVeh+163kB+BwCzfRiSwJQcVWOhZbZlWXKfgwl80n dsUlSp8KorpeY5SatDcNbICrVxcl5bbZ8S/orhSlRZNTj9IYoTHK7ge/HzLpC40Hc9Cn mlHbhYbELR6sLp8wmj6HguA3xf4fTlWidJ1nbsLX0Ac/AISH2MLKn5QW5YZ3LT7tSxF6 TMmrt2GM7tfRfW7+N1yazcxCGMDMYIjEA6TxwwSsU4y/nvmk7LPb2eVjJsl3PmqORspT 4fJw== X-Gm-Message-State: AOJu0YzX1yP8ICStq/HvbyQETSU7X/4qeJHydOKDBDeCSyXkiZWwjuqy yZLZ2Ggm+iRccErNLbW3K/LgGm6J8KswM4QVi8xWMaAZ2cmy9jHRi1NBFNGFmLWTP+qkyW3tNA6 z X-Google-Smtp-Source: AGHT+IEd8kQsvDB5p/my69jTvkE3HMxZNWrvSKVuUuwnOCcnP8iewddoo3afpJRNvTOPLmxM5Fg7IA== X-Received: by 2002:a05:6a20:7f8d:b0:1be:c41d:b6b7 with SMTP id adf61e73a8af0-1c0cd1e19a3mr15927043637.19.1720439304069; Mon, 08 Jul 2024 04:48:24 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2a432ac6sm2769642b3a.94.2024.07.08.04.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 04:48:23 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Sunil V L Subject: [PATCH v2 9/9] tests/acpi: Add expected ACPI AML files for RISC-V Date: Mon, 8 Jul 2024 17:17:41 +0530 Message-ID: <20240708114741.3499585-10-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708114741.3499585-1-sunilvl@ventanamicro.com> References: <20240708114741.3499585-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x42a.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As per the step 5 in the process documented in bios-tables-test.c, generate the expected ACPI AML data files for RISC-V using the rebuild-expected-aml.sh script and update the bios-tables-test-allowed-diff.h. These are all new files being added for the first time. Hence, iASL diff output is not added. Signed-off-by: Sunil V L Acked-by: Alistair Francis Acked-by: Igor Mammedov --- tests/data/acpi/riscv64/virt/APIC | Bin 0 -> 116 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 0 -> 3576 bytes tests/data/acpi/riscv64/virt/FACP | Bin 0 -> 276 bytes tests/data/acpi/riscv64/virt/MCFG | Bin 0 -> 60 bytes tests/data/acpi/riscv64/virt/RHCT | Bin 0 -> 332 bytes tests/data/acpi/riscv64/virt/SPCR | Bin 0 -> 80 bytes tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 7 files changed, 6 deletions(-) diff --git a/tests/data/acpi/riscv64/virt/APIC b/tests/data/acpi/riscv64/virt/APIC index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..66a25dfd2d6ea2b607c024722b2eab95873a01e9 100644 GIT binary patch literal 116 zcmZ<^@N_O=U|?X|;^gn_5v<@85#X!<1dKp25F13pfP@Mo12P{Zj?R|`s)2!c7=s}J I#NvT*0o0BN0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/riscv64/virt/DSDT b/tests/data/acpi/riscv64/virt/DSDT index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6a33f5647ddd6de3a0f000f718b58f6fff44f0fd 100644 GIT binary patch literal 3576 zcmZvfO>Y}j6o&8Elh_%5#CDu-Cr+Uf3sh+w6Os)g_Bd%=*~#E>8YCmRQk04kR6;38 z1tF>|_=woFL2TFrkzaw3Kw`y?9SFpd4SxW3<~{d%%sFI6^31%~=e+kk*Z0mHH-bj@ zpNvwm2lYK~Cs?V!>U%3VETt6P(>3S)@mfEq_j{*1w&%KTvcJ=8WNMz@gjiR}{(iH8 zbGz2fKj&PZyKX7U;>Z7W?{s7Pz}q%PuWYsVVYCX1pj&fN$-d{+ESx(*KJR2do*=ti zZVrZzRPS`Xi5g61C-80~vob2-W>CkyNK|R1?&w4>;qA3$W_6TFISbCL=}hIQ%g@G@ zWjVUnWWNzK3ahdFl#?s|I{59|`=7VZo_zP!_qV>W3X4`@E|xib^R2_<8+RWZz5VXd z{liD-c5?&O*6iDzu-w*eXAkAB{nzP;GweEtu5-h#Y0wB*TT~3Ow4gz{VzI(3Vnd5M zRk0dn;l!dmT;>ty9@R*Xc$CK`^RT(c3y~gnl!wne#<<5?q{mp4#~tP|&OKg?^cauw zIAIK0WsoGrqNCJXm^Cc?|KNw49okzSZI-0Rs0FVi;iYJK5* zO*UFJcY{_to<-zbb7?gPTQ_m8*LO$b7<4=NvQzSvr<&?Wttc0t2JYTd_tYV-icIt} z@;lwB);rGQLds4J28wM<p$GlFwQaL!0hNX|JcIA;attmK5`oOrQgzvrCboRgf8oO51q&I`_Y z$qC6h7X;^m;9QWLkeqW-a4rhYMac=tIZJ}GBsfcw6OwZ-3C<4`(C}KF7YH%*r(}jWhdc0{4}Ft)TGpaPSz)wD{1VN`q&%{ z1|Nm@_{K`p3#UG?1=9g-sk7%$sG9DR90!PI_v{B_o}QzwM|dBbPf<_=zP8dH)RXFi+dCw;Qyc2X#oHL literal 0 HcmV?d00001 diff --git a/tests/data/acpi/riscv64/virt/SPCR b/tests/data/acpi/riscv64/virt/SPCR index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4da9daf65f71a13ac2b488d4e9728f194b569a43 100644 GIT binary patch literal 80 zcmWFza1IJ!U|?X{>E!S15v<@85#X!<1dKp25F12;fdT`FDF9*%FmM4$c8~z`e;@#f G!2kgKJqrN< 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 70474a097f..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,7 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/riscv64/virt/APIC", -"tests/data/acpi/riscv64/virt/DSDT", -"tests/data/acpi/riscv64/virt/FACP", -"tests/data/acpi/riscv64/virt/MCFG", -"tests/data/acpi/riscv64/virt/RHCT", -"tests/data/acpi/riscv64/virt/SPCR",