Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD806C3DA4B for ; Mon, 15 Jul 2024 17:12:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTPEy-0005D8-M4; Mon, 15 Jul 2024 13:11:56 -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 1sTPEx-000575-8Y for qemu-riscv@nongnu.org; Mon, 15 Jul 2024 13:11:55 -0400 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sTPEv-0007Lv-3f for qemu-riscv@nongnu.org; Mon, 15 Jul 2024 13:11:54 -0400 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-25e00f348e6so2570895fac.1 for ; Mon, 15 Jul 2024 10:11:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1721063511; x=1721668311; 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=LsTPK9gu7Y7sN5IwpWcQvzEP0O1X5VjGLs177fAzIU0=; b=HJSn68JhJxwnmorusvKsvfHfemrtL0Xtq5liZUQpMXgXivzGjhisyZv11zGOKQ1f5a gg2XKyS3MveEUIArBFo5U1ASmzIU8kHR79LkseBfsqYxQuhDqc8JO1aC/Ch8UAYFdvvy VHpKeUjhR2VywZGNW6bvUjn+qQWRU1m+9nHPRD2Qjdf3c+pSF2HvB1Toviohp6rcmElN 3SllywEL34YGEe7+OP2JP4azl3dHlps568u+YNNMsj9GiQeEE1t8blLD13WCa9/OPgfJ TBAboiybjOlicVCCr4K+nmYnjLVmpuc9wZJVM+ATlO59eaBueSm0v04qg9B9vLMKbZxt a//w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721063511; x=1721668311; 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=LsTPK9gu7Y7sN5IwpWcQvzEP0O1X5VjGLs177fAzIU0=; b=LrohRpw7IZ3Mp9S0ovhh9g1225WJeITURT8BXj59S5kiN1+W2vvIaqrNgyfz1EIA3/ oHAqWhwdzjDnDKnjC8Yu3imeSTTFPmL1Q05PYAc62JtAeloTIYE7BiDvUBfbjrTt6/Zz N4YaIluB24Ek9sVN+AcHVamrQSOYu3T/N0Xrt5V5qaQcFQPcHTSBprPVGW3yKZKa0u4D Kv/QjGoQqCFQc0ROIGnhYJEoEAIV8+jOJljwAzIWXjpZvO0t9fJLQ1PHxGrWrJ4seffR NqcNcq2Yj9l7xzyQQHR23UMjxoaIHtNpFvYcM6j3Cj0FTbGTsN0ZE+xFc/CEG5aK/oiO nnGQ== X-Forwarded-Encrypted: i=1; AJvYcCWah+2vWLu6k90LwaxgW24Y2s/YSQN8jWs0fB4i7NdXwUB/3ou3/LpCSpRCA61yBuCaQkMmfPMY+EhzUdumf7DnyYTpHSQ= X-Gm-Message-State: AOJu0Yz5fBBZ4ctBI7Gikgd+1pZ10MOJVBgNFO0ZRU0cEa1PT+5aIg80 zn5T1HTUmtvsmKz/BmOlyHihZqfIczbd7lgSVB7jPHizMYMIVzhl0JX5r4a0eyA= X-Google-Smtp-Source: AGHT+IHWtnAIPWySla0d9Y3xTdhOD673DZnFPfy1LG8pPLWsFLjmT5TBN0JyR1pasjFrv957t7P+IQ== X-Received: by 2002:a05:6870:c110:b0:254:a89e:acc1 with SMTP id 586e51a60fabf-25eae832650mr15902283fac.28.1721063511477; Mon, 15 Jul 2024 10:11:51 -0700 (PDT) Received: from sunil-pc.tail07344b.ts.net ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7eca85ccsm4752618b3a.178.2024.07.15.10.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 10:11:50 -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 v3 4/9] acpi/gpex: Create PCI link devices outside PCI root bridge Date: Mon, 15 Jul 2024 22:41:24 +0530 Message-ID: <20240715171129.1168896-5-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240715171129.1168896-1-sunilvl@ventanamicro.com> References: <20240715171129.1168896-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4860:4864:20::30; envelope-from=sunilvl@ventanamicro.com; helo=mail-oa1-x30.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-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.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..391fabb8a8 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%X", 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%X", 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))); -- 2.43.0