From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182701; cv=none; d=zohomail.com; s=zohoarc; b=jA6pG4WSxJVSxxuYQlrd+4iHKLB3C1vy26jeEP+ZIKHmobiT9zmZZ1RK+aN9E2PiGD+P7F3oHnhcY6SHb4sQlEU/J6QUTk3iFrnc+WZXmUH0srDb+xSfDq6aMCB8Aad8ql1+MHwfQU2sZ2syeR804roIY6pE4pKUHzOf8Awzx4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182701; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v6XMDCYt94mF76Zx8dVfb9niwUZxkL4xtAl2xsI0yz8=; b=TVtMVvW4QXLn4iWYZn5ROCpOV8UoZTzgSVf6lXUrVOiRVxyesRsSqBIYC+M1sxFzndqlg/qmz+jeA3qRteXVAJm+GKhAc1boX5umlZcVQ6ChZtqqa9HX4MWjOow/0JU3wqpuKCWyodqewXrtmiFk2P/+oOeCGx4ruQjHrbOyzwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788182701283557.6279425466195; Mon, 31 Aug 2026 06:25:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zp-0001v3-T0; Mon, 31 Aug 2026 09:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zm-0001rv-0D; Mon, 31 Aug 2026 09:24:18 -0400 Received: from [115.124.30.101] (helo=out30-101.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zd-0006pQ-6f; Mon, 31 Aug 2026 09:24:17 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfpq_1788182632 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182634; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=v6XMDCYt94mF76Zx8dVfb9niwUZxkL4xtAl2xsI0yz8=; b=jrlybt3I+JssfTV0FZ2nd2DfpGPSRwF0XejVy47+YjnDo/jFtnV5x4N7El3ELWixxc3KQXOe3sZX5SvROxqeEhtto7loWPy8azc3NtXXOLUy9lqT4lb4Vkz3ipvOC7w1FEt7APWgatzchZPA5L4NTWIkLO7Wll+ddbBe9TXb+J8= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R101e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033045133197; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=19; SR=0; TI=SMTPD_---0X9znfpq_1788182632; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org Subject: [PATCH v5 1/6] hw/riscv/virt: Add CXL support to the RISC-V virt machine Date: Mon, 31 Aug 2026 21:23:32 +0800 Message-ID: <20260831132340.5345-2-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.101 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.101; envelope-from=cp0613@linux.alibaba.com; helo=out30-101.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182702352158500 Content-Type: text/plain; charset="utf-8" Enable CXL support on the RISC-V virt machine following the same approach used by the ARM virt machine: - Add PXB and ACPI_CXL Kconfig selections - Add CXLState and PCIBus pointer to RISCVVirtState - Register CXL machine properties via cxl_machine_init() - Create CXL host register region above the PCIe high MMIO region - Call cxl_hook_up_pxb_registers() and cxl_fmws_link_targets() at machine_done time - Map Fixed Memory Windows above the CXL host register region - Add ACPI0017 device in DSDT and build CEDT table in virt-acpi-build.c Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin Reviewed-by: Junjie Cao Tested-by: Junjie Cao --- hw/riscv/Kconfig | 2 ++ hw/riscv/virt-acpi-build.c | 20 ++++++++++++++++++++ hw/riscv/virt.c | 37 +++++++++++++++++++++++++++++++++++++ include/hw/riscv/virt.h | 3 +++ 4 files changed, 62 insertions(+) diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index de37c08cae..0ba3cd9e15 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -66,8 +66,10 @@ config RISCV_VIRT select VIRTIO_MMIO select FW_CFG_DMA select PLATFORM_BUS + select PXB select ACPI select ACPI_PCI + select ACPI_CXL =20 config SHAKTI_C bool diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 59c454f4f9..3188cdc5bf 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -29,12 +29,16 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/pci.h" #include "hw/acpi/utils.h" +#include "hw/acpi/cxl.h" #include "hw/intc/riscv_aclint.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/pci-host/gpex.h" +#include "hw/pci/pci_bus.h" #include "hw/riscv/virt.h" #include "hw/riscv/numa.h" #include "hw/virtio/virtio-acpi.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_host.h" #include "kvm/kvm_riscv.h" #include "migration/vmstate.h" #include "qapi/error.h" @@ -514,6 +518,17 @@ static void build_dsdt(GArray *table_data, acpi_dsdt_add_gpex_host(scope, PCIE_IRQ + s->num_sources * 2); } =20 + if (s->cxl_devices_state.is_enabled) { + Aml *cxl_dev =3D aml_device("CXLM"); + aml_append(cxl_dev, aml_name_decl("_HID", aml_string("ACPI0017"))); + Aml *method =3D aml_method("_STA", 0, AML_NOTSERIALIZED); + aml_append(method, aml_return(aml_int(0x0B))); + aml_append(cxl_dev, method); + build_cxl_dsm_method(cxl_dev); + + aml_append(scope, cxl_dev); + } + aml_append(dsdt, scope); =20 /* copy AML table into ACPI tables blob and patch header there */ @@ -921,6 +936,11 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBui= ldTables *tables) s->oem_table_id); } =20 + if (s->cxl_devices_state.is_enabled) { + cxl_build_cedt(table_offsets, tables_blob, tables->linker, + s->oem_id, s->oem_table_id, &s->cxl_devices_state); + } + if (ms->numa_state->num_nodes > 0) { acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, s); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 51bac47a91..e903551263 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -55,6 +55,8 @@ #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" #include "hw/display/ramfb.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_host.h" #include "hw/acpi/aml-build.h" #include "qapi/qapi-visit-common.h" #include "hw/virtio/virtio-iommu.h" @@ -1101,9 +1103,33 @@ static inline DeviceState *gpex_pcie_init(MemoryRegi= on *sys_mem, } =20 GPEX_HOST(dev)->gpex_cfg.bus =3D PCI_HOST_BRIDGE(dev)->bus; + s->pci_bus =3D PCI_HOST_BRIDGE(dev)->bus; return dev; } =20 +static void cxl_host_state_init(RISCVVirtState *s) +{ + MemoryRegion *sysmem =3D get_system_memory(); + MemoryRegion *mr =3D &s->cxl_devices_state.host_mr; + hwaddr base; + + if (!s->cxl_devices_state.is_enabled) { + return; + } + + base =3D virt_high_pcie_memmap.base + virt_high_pcie_memmap.size; + base =3D ROUND_UP(base, 64 * KiB); + + memory_region_init(mr, OBJECT(s), "cxl_host_reg", 64 * KiB * 16); + memory_region_add_subregion(sysmem, base, mr); + + /* Map the Fixed Memory Windows above the CXL host register region. */ + base +=3D memory_region_size(mr); + base =3D ROUND_UP(base, 256 * MiB); + cxl_fmws_set_memmap(base, UINT64_MAX); + cxl_fmws_update_mmio(); +} + static FWCfgState *create_fw_cfg(const MachineState *ms, hwaddr base) { FWCfgState *fw_cfg; @@ -1213,6 +1239,13 @@ static void virt_machine_done(Notifier *notifier, vo= id *data) BlockBackend *pflash_blk0; RISCVBootInfo boot_info; =20 + cxl_hook_up_pxb_registers(s->pci_bus, &s->cxl_devices_state, + &error_fatal); + + if (s->cxl_devices_state.is_enabled) { + cxl_fmws_link_targets(&error_fatal); + } + /* * An user provided dtb must include everything, including * dynamic sysbus devices. Our FDT needs to be finalized. @@ -1451,6 +1484,8 @@ static void virt_machine_init(MachineState *machine) ROUND_UP(virt_high_pcie_memmap.base, virt_high_pcie_memmap.siz= e); } =20 + cxl_host_state_init(s); + /* register system main memory (actual RAM) */ memory_region_add_subregion(system_memory, s->memmap[VIRT_DRAM].base, machine->ram); @@ -1558,6 +1593,8 @@ static void virt_machine_instance_init(Object *obj) s->acpi =3D ON_OFF_AUTO_AUTO; s->iommu_sys =3D ON_OFF_AUTO_AUTO; s->num_sources =3D VIRT_IRQCHIP_NUM_SOURCES; + + cxl_machine_init(obj, &s->cxl_devices_state); } =20 static char *virt_get_aia_guests(Object *obj, Error **errp) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 36a2def410..4cf930ab9f 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -24,6 +24,7 @@ #include "hw/core/sysbus.h" #include "hw/block/flash.h" #include "hw/intc/riscv_imsic.h" +#include "hw/cxl/cxl.h" =20 #define VIRT_CPUS_MAX_BITS 9 #define VIRT_CPUS_MAX (1 << VIRT_CPUS_MAX_BITS) @@ -65,6 +66,8 @@ struct RISCVVirtState { OnOffAuto iommu_sys; uint16_t pci_iommu_bdf; uint16_t num_sources; + CXLState cxl_devices_state; + PCIBus *pci_bus; }; =20 enum { --=20 2.50.1 From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182734; cv=none; d=zohomail.com; s=zohoarc; b=YaDpAtFoBe9lEE3rXPTbvzkxPlH3Xtm/hKSoX9mL/kEsxK3zbX56+do8DI75lGqUKnoFytko/p4C+fvvo8aZRSH7yvmxhwiuKXiK9m5FqBrdCVyALSraoQDgOLTYm3MiqIPuLp1eAniIkT4Eegp2KkPWSa8GbivpFhbGdPhN6mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182734; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0nmMw2Y8HdA9mlrvGNBXlhCXvv74hVwwPWH6o99skok=; b=fb7tBVssldjh604TUK3Q3iNGCwkr73OhsIpqH8b5Z3D1m3U8y3oT7/AHHSVEXr8bvHA61mMOXi46cQlcTyGGRNv31auP3iRZTJyBLTe8qLiVVMn1DG1l21ehK285terNbaR0+Fadf0ms87ChDoHpGAwGXAaj3WETrm2HwwwagoI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788182734445253.61108246828496; Mon, 31 Aug 2026 06:25:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zr-0001z5-HV; Mon, 31 Aug 2026 09:24:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zm-0001t0-Ur; Mon, 31 Aug 2026 09:24:19 -0400 Received: from [115.124.30.118] (helo=out30-118.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zc-0006pa-J0; Mon, 31 Aug 2026 09:24:18 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfq8_1788182633 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:54 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182635; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=0nmMw2Y8HdA9mlrvGNBXlhCXvv74hVwwPWH6o99skok=; b=iAS/LWyUx4Xrd2fes8bhzUpTSHkXN9O/sXQxGSIcZCL44s5pcRx2sjoRVSYpd2dqJSQ8kpCuIQBdRmHbEjku0G6/4LokZo2QYqXArO9/o7JC3yGZAdGDXT7U0Zbaz+MLbHVW7c6SsIFey+rWVPHWpG8T8k6HVrmHNFIGsPvW9B0= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R131e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037026112; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=20; SR=0; TI=SMTPD_---0X9znfq8_1788182633; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org, Sunil V L Subject: [PATCH v5 2/6] hw/riscv/virt-acpi-build: Add _DEP to ACPI0017 for CXL host bridge dependency Date: Mon, 31 Aug 2026 21:23:33 +0800 Message-ID: <20260831132340.5345-3-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.118 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.118; envelope-from=cp0613@linux.alibaba.com; helo=out30-118.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182736846154100 Content-Type: text/plain; charset="utf-8" On RISC-V QEMU virt platform with CXL enabled, the probe ordering of acpi_pci_root (ACPI0016) and cxl_acpi (ACPI0017) is not guaranteed. If cxl_acpi probes before acpi_pci_root has attached the CXL host bridges, the CXL port topology will be incomplete because to_cxl_host_bridge() silently skips devices whose PCI root is not yet ready. Add a _DEP object to the ACPI0017 device in the DSDT, declaring its dependency on the ACPI0016 CXL host bridge devices. This tells the OS to defer ACPI0017 enumeration until all ACPI0016 devices have been attached by acpi_pci_root. This pairs with kernel commit 3a59c3b772e5 ("ACPI: PCI: Clear _DEP dependencies after PCI root bridge attach"), which calls acpi_dev_clear_dependencies() in acpi_pci_root_add(). Note on kernel compatibility: this is a "new QEMU feature requires a sufficiently new kernel" situation. Kernels that process _DEP but lack the acpi_dev_clear_dependencies() call will leave the CXLM device deferred, so CXL memory is unusable there; kernels old enough to ignore _DEP entirely behave exactly as before this change. In neither case is existing (non-CXL) PCIe affected. The resulting DSDT fragment (iasl -d output) for a single CXL host bridge at bus 0x0C looks like: Device (CXLM) { Name (_HID, "ACPI0017") Name (_DEP, Package (0x01) { \_SB.PC0C }) Method (_STA, 0, NotSerialized) { Return (0x0B) } ... } Reviewed-by: Sunil V L Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin Reviewed-by: Junjie Cao --- hw/riscv/virt-acpi-build.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 3188cdc5bf..56292f04a7 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -521,6 +521,38 @@ static void build_dsdt(GArray *table_data, if (s->cxl_devices_state.is_enabled) { Aml *cxl_dev =3D aml_device("CXLM"); aml_append(cxl_dev, aml_name_decl("_HID", aml_string("ACPI0017"))); + + /* + * Declare a _DEP on every ACPI0016 CXL host bridge so the OS + * defers ACPI0017 enumeration until acpi_pci_root has attached + * the CXL host bridges. Without this, cxl_acpi may probe before + * to_cxl_host_bridge() can resolve the PCI root and the CXL + * port topology comes up empty. + */ + if (s->pci_bus) { + PCIBus *bus; + uint32_t num_cxl_hbs =3D 0; + + QLIST_FOREACH(bus, &s->pci_bus->child, sibling) { + if (pci_bus_is_root(bus) && pci_bus_is_cxl(bus)) { + num_cxl_hbs++; + } + } + + if (num_cxl_hbs > 0) { + Aml *dep_pkg =3D aml_package(num_cxl_hbs); + + QLIST_FOREACH(bus, &s->pci_bus->child, sibling) { + if (pci_bus_is_root(bus) && pci_bus_is_cxl(bus)) { + aml_append(dep_pkg, + aml_name("\\_SB.PC%.02X", + pci_bus_num(bus))); + } + } + aml_append(cxl_dev, aml_name_decl("_DEP", dep_pkg)); + } + } + Aml *method =3D aml_method("_STA", 0, AML_NOTSERIALIZED); aml_append(method, aml_return(aml_int(0x0B))); aml_append(cxl_dev, method); --=20 2.50.1 From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182702; cv=none; d=zohomail.com; s=zohoarc; b=UNKU5wHZGrN2xdrXwp3p/XPOqdYN8RUyJkFP0Le4zAfzZg72rwDzy+nrSxXqbFDxlDneJx6dUaUTebFlM8xUaa9FbKTf64d3wr5vApunRjT97+Kb8cEUmcBJhKmnyD+f93LEXI7jPoORDpPYbv/tdgIEdDvrCz3D0Q0d/dgttwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182702; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qzSs9QVw+T76x5yniRTmHi/lUAOHwqXsoD/OC7tt2Mc=; b=XguDURZT85XDZNqfwepwmX+u3T/mZLBBQGqu3KRanaGgOWE1yFSmXMsG2h27E8zoRslO6dydCu8aCckeISUj3k2EfCJaom1G7JUn+Tq0y3MxlgN7exYmiFLqawYZFaC7gDLT8WvOksn4sTVi63Stzu4l3057YvKj6Lt0M2R0eRc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17881827027561020.3202204567955; Mon, 31 Aug 2026 06:25:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zs-00021i-TL; Mon, 31 Aug 2026 09:24:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zn-0001t7-1w; Mon, 31 Aug 2026 09:24:19 -0400 Received: from [115.124.30.118] (helo=out30-118.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zd-0006pq-85; Mon, 31 Aug 2026 09:24:18 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfqW_1788182634 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182635; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=qzSs9QVw+T76x5yniRTmHi/lUAOHwqXsoD/OC7tt2Mc=; b=MrPzk4eMix57seel3oH1yIqQd/UDGHPJxDIue6kB8NLQhXjng9IO2SnWkNh2CMVbfKfqh5juB6Gz/RoCv5M9i3xXQE+8uMimHgthfEnovSnpaUxR7L5hT8fZyC7LZvgGb9jp6T7Qp1rIRYXDhNjIutsuK3XQ6Hi5QFucnGQwoIw= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R111e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033045133197; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=19; SR=0; TI=SMTPD_---0X9znfqW_1788182634; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org Subject: [PATCH v5 3/6] hw/riscv/virt: Advertise the CXL host bridge to firmware via extra-pci-roots Date: Mon, 31 Aug 2026 21:23:34 +0800 Message-ID: <20260831132340.5345-4-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.118 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.118; envelope-from=cp0613@linux.alibaba.com; helo=out30-118.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182704103158500 Content-Type: text/plain; charset="utf-8" The pxb-cxl expander bridge presents as a class 0x0600 host bridge with a type-0 header, so EDK2's PciBusDxe never recurses into it and never assigns the CXL root port a memory window or bus numbers. As a result build_crs() produces an empty _CRS for the ACPI0016 host bridge and the CXL devices behind it are not enumerated by the OS. Advertise the pxb-cxl expander root buses to firmware via the etc/extra-pci-roots fw_cfg file, the same way arm/virt and x86 do, by calling pci_bus_add_fw_cfg_extra_pci_roots() from virt_machine_done(). EDK2's PciBusDxe then enumerates behind the CXL host bridge and assigns the root-port window and bus numbers. The ACPI tables are rebuilt when the guest reads them (after that firmware enumeration), so build_crs() then emits a correct _CRS for the ACPI0016 host bridge. The call is made unconditionally, in line with arm/virt, pc and hppa, so plain pxb-pcie expander bridges, which likewise depend on etc/extra-pci-roots, are advertised as well; the generator simply returns nothing when there is no expander root bus. This approach also scales to multiple pxb-cxl host bridges (each gets its own window from the shared aperture) and lets firmware size the window to what is actually behind the bridge, rather than reserving a fixed carve-out. Verified by booting an RVA22 guest: the CXL root port and Type3 device enumerate, and 'cxl enable-memdev' / 'cxl create-region' / 'daxctl online-memory' bring the CXL memory online as system RAM. Reviewed-by: Junjie Cao Tested-by: Junjie Cao Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin --- v5: - Move pci_bus_add_fw_cfg_extra_pci_roots() out of the cxl block so plain pxb-pcie is advertised with cxl=3Doff as well, in line with arm/virt, pc and hppa. hw/riscv/virt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e903551263..fb1941fe00 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1246,6 +1246,15 @@ static void virt_machine_done(Notifier *notifier, vo= id *data) cxl_fmws_link_targets(&error_fatal); } =20 + /* + * Advertise the pxb/pxb-cxl expander root buses to firmware so that + * it enumerates behind them and assigns bus numbers and windows. For + * the CXL host bridges, build_crs() then builds the ACPI0016 _CRS + * from the resulting state when the guest reads the ACPI tables. + * This is a no-op without any expander root bus. + */ + pci_bus_add_fw_cfg_extra_pci_roots(s->fw_cfg, s->pci_bus, &error_abort= ); + /* * An user provided dtb must include everything, including * dynamic sysbus devices. Our FDT needs to be finalized. --=20 2.50.1 From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182701; cv=none; d=zohomail.com; s=zohoarc; b=n+c5MB0yxfUfELe05++p2C3LBCFf4Bisf8MnzU70F0EHCA0mlgVoGL9rPifsYMGrqv3xG5a2pfCn9LR6tg2QuCnrDvVi0snrSbU4/Ze9XW2snKURiak0sds7Ixr9Nrsi6wwpmnQ3sgqSmCzRahfaj0cV3qYTSdDoDAAvtM7IWyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182701; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qUoiwS+nVtbX4Kx79t0Lc82rPB+U+QOyOnVoT6G/J5I=; b=kiuiUWR8i7knwDL0YUz1acrNvtAnkCygOei5W27/tK2HxBAQkCfTefRfCqtnetgEjOK4DbJyNPuN4mOBv/aN5qblNdL1TuBQJBjMnxMjjbBSxjlBH4/rkGMHqCkRjVYciA3PDkYl4Lhev279K2ZDkJpoLhauhLbuShFjmxaABZ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788182701430422.5130859857669; Mon, 31 Aug 2026 06:25:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zn-0001t1-GA; Mon, 31 Aug 2026 09:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zk-0001py-RR; Mon, 31 Aug 2026 09:24:16 -0400 Received: from [115.124.30.99] (helo=out30-99.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zd-0006pr-Je; Mon, 31 Aug 2026 09:24:16 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfql_1788182635 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182636; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=qUoiwS+nVtbX4Kx79t0Lc82rPB+U+QOyOnVoT6G/J5I=; b=Mz2ND8JNRYklwMwY28YSR61OvEAPM3NqR4767ozka+xWAZMln7KN1Wz1FzD0XWD/U8s25kWBDTMmVkyFQx/Ugdk6Q1JXwGg45dOi8AkQUL70Vo05mRDrvYJ94EU7qF2Q8HV1kYjIh8FOyjbTJWAAI+EBO98w2zGmglX6vp0tAAM= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R831e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam011083073210; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=19; SR=0; TI=SMTPD_---0X9znfql_1788182635; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org Subject: [PATCH v5 4/6] tests/qtest: Prepare golden files for the RISC-V CXL ACPI test Date: Mon, 31 Aug 2026 21:23:35 +0800 Message-ID: <20260831132340.5345-5-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.99 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.99; envelope-from=cp0613@linux.alibaba.com; helo=out30-99.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182704275154100 Content-Type: text/plain; charset="utf-8" Add empty DSDT.cxl and CEDT.cxl golden files and list them in bios-tables-test-allowed-diff.h, in preparation for the RISC-V CXL bios-tables test added in the following patch. The populated golden master binaries are committed separately in a final patch, following the bios-tables-test update process. Reviewed-by: Junjie Cao Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin --- v4: - Split the CXL bios-tables test into the staged flow documented in bios-tables-test.c: empty golden files + allowed-diff.h, then the test code, then the populated golden master binaries with an emptied allowed-diff.h in a final patch (matching how the riscv64 goldens were originally added upstream). tests/data/acpi/riscv64/virt/CEDT.cxl | 0 tests/data/acpi/riscv64/virt/DSDT.cxl | 0 tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 3 files changed, 2 insertions(+) create mode 100644 tests/data/acpi/riscv64/virt/CEDT.cxl create mode 100644 tests/data/acpi/riscv64/virt/DSDT.cxl diff --git a/tests/data/acpi/riscv64/virt/CEDT.cxl b/tests/data/acpi/riscv6= 4/virt/CEDT.cxl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/riscv64/virt/DSDT.cxl b/tests/data/acpi/riscv6= 4/virt/DSDT.cxl 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..c05fb697a5 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"riscv64/virt/DSDT.cxl", +"riscv64/virt/CEDT.cxl", --=20 2.50.1 From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182700; cv=none; d=zohomail.com; s=zohoarc; b=nNpIgPHeWBZaxGhXHDipaNfMYrh1zECoYD/Qm97PZPHhA3uf3afJUV4SI2rie/wDl+UxkGpl+ozYXLmpooJQnMNCZVY3puGdfZZTDMHPvvN2iCaFjcm5jWOh8qoZeKXpfL132BuEIN+5dWelvdTQTvNRFilHC8wIVSC2FGHBK8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182700; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wO62s2Pr7FdPaT1mifIp2d4AflcsLpR3tVxK/tc9v+M=; b=CcEn3zbnXZWRIUOVYA78cBRgXEwjHCFZfgtCZ50ipHmfx4p18Jqb1GP9YskU5waKdmMsR4n7BRc7CEVFMXNuJ6K5Zy6Sb/h5EivzSA8CkpYBbIARyuMULUQ7LC2tqOv+kyK/YmmDfYVCmrU40zPR5WcBz6bAvuw5BvBx6L79Ag8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788182700873630.7440340121854; Mon, 31 Aug 2026 06:25:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zo-0001te-9s; Mon, 31 Aug 2026 09:24:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zl-0001rQ-LH; Mon, 31 Aug 2026 09:24:17 -0400 Received: from [115.124.30.132] (helo=out30-132.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zc-0006px-Gc; Mon, 31 Aug 2026 09:24:17 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfr5_1788182636 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182637; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=wO62s2Pr7FdPaT1mifIp2d4AflcsLpR3tVxK/tc9v+M=; b=snSXz5qPBz20X7Le80x+GWFpFArBILabMJxjDIbHK6efRXLcM3IKIstbEOHwztt1Y9knImPmEnHegMBFz3imA5z8pCR+gdVkVBOIFzgrHdAhYa8Y+n973lJIJjvAfPlEr+1U8tmA244fGSwEixUZkxZE5q/MODRvNBjjCCTCnxY= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R791e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037009110; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=19; SR=0; TI=SMTPD_---0X9znfr5_1788182636; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org Subject: [PATCH v5 5/6] tests/qtest: Add RISC-V ACPI bios tables test for CXL Date: Mon, 31 Aug 2026 21:23:36 +0800 Message-ID: <20260831132340.5345-6-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.132 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.132; envelope-from=cp0613@linux.alibaba.com; helo=out30-132.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182702390154100 Content-Type: text/plain; charset="utf-8" Add test_acpi_riscv64_virt_tcg_cxl() to verify that enabling CXL on the RISC-V virt machine produces correct ACPI tables, including the ACPI0017 CXLM device with _DEP in the DSDT and the CEDT table. The test boots with cxl=3Don, one pxb-cxl bus (bus_nr=3D12), a CXL root port, a cxl-type3 device and a fixed memory window, mirroring the existing x86 q35 CXL test pattern. Since pxb-cxl is a root bus, using -cdrom causes QEMU to auto-plug the cdrom drive into pxb-cxl, triggering "Only PCI/PCIe bridges can be plugged into pxb-cxl". The ISO is instead attached explicitly via a virtio-scsi-pci controller on pcie.0, following the same approach as test_acpi_aarch64_virt_tcg_pxb(). Acked-by: Alistair Francis Reviewed-by: Junjie Cao Tested-by: Junjie Cao Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 54 ++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 5cc526510a..d2b18d8ecb 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -2214,6 +2214,56 @@ static void test_acpi_riscv64_virt_tcg(void) free_test_data(&data); } =20 +#ifdef CONFIG_POSIX +static void test_acpi_riscv64_virt_tcg_cxl(void) +{ + gchar *tmp_path =3D g_dir_make_tmp("qemu-test-cxl.XXXXXX", NULL); + gchar *params; + + test_data data =3D { + .machine =3D "virt", + .arch =3D "riscv64", + .tcg_only =3D true, + .uefi_fl1 =3D "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 =3D "pc-bios/edk2-riscv-vars.fd", + .ram_start =3D 0x80000000ULL, + .scan_len =3D 128ULL * MiB, + .variant =3D ".cxl", + }; + + /* + * While using -cdrom, the cdrom would auto-plug into pxb-cxl because + * its bus is also a root bus, triggering "Only PCI/PCIe bridges can be + * plugged into pxb-cxl". Attach the ISO explicitly to a scsi control= ler + * on pcie.0 instead, following the same pattern as + * test_acpi_aarch64_virt_tcg_pxb(). + */ + params =3D g_strdup_printf("-cpu rva22s64" + " -machine cxl=3Don" + " -device pcie-root-port,chassis=3D1,id=3Dpci= .1,bus=3Dpcie.0" + " -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpc= i.1" + " -drive file=3Dtests/data/uefi-boot-images/" + "bios-tables-test.riscv64.iso.qcow2," + "if=3Dnone,media=3Dcdrom,id=3Ddrive-scsi0-0-0= -1,readonly=3Don" + " -device scsi-cd,bus=3Dscsi0.0,scsi-id=3D0," + "drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1,b= ootindex=3D1" + " -object memory-backend-file,id=3Dcxl-mem1,m= em-path=3D%s,size=3D256M" + " -object memory-backend-file,id=3Dlsa1,mem-p= ath=3D%s,size=3D256M" + " -device pxb-cxl,bus_nr=3D12,bus=3Dpcie.0,id= =3Dcxl.1" + " -device cxl-rp,port=3D0,bus=3Dcxl.1,id=3Drp= 1,chassis=3D0,slot=3D2" + " -device cxl-type3,bus=3Drp1,persistent-memd= ev=3Dcxl-mem1,lsa=3Dlsa1" + " -M cxl-fmw.0.targets.0=3Dcxl.1,cxl-fmw.0.si= ze=3D4G," + "cxl-fmw.0.interleave-granularity=3D8k", + tmp_path, tmp_path); + test_acpi_one(params, &data); + + g_free(params); + g_assert(g_rmdir(tmp_path) =3D=3D 0); + g_free(tmp_path); + free_test_data(&data); +} +#endif /* CONFIG_POSIX */ + static void test_acpi_aarch64_virt_tcg(void) { test_data data =3D { @@ -2963,6 +3013,10 @@ int main(int argc, char *argv[]) test_acpi_riscv64_virt_tcg_numamem); qtest_add_func("acpi/virt/acpispcr", test_acpi_riscv64_virt_tcg_acpi_spcr); +#ifdef CONFIG_POSIX + qtest_add_func("acpi/virt/cxl", + test_acpi_riscv64_virt_tcg_cxl); +#endif } } else if (strcmp(arch, "loongarch64") =3D=3D 0) { if (has_tcg && qtest_has_machine("virt")) { --=20 2.50.1 From nobody Sat Sep 26 20:50:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1788182701; cv=none; d=zohomail.com; s=zohoarc; b=J/1dODTYlpOcmtEg6KSnX4hOXAHMOJeHPr8kaX9Q6MlRz9Slpnht7CtEgrLwixggx9f49eajh/V1QLDVbo35vN6lFcQO/iLsjvYp14zkhjFzf473jC+hYfRiHAVLsMo0QLxeuNOr+2Im6igXl+zOsiAJpIiCuPnwKnBtoDNnkQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788182701; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pgiT/hQFiGb8Z/BKq58nZtBYUay8m5suI2xbvvisSTg=; b=YiD825lstzWAf+c48nqt2UL3oPa/uF7gwaGV3KIf5p+wPNJbyS5cknDUqOVS2EdztyYCLWuEWUQxJG8M6FMuxcJD36fgNuj45XkA2AOwH2V+AoIMEzGQiJfuWHH1iESKruWN1PAGpT5UPmkNOvT1wossccBL52afduh62d5KgZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788182700935564.8150452983606; Mon, 31 Aug 2026 06:25:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x11zk-0001pa-O5; Mon, 31 Aug 2026 09:24:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zi-0001ms-Hg; Mon, 31 Aug 2026 09:24:14 -0400 Received: from [115.124.30.99] (helo=out30-99.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x11zc-0006qG-PX; Mon, 31 Aug 2026 09:24:14 -0400 Received: from DESKTOP-S9E58SO.localdomain(mailfrom:cp0613@linux.alibaba.com fp:SMTPD_---0X9znfrJ_1788182637 cluster:ay36) by smtp.aliyun-inc.com; Mon, 31 Aug 2026 21:23:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1788182638; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=pgiT/hQFiGb8Z/BKq58nZtBYUay8m5suI2xbvvisSTg=; b=jV2uX+ZRW/OZvMdN28QKDXZNuKsvew1HhULzZDXbJk5UCu9b6XdxW6YJCDcyhEcUHS1rSB0EDaOKzzKWYyVwxDtbGZk3D6HjVUvhJT3NaPp3Udejn+SN1xN2EtWuqdq9tsaCmT96g6BXLmqgOqBbe9RJ1zwe/it8Wgk9OQgLG8I= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R781e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037026112; MF=cp0613@linux.alibaba.com; NM=1; PH=DS; RN=19; SR=0; TI=SMTPD_---0X9znfrJ_1788182637; From: Chen Pei To: palmer@dabbelt.com, alistair.francis@wdc.com, mst@redhat.com, imammedo@redhat.com, sunilvl@ventanamicro.com, jic23@kernel.org Cc: pbonzini@redhat.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, anisinha@redhat.com, dave.jiang@intel.com, alison.schofield@intel.com, junjie.cao@intel.com, guoren@kernel.org, qemu-riscv@nongnu.org, qemu-devel@nongnu.org, linux-cxl@vger.kernel.org Subject: [PATCH v5 6/6] tests/qtest: Update RISC-V CXL ACPI golden master binaries Date: Mon, 31 Aug 2026 21:23:37 +0800 Message-ID: <20260831132340.5345-7-cp0613@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831132340.5345-1-cp0613@linux.alibaba.com> References: <20260831132340.5345-1-cp0613@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.99 (deferred) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=115.124.30.99; envelope-from=cp0613@linux.alibaba.com; helo=out30-99.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1788182702235158500 Content-Type: text/plain; charset="utf-8" Populate the DSDT.cxl and CEDT.cxl golden master binaries for the RISC-V CXL bios-tables test and empty bios-tables-test-allowed-diff.h, following the bios-tables-test update process. The expected AML added by this series is: DSDT.cxl: Device (PC0C) // ACPI0016 CXL host bridge (pxb-cxl, bus 0x0C) Name (_CRS, ResourceTemplate () { DWordMemory (... 0x40400000 .. 0x405FFFFF ...) // 32-bit MMIO QWordMemory (... 0x400100000 .. 0x40010FFFF ...) // 64-bit MMIO WordBusNumber (... 0x000C .. 0x000D ...) }) Method (_OSC, ...) // PCI host bridge + CXL UUIDs Device (CXLM) // ACPI0017 CXL memory controller Name (_HID, "ACPI0017") Name (_DEP, Package () { \_SB.PC0C }) Method (_STA, ...) / Method (_DSM, ...) CEDT.cxl: CHBS : CXL Host Bridge Structure, Register base 0x800000000 CFMWS: CXL Fixed Memory Window, base 0x810000000, size 4G Reviewed-by: Junjie Cao Signed-off-by: Chen Pei Acked-by: Michael S. Tsirkin Tested-by: Junjie Cao --- v5: - Regenerate DSDT.cxl against the in-tree edk2-riscv-code.fd blob the test boots: the 64-bit window becomes 0x400100000..0x40010FFFF with the matching PCI0 range shift. tests/data/acpi/riscv64/virt/CEDT.cxl | Bin 0 -> 108 bytes tests/data/acpi/riscv64/virt/DSDT.cxl | Bin 0 -> 6331 bytes tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 3 files changed, 2 deletions(-) diff --git a/tests/data/acpi/riscv64/virt/CEDT.cxl b/tests/data/acpi/riscv6= 4/virt/CEDT.cxl index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..81d746dfb09ccb147e26bb64060= 404ca3191d097 100644 GIT binary patch literal 108 zc-nJzbqUE~U|?VjaPoKd2v%^42yj*a0!E-1hz+6{7!(+IKx!BefCEf2LP-snumA^? O0aMEg#QH!C(hmS*@&^F` literal 0 Hc-jL100001 diff --git a/tests/data/acpi/riscv64/virt/DSDT.cxl b/tests/data/acpi/riscv6= 4/virt/DSDT.cxl index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c3d68cf3a080ab66160f6847267= fe4b9f8a8c6fc 100644 GIT binary patch literal 6331 zc-pO*%WoS+9LHzv^&{)GV>{0K;q)PKKt*52P18#i+v~J-6(`1)3XKq=3D4eEu9E28obaDpO`;KHpELLiX1ap8gl2ZV%VW_E37zv))$A&#^=3DsjyJZGJBgPxzOF3X@P8DTFKjaal{ zSw&55>vk$-ByRPn@?=3Du3Qe2mnGZm||gt~2=3Dm6f^f5>DAAv8Pa&LaaK4R>WGYa%H|- zscJ@y!FEkjZEuH#rWwwx(MH)Wr>6p`J|mg=3Dx%JBzS3jt3-Ff)Q*JnP}(xX~>C=3Dg$J z>E*SJBNty;zxMk2)wSz#+QM-;X;D90?<{wIp}r_5o!*_a%h{Pa>HN7m-^;kHEyJ1daTtF>fa*Vwx-UjNSmr{1k{=3D7bb<;^q~p3NM+xDMYxgvFV8ZP=3D zb@|>$1&KPmVh%?5VG3GRh(>Q3Fho2&R*i| zWzJsaOcH03IFrnoWX=3D?Erie4eoGIo^6K9$@)6AJ>&OYMoBhEhN>|@Rhab}1!!<-rB z>?h8C;_PS6e&!q?&H>^aV9o*N93;*`;v8hoLFODH&LQF)V$LDv945|T;v8nqVdfkm z&Jp4qVa^fe93{?C;v8kpQRW;Y&N1Q~W6m+=3D94F3k;v8qraps&L&I#h2V9p8V%o1mo zIJ3-|?Qpsu+zTP&h4&pjw&A2m{v$CeOgnS zosIhmcP_QY+|Gt;de}c{#QsSm_E8$KPtv$>uVz&|XRCMNiPk=3DDCzyE!Y5 zXlAgZmGZ+`J%UOw_o}F9t7z{Y6-_$Zy`xj@(ar~q=3DkaIDy;+)>kFb!2{C)I^<~i|{ z=3DIMCmeUk(+bEHwWt9tW*JLjXB?|-+a->Tjj{G&SjtyOLIY+n&Osi5X=3DR&G}H`kYNV z*|GV&fyd4h+%wsl-E&9ZIZ@6n&9HTTzDhUg)K3KExmw!PEM`?t@o6&_sq+>9-LSnsY^YbLg@Xgld>KuhaVcK!!2ury2n literal 0 Hc-jL100001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index c05fb697a5..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,3 +1 @@ /* List of comma-separated changed AML files to ignore */ -"riscv64/virt/DSDT.cxl", -"riscv64/virt/CEDT.cxl", --=20 2.50.1