From nobody Thu Nov 14 18:14:04 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 1714124103020595.395552799776; Fri, 26 Apr 2024 02:35:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0HyN-0001N6-4V; Fri, 26 Apr 2024 05:34:27 -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 1s0HyI-0000r5-Ne for qemu-devel@nongnu.org; Fri, 26 Apr 2024 05:34:22 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0HyF-0001lC-Fx for qemu-devel@nongnu.org; Fri, 26 Apr 2024 05:34:22 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8Dx_+vAdCtmEGYDAA--.14341S3; Fri, 26 Apr 2024 17:32:48 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxU1a2dCtm+yUGAA--.2929S14; Fri, 26 Apr 2024 17:32:47 +0800 (CST) From: Song Gao To: qemu-devel@nongnu.org, maobibo@loongson.cn Cc: richard.henderson@linaro.org, peter.maydell@linaro.org, philmd@linaro.org, zltjiangshi@gmail.com Subject: [PATCH v7 12/17] hw/loongarch: fdt adds pch_pic Controller Date: Fri, 26 Apr 2024 17:15:46 +0800 Message-Id: <20240426091551.2397867-13-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240426091551.2397867-1-gaosong@loongson.cn> References: <20240426091551.2397867-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8BxU1a2dCtm+yUGAA--.2929S14 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ 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=gaosong@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: 1714124104714100006 Content-Type: text/plain; charset="utf-8" fdt adds pch pic controller, we use 'loongson,pch-pic-1.0' See: https://github.com/torvalds/linux/blob/v6.7/drivers/irqchip/irq-loongson-pc= h-pic.c https://lore.kernel.org/r/20200528152757.1028711-4-jiaxun.yang@flygoat.com Signed-off-by: Song Gao Reviewed-by: Bibo Mao Message-Id: <20240307164835.300412-13-gaosong@loongson.cn> --- include/hw/pci-host/ls7a.h | 1 + hw/loongarch/virt.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h index e753449593..fe260f0183 100644 --- a/include/hw/pci-host/ls7a.h +++ b/include/hw/pci-host/ls7a.h @@ -24,6 +24,7 @@ #define VIRT_PCH_REG_BASE 0x10000000UL #define VIRT_IOAPIC_REG_BASE (VIRT_PCH_REG_BASE) #define VIRT_PCH_MSI_ADDR_LOW 0x2FF00000UL +#define VIRT_PCH_REG_SIZE 0x400 =20 /* * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to bo= ot diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 094b9d2e60..5bef161d11 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -148,6 +148,31 @@ static void fdt_add_eiointc_node(LoongArchMachineState= *lams, g_free(nodename); } =20 +static void fdt_add_pch_pic_node(LoongArchMachineState *lams, + uint32_t *eiointc_phandle, + uint32_t *pch_pic_phandle) +{ + MachineState *ms =3D MACHINE(lams); + char *nodename; + hwaddr pch_pic_base =3D VIRT_PCH_REG_BASE; + hwaddr pch_pic_size =3D VIRT_PCH_REG_SIZE; + + *pch_pic_phandle =3D qemu_fdt_alloc_phandle(ms->fdt); + nodename =3D g_strdup_printf("/platic@%" PRIx64, pch_pic_base); + qemu_fdt_add_subnode(ms->fdt, nodename); + qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", *pch_pic_phandle); + qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", + "loongson,pch-pic-1.0"); + qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0, + pch_pic_base, 0, pch_pic_size); + qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0); + qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 2); + qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent", + *eiointc_phandle); + qemu_fdt_setprop_cell(ms->fdt, nodename, "loongson,pic-base-vec", 0); + g_free(nodename); +} + static void fdt_add_flash_node(LoongArchMachineState *lams) { MachineState *ms =3D MACHINE(lams); @@ -570,7 +595,7 @@ static void loongarch_irq_init(LoongArchMachineState *l= ams) CPULoongArchState *env; CPUState *cpu_state; int cpu, pin, i, start, num; - uint32_t cpuintc_phandle, eiointc_phandle; + uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle; =20 /* * The connection of interrupts: @@ -661,6 +686,9 @@ static void loongarch_irq_init(LoongArchMachineState *l= ams) qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i)); } =20 + /* Add PCH PIC node */ + fdt_add_pch_pic_node(lams, &eiointc_phandle, &pch_pic_phandle); + pch_msi =3D qdev_new(TYPE_LOONGARCH_PCH_MSI); start =3D num; num =3D EXTIOI_IRQS - start; --=20 2.25.1