qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Song Gao <gaosong@loongson.cn>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Song Gao <gaosong@loongson.cn>
Subject: [PULL 15/17] hw/loongarch: fdt remove unused irqchip node
Date: Thu,  7 Mar 2024 22:52:05 +0800	[thread overview]
Message-ID: <20240307145207.247913-16-gaosong@loongson.cn> (raw)
In-Reply-To: <20240307145207.247913-1-gaosong@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240301093839.663947-16-gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index d00343f0c2..c80732a223 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -446,34 +446,6 @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams,
     g_free(nodename);
 }
 
-static void fdt_add_irqchip_node(LoongArchMachineState *lams)
-{
-    MachineState *ms = MACHINE(lams);
-    char *nodename;
-    uint32_t irqchip_phandle;
-
-    irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt);
-    qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle);
-
-    nodename = g_strdup_printf("/intc@%lx", VIRT_IOAPIC_REG_BASE);
-    qemu_fdt_add_subnode(ms->fdt, nodename);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3);
-    qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2);
-    qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0);
-
-    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
-                            "loongarch,ls7a");
-
-    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
-                                 2, VIRT_IOAPIC_REG_BASE,
-                                 2, PCH_PIC_ROUTE_ENTRY_OFFSET);
-
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle);
-    g_free(nodename);
-}
-
 static void fdt_add_memory_node(MachineState *ms,
                                 uint64_t base, uint64_t size, int node_id)
 {
@@ -1011,8 +983,7 @@ static void loongarch_init(MachineState *machine)
 
     /* Initialize the IO interrupt subsystem */
     loongarch_irq_init(lams);
-    fdt_add_irqchip_node(lams);
-    platform_bus_add_all_fdt_nodes(machine->fdt, "/intc",
+    platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
                                    VIRT_PLATFORM_BUS_BASEADDRESS,
                                    VIRT_PLATFORM_BUS_SIZE,
                                    VIRT_PLATFORM_BUS_IRQ);
-- 
2.34.1



  parent reply	other threads:[~2024-03-07 14:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-07 14:51 [PULL 00/17] loongarch-to-apply queue Song Gao
2024-03-07 14:51 ` [PULL 01/17] hw/loongarch: Move boot fucntions to boot.c Song Gao
2024-03-07 14:51 ` [PULL 02/17] hw/loongarch: Add load initrd Song Gao
2024-03-07 14:51 ` [PULL 03/17] hw/loongarch: Add slave cpu boot_code Song Gao
2024-03-07 14:51 ` [PULL 04/17] hw/loongarch: Add init_cmdline Song Gao
2024-03-07 14:51 ` [PULL 05/17] hw/loongarch: Init efi_system_table Song Gao
2024-03-07 14:51 ` [PULL 06/17] hw/loongarch: Init efi_boot_memmap table Song Gao
2024-03-07 14:51 ` [PULL 07/17] hw/loongarch: Init efi_initrd table Song Gao
2024-03-07 14:51 ` [PULL 08/17] hw/loongarch: Init efi_fdt table Song Gao
2024-03-07 14:51 ` [PULL 09/17] hw/loongarch: Fix fdt memory node wrong 'reg' Song Gao
2024-03-07 14:52 ` [PULL 10/17] hw/loongarch: fdt adds cpu interrupt controller node Song Gao
2024-03-07 14:52 ` [PULL 11/17] hw/loongarch: fdt adds Extend I/O Interrupt Controller Song Gao
2024-03-07 14:52 ` [PULL 12/17] hw/loongarch: fdt adds pch_pic Controller Song Gao
2024-03-07 14:52 ` [PULL 13/17] hw/loongarch: fdt adds pch_msi Controller Song Gao
2024-03-07 14:52 ` [PULL 14/17] hw/loongarch: fdt adds pcie irq_map node Song Gao
2024-03-07 14:52 ` Song Gao [this message]
2024-03-07 15:22 ` [PULL 00/17] loongarch-to-apply queue gaosong
2024-03-07 15:23 ` Peter Maydell
2024-03-07 15:25   ` Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2024-04-28  8:51 Song Gao
2024-04-28  8:51 ` [PULL 15/17] hw/loongarch: fdt remove unused irqchip node Song Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240307145207.247913-16-gaosong@loongson.cn \
    --to=gaosong@loongson.cn \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).