From nobody Wed May 15 02:47:57 2024 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 169442277582167.02537153460185; Mon, 11 Sep 2023 01:59:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfclP-0005pJ-B8; Mon, 11 Sep 2023 04:59: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 1qfclM-0005oq-61 for qemu-devel@nongnu.org; Mon, 11 Sep 2023 04:59:20 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfclG-0004WW-Bj for qemu-devel@nongnu.org; Mon, 11 Sep 2023 04:59:18 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8Dx_+vY1v5k930kAA--.4836S3; Mon, 11 Sep 2023 16:59:04 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxF8zX1v5kMw53AA--.46531S2; Mon, 11 Sep 2023 16:59:03 +0800 (CST) From: Tianrui Zhao To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, maobibo@loongson.cn, yangxiaojuan@loongson.cn, zhaotianrui@loongson.cn, gaosong@loongson.cn Subject: [PATCH v3] hw/loongarch: Add virtio-mmio bus support Date: Mon, 11 Sep 2023 16:59:03 +0800 Message-Id: <20230911085903.664996-1-zhaotianrui@loongson.cn> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8CxF8zX1v5kMw53AA--.46531S2 X-CM-SenderInfo: p2kd03xldq233l6o00pqjv00gofq/ 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=zhaotianrui@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, 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: 1694422777465100001 Content-Type: text/plain; charset="utf-8" Add virtio-mmio bus support for LoongArch, so that devices could be added in the virtio-mmio bus. Signed-off-by: Tianrui Zhao Change-Id: Ib882005106562e0dfe74122a7fa2430fa081bfb2 Reviewed-by: Song Gao --- hw/loongarch/Kconfig | 1 + hw/loongarch/acpi-build.c | 25 +++++++++++++++++++++++++ hw/loongarch/virt.c | 28 ++++++++++++++++++++++++++++ include/hw/pci-host/ls7a.h | 4 ++++ 4 files changed, 58 insertions(+) diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig index 1e7c5b43c5..01ab8ce8e7 100644 --- a/hw/loongarch/Kconfig +++ b/hw/loongarch/Kconfig @@ -22,3 +22,4 @@ config LOONGARCH_VIRT select DIMM select PFLASH_CFI01 select ACPI_HMAT + select VIRTIO_MMIO diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index ae292fc543..d033fc2271 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -363,6 +363,30 @@ static void acpi_dsdt_add_tpm(Aml *scope, LoongArchMac= hineState *vms) } #endif =20 +static void acpi_dsdt_add_virtio(Aml *scope) +{ + int i; + hwaddr base =3D VIRT_VIRTIO_MMIO_BASE; + hwaddr size =3D VIRT_VIRTIO_MMIO_SIZE; + + for (i =3D 0; i < VIRT_VIRTIO_MMIO_NUM; i++) { + uint32_t irq =3D VIRT_VIRTIO_MMIO_IRQ + i; + Aml *dev =3D aml_device("VR%02u", i); + + aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0005"))); + aml_append(dev, aml_name_decl("_UID", aml_int(i))); + aml_append(dev, aml_name_decl("_CCA", aml_int(1))); + + Aml *crs =3D aml_resource_template(); + aml_append(crs, aml_memory32_fixed(base, size, AML_READ_WRITE)); + aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_= HIGH, + AML_EXCLUSIVE, &irq, 1)); + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); + base +=3D size; + } +} + /* build DSDT */ static void build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) @@ -381,6 +405,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Mach= ineState *machine) #ifdef CONFIG_TPM acpi_dsdt_add_tpm(dsdt, lams); #endif + acpi_dsdt_add_virtio(dsdt); /* System State Package */ scope =3D aml_scope("\\"); pkg =3D aml_package(4); diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 2629128aed..ffef3222da 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -116,6 +116,25 @@ static void fdt_add_rtc_node(LoongArchMachineState *la= ms) g_free(nodename); } =20 +static void fdt_add_virtio_mmio_node(LoongArchMachineState *lams) +{ + int i; + MachineState *ms =3D MACHINE(lams); + + for (i =3D VIRT_VIRTIO_MMIO_NUM - 1; i >=3D 0; i--) { + char *nodename; + hwaddr base =3D VIRT_VIRTIO_MMIO_BASE + i * VIRT_VIRTIO_MMIO_SIZE; + + nodename =3D g_strdup_printf("/virtio_mmio@%" PRIx64, base); + qemu_fdt_add_subnode(ms->fdt, nodename); + qemu_fdt_setprop_string(ms->fdt, nodename, + "compatible", "virtio,mmio"); + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", + 2, base, 2, VIRT_VIRTIO_MMIO_SIZE); + g_free(nodename); + } +} + static void fdt_add_uart_node(LoongArchMachineState *lams) { char *nodename; @@ -560,6 +579,15 @@ static void loongarch_devices_init(DeviceState *pch_pi= c, LoongArchMachineState * VIRT_RTC_IRQ - VIRT_GSI_BASE)); fdt_add_rtc_node(lams); =20 + /* virtio-mmio device */ + for (i =3D 0; i < VIRT_VIRTIO_MMIO_NUM; i++) { + hwaddr virtio_base =3D VIRT_VIRTIO_MMIO_BASE + i * VIRT_VIRTIO_MMI= O_SIZE; + int virtio_irq =3D VIRT_VIRTIO_MMIO_IRQ - VIRT_GSI_BASE + i; + sysbus_create_simple("virtio-mmio", virtio_base, + qdev_get_gpio_in(pch_pic, virtio_irq)); + } + fdt_add_virtio_mmio_node(lams); + pm_mem =3D g_new(MemoryRegion, 1); memory_region_init_io(pm_mem, NULL, &loongarch_virt_pm_ops, NULL, "loongarch_virt_pm", PM_SIZE); diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h index e753449593..96506b9a4c 100644 --- a/include/hw/pci-host/ls7a.h +++ b/include/hw/pci-host/ls7a.h @@ -42,6 +42,10 @@ #define VIRT_RTC_REG_BASE (VIRT_MISC_REG_BASE + 0x00050100) #define VIRT_RTC_LEN 0x100 #define VIRT_SCI_IRQ (VIRT_GSI_BASE + 4) +#define VIRT_VIRTIO_MMIO_IRQ (VIRT_GSI_BASE + 7) +#define VIRT_VIRTIO_MMIO_BASE 0x1e200000 +#define VIRT_VIRTIO_MMIO_SIZE 0x200 +#define VIRT_VIRTIO_MMIO_NUM 4 =20 #define VIRT_PLATFORM_BUS_BASEADDRESS 0x16000000 #define VIRT_PLATFORM_BUS_SIZE 0x2000000 --=20 2.39.1