From nobody Sun Sep 28 17:12:47 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757920983279243.01465811373646; Mon, 15 Sep 2025 00:23:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uy3Vf-0002KA-4F; Mon, 15 Sep 2025 03:20: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 1uy3Vc-0002Iu-Fj for qemu-devel@nongnu.org; Mon, 15 Sep 2025 03:20:20 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uy3VH-0000Kn-0u for qemu-devel@nongnu.org; Mon, 15 Sep 2025 03:20:19 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8DxLvAVvsdo+2wKAA--.22283S3; Mon, 15 Sep 2025 15:19:49 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJAxVOQSvsdoXteWAA--.24724S9; Mon, 15 Sep 2025 15:19:48 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , qemu-devel@nongnu.org Subject: [PATCH 7/8] hw/loongarch/virt: Add high MMIO support with GPEX host Date: Mon, 15 Sep 2025 15:19:45 +0800 Message-Id: <20250915071946.315171-8-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250915071946.315171-1-maobibo@loongson.cn> References: <20250915071946.315171-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJAxVOQSvsdoXteWAA--.24724S9 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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-ZM-MESSAGEID: 1757920985844116600 Content-Type: text/plain; charset="utf-8" With high MMIO supported, its base address comes from physical end address of DRAM. Also add high MMIO support with GPEX host bridge. Signed-off-by: Bibo Mao --- hw/loongarch/virt-fdt-build.c | 33 +++++++++++++++++----- hw/loongarch/virt.c | 53 +++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 9 deletions(-) diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c index 5453805ca1..e4d3d80fe5 100644 --- a/hw/loongarch/virt-fdt-build.c +++ b/hw/loongarch/virt-fdt-build.c @@ -367,8 +367,8 @@ static void fdt_add_pcie_node(const LoongArchVirtMachin= eState *lvms, uint32_t *pch_msi_phandle) { char *nodename; - hwaddr base_mmio =3D lvms->gpex.mmio64.base; - hwaddr size_mmio =3D lvms->gpex.mmio64.size; + hwaddr base_mmio, base_mmio_high; + hwaddr size_mmio, size_mmio_high; hwaddr base_pio =3D lvms->gpex.pio.base; hwaddr size_pio =3D lvms->gpex.pio.size; hwaddr base_pcie =3D lvms->gpex.ecam.base; @@ -389,11 +389,30 @@ static void fdt_add_pcie_node(const LoongArchVirtMach= ineState *lvms, qemu_fdt_setprop(ms->fdt, nodename, "dma-coherent", NULL, 0); qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base_pcie, 2, size_pcie); - qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "ranges", - 1, FDT_PCI_RANGE_IOPORT, 2, VIRT_PCI_IO_O= FFSET, - 2, base_pio, 2, size_pio, - 1, FDT_PCI_RANGE_MMIO, 2, base_mmio, - 2, base_mmio, 2, size_mmio); + if (lvms->highmem_mmio) { + base_mmio_high =3D lvms->gpex.mmio64.base; + size_mmio_high =3D lvms->gpex.mmio64.size; + base_mmio =3D lvms->gpex.mmio32.base; + size_mmio =3D lvms->gpex.mmio32.size; + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "ranges", + 1, FDT_PCI_RANGE_IOPORT, + 2, VIRT_PCI_IO_OFFSET, + 2, base_pio, 2, size_pio, + 1, FDT_PCI_RANGE_MMIO, 2, base_mmio, + 2, base_mmio, 2, size_mmio, + 1, FDT_PCI_RANGE_MMIO_64BIT, + 2, base_mmio_high, + 2, base_mmio_high, 2, size_mmio_high); + } else { + base_mmio =3D lvms->gpex.mmio64.base; + size_mmio =3D lvms->gpex.mmio64.size; + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "ranges", + 1, FDT_PCI_RANGE_IOPORT, + 2, VIRT_PCI_IO_OFFSET, + 2, base_pio, 2, size_pio, + 1, FDT_PCI_RANGE_MMIO, 2, base_mmio, + 2, base_mmio, 2, size_mmio); + } qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map", 0, *pch_msi_phandle, 0, 0x10000); fdt_add_pcie_irq_map_node(lvms, nodename, pch_pic_phandle); diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 894e60e474..73c0494422 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -48,6 +48,9 @@ #include "qemu/error-report.h" #include "kvm/kvm_loongarch.h" =20 +#define DEFAULT_HIGH_PCIE_MMIO_SIZE_GB 64 +#define DEFAULT_HIGH_PCIE_MMIO_SIZE (DEFAULT_HIGH_PCIE_MMIO_SIZE_GB * GiB) + static void virt_get_veiointc(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -273,6 +276,31 @@ static DeviceState *create_platform_bus(DeviceState *p= ch_pic) return dev; } =20 +static void virt_set_highmmio(LoongArchVirtMachineState *lvms) +{ + LoongArchCPU *cpu =3D LOONGARCH_CPU(first_cpu); + CPULoongArchState *env =3D &cpu->env; + struct GPEXConfig *gpex; + + if (env->phys_bits <=3D 32) { + return; + } + + gpex =3D &lvms->gpex; + if (gpex->mmio64.size =3D=3D 0) { + gpex->mmio64.size =3D DEFAULT_HIGH_PCIE_MMIO_SIZE; + } + + gpex->mmio64.base =3D ROUND_UP(lvms->ram_end, gpex->mmio64.size); + if (gpex->mmio64.base + gpex->mmio64.size > BIT_ULL(env->phys_bits)) { + error_report("GPEX region base %" PRIu64 " size %" PRIu64 + " exceeds %d physical bits", + gpex->mmio64.base, gpex->mmio64.size, + env->phys_bits); + exit(EXIT_FAILURE); + } +} + static void virt_devices_init(DeviceState *pch_pic, LoongArchVirtMachineState *lvms) { @@ -289,8 +317,6 @@ static void virt_devices_init(DeviceState *pch_pic, d =3D SYS_BUS_DEVICE(gpex_dev); sysbus_realize_and_unref(d, &error_fatal); pci_bus =3D PCI_HOST_BRIDGE(gpex_dev)->bus; - lvms->gpex.mmio64.base =3D VIRT_PCI_MEM_BASE; - lvms->gpex.mmio64.size =3D VIRT_PCI_MEM_SIZE; lvms->gpex.pio.base =3D VIRT_PCI_IO_BASE; lvms->gpex.pio.size =3D VIRT_PCI_IO_SIZE; lvms->gpex.ecam.base =3D VIRT_PCI_CFG_BASE; @@ -299,6 +325,18 @@ static void virt_devices_init(DeviceState *pch_pic, lvms->gpex.bus =3D pci_bus; mmio_base =3D lvms->gpex.mmio64.base; mmio_size =3D lvms->gpex.mmio64.size; + if (lvms->highmem_mmio) { + virt_set_highmmio(lvms); + lvms->gpex.mmio32.base =3D VIRT_PCI_MEM_BASE; + lvms->gpex.mmio32.size =3D VIRT_PCI_MEM_SIZE; + mmio_base =3D lvms->gpex.mmio32.base; + mmio_size =3D lvms->gpex.mmio32.size; + } else { + lvms->gpex.mmio64.base =3D VIRT_PCI_MEM_BASE; + lvms->gpex.mmio64.size =3D VIRT_PCI_MEM_SIZE; + mmio_base =3D lvms->gpex.mmio64.base; + mmio_size =3D lvms->gpex.mmio64.size; + } =20 /* Map only part size_ecam bytes of ECAM space */ ecam_alias =3D g_new0(MemoryRegion, 1); @@ -314,6 +352,17 @@ static void virt_devices_init(DeviceState *pch_pic, memory_region_init_alias(mmio_alias, OBJECT(gpex_dev), "pcie-mmio", mmio_reg, mmio_base, mmio_size); memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias= ); + if (lvms->highmem_mmio) { + /* Map high MMIO space */ + mmio_alias =3D g_new0(MemoryRegion, 1); + mmio_base =3D lvms->gpex.mmio64.base; + mmio_size =3D lvms->gpex.mmio64.size; + memory_region_init_alias(mmio_alias, OBJECT(gpex_dev), + "pcie-mmio-high", mmio_reg, + mmio_base, mmio_size); + memory_region_add_subregion(get_system_memory(), mmio_base, + mmio_alias); + } =20 /* Map PCI IO port space. */ pio_alias =3D g_new0(MemoryRegion, 1); --=20 2.39.3