- fix compile error on loongarch
- hw/loongarch: fix cpu hotplug reset
- hw/loongarch/boot: Use warn_report when no kernel filename
- hw/loongarch: clean code
- hw/loongarch: Add KVM pch msi device support
- hw/loongarch: Add KVM pch pic device support
- hw/loongarch: Add KVM extioi device support
- hw/loongarch: Add KVM IPI device support
- hw/loongarch/virt: Update the ACPI table for hotplug cpu
- hw/loongarch/virt: Add basic CPU plug support
- hw/loongarch/virt: Add CPU topology support
- accel/kvm/kvm-all: Fixes the missing break in vCPU unpark logic
- gdbstub: Add helper function to unregister GDB register space
- physmem: Add helper function to destroy CPU AddressSpace
- hw/acpi: Update CPUs AML with cpu-(ctrl)dev change
- hw/acpi: Update ACPI GED framework to support vCPU Hotplug
- hw/acpi: Move CPU ctrl-dev MMIO region len macro to common header file
- accel/kvm: Extract common KVM vCPU {creation,parking} code
- target/loongarch: Add steal time support on migration
- linux-headers: loongarch: Add kvm_para.h and unistd_64.h
- target/loongarch/kvm: Implement LoongArch PMU extension
- target/loongarch: Implement lbt registers save/restore function
- target/loongarch: Add loongson binary translation feature
- sync loongarch linux-headers
- target/loongarch: Avoid bits shift exceeding width of bool type
- target/loongarch: Use explicit little-endian LD/ST API
- target/loongarch: fix -Werror=maybe-uninitialized false-positive
- target/loongarch: Support QMP dump-guest-memory
- target/loongarch/kvm: Add vCPU reset function
- target/loongarch: Add compatible support about VM reboot
- target/loongarch: Fix cpu_reset set wrong CSR_CRMD
- target/loongarch: Set CSR_PRCFG1 and CSR_PRCFG2 values
- target/loongarch: Remove avail_64 in trans_srai_w() and simplify it
- target/loongarch/kvm: Add software breakpoint support
- target/loongarch: Add loongarch vector property unconditionally
- target/loongarch/kvm: Fix VM recovery from disk failures
- target/loongarch: Put cpucfg operation before CSR register
- target/loongarch: Add TCG macro in structure CPUArchState
- hw/arm/virt-acpi-build.c: Migrate SPCR creation to common location
- hw/loongarch/virt: Add FDT table support with acpi ged pm register
- hw/loongarch/virt: Add description for virt machine type
- hw/loongarch: Add acpi SPCR table support
- hw/loongarch: virt: pass random seed to fdt
- hw/loongarch: virt: support up to 4 serial ports
- hw/loongarch: Remove default enable with VIRTIO_VGA device
- hw/loongarch: Fix length for lowram in ACPI SRAT
- hw/loongarch/virt: Remove unused assignment
- hw/loongarch: Change the tpm support by default
- hw/loongarch/boot.c: fix out-of-bound reading
- hw/loongarch/virt: Use MemTxAttrs interface for misc ops
- tests/libqos: Add loongarch virt machine node
- hw/loongarch: Remove minimum and default memory size
- hw/loongarch: Refine system dram memory region
- hw/loongarch: Refine fwcfg memory map
- hw/loongarch: Refine fadt memory table for numa memory
- hw/loongarch: Refine acpi srat table for numa memory
- hw/loongarch: Add VM mode in IOCSR feature register in kvm mode
- hw/loongarch: Refine default numa id calculation
- hw/loongarch: Rename LoongArchMachineState with LoongArchVirtMachineState
- hw/loongarch: Rename LOONGARCH_MACHINE with LOONGARCH_VIRT_MACHINE
- hw/loongarch: move memory map to boot.c
- loongarch: switch boards to "default y"
- hw/loongarch: Add cells missing from rtc node
- hw/loongarch: Add cells missing from uart node
- hw/loongarch: fdt remove unused irqchip node
- hw/loongarch: fdt adds pcie irq_map node
- hw/loongarch: fdt adds pch_msi Controller
- hw/loongarch: fdt adds pch_pic Controller
- hw/loongarch: fdt adds Extend I/O Interrupt Controller
- hw/loongarch: fdt adds cpu interrupt controller node
- hw/loongarch: Init efi_fdt table
- hw/loongarch: Init efi_initrd table
- hw/loongarch: Init efi_boot_memmap table
- hw/loongarch: Init efi_system_table
- hw/loongarch: Add init_cmdline
- hw/loongarch: Add slave cpu boot_code
- hw/loongarch: Add load initrd
- hw/loongarch: Move boot functions to boot.c
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
(cherry picked from commit 04ca9e6c8ff19630116722240ae0136cea831c5c)
138 lines
5.1 KiB
Diff
138 lines
5.1 KiB
Diff
From 1325effbd595781b9ab75dceab9f87944156c606 Mon Sep 17 00:00:00 2001
|
|
From: Song Gao <gaosong@loongson.cn>
|
|
Date: Fri, 26 Apr 2024 17:15:48 +0800
|
|
Subject: [PATCH 13/78] hw/loongarch: fdt adds pcie irq_map node
|
|
|
|
This patch adds pcie irq_map node for FDT.
|
|
|
|
Signed-off-by: Song Gao <gaosong@loongson.cn>
|
|
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
|
|
Message-Id: <20240426091551.2397867-15-gaosong@loongson.cn>
|
|
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
|
|
---
|
|
hw/loongarch/virt.c | 73 ++++++++++++++++++++++++++++++++++++++++++---
|
|
1 file changed, 69 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
|
|
index 032106ebad..c32cc3c818 100644
|
|
--- a/hw/loongarch/virt.c
|
|
+++ b/hw/loongarch/virt.c
|
|
@@ -379,7 +379,62 @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams)
|
|
g_free(nodename);
|
|
}
|
|
|
|
-static void fdt_add_pcie_node(const LoongArchMachineState *lams)
|
|
+static void fdt_add_pcie_irq_map_node(const LoongArchMachineState *lams,
|
|
+ char *nodename,
|
|
+ uint32_t *pch_pic_phandle)
|
|
+{
|
|
+ int pin, dev;
|
|
+ uint32_t irq_map_stride = 0;
|
|
+ uint32_t full_irq_map[GPEX_NUM_IRQS *GPEX_NUM_IRQS * 10] = {};
|
|
+ uint32_t *irq_map = full_irq_map;
|
|
+ const MachineState *ms = MACHINE(lams);
|
|
+
|
|
+ /* This code creates a standard swizzle of interrupts such that
|
|
+ * each device's first interrupt is based on it's PCI_SLOT number.
|
|
+ * (See pci_swizzle_map_irq_fn())
|
|
+ *
|
|
+ * We only need one entry per interrupt in the table (not one per
|
|
+ * possible slot) seeing the interrupt-map-mask will allow the table
|
|
+ * to wrap to any number of devices.
|
|
+ */
|
|
+
|
|
+ for (dev = 0; dev < GPEX_NUM_IRQS; dev++) {
|
|
+ int devfn = dev * 0x8;
|
|
+
|
|
+ for (pin = 0; pin < GPEX_NUM_IRQS; pin++) {
|
|
+ int irq_nr = 16 + ((pin + PCI_SLOT(devfn)) % GPEX_NUM_IRQS);
|
|
+ int i = 0;
|
|
+
|
|
+ /* Fill PCI address cells */
|
|
+ irq_map[i] = cpu_to_be32(devfn << 8);
|
|
+ i += 3;
|
|
+
|
|
+ /* Fill PCI Interrupt cells */
|
|
+ irq_map[i] = cpu_to_be32(pin + 1);
|
|
+ i += 1;
|
|
+
|
|
+ /* Fill interrupt controller phandle and cells */
|
|
+ irq_map[i++] = cpu_to_be32(*pch_pic_phandle);
|
|
+ irq_map[i++] = cpu_to_be32(irq_nr);
|
|
+
|
|
+ if (!irq_map_stride) {
|
|
+ irq_map_stride = i;
|
|
+ }
|
|
+ irq_map += irq_map_stride;
|
|
+ }
|
|
+ }
|
|
+
|
|
+
|
|
+ qemu_fdt_setprop(ms->fdt, nodename, "interrupt-map", full_irq_map,
|
|
+ GPEX_NUM_IRQS * GPEX_NUM_IRQS *
|
|
+ irq_map_stride * sizeof(uint32_t));
|
|
+ qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupt-map-mask",
|
|
+ 0x1800, 0, 0, 0x7);
|
|
+}
|
|
+
|
|
+static void fdt_add_pcie_node(const LoongArchMachineState *lams,
|
|
+ uint32_t *pch_pic_phandle,
|
|
+ uint32_t *pch_msi_phandle)
|
|
{
|
|
char *nodename;
|
|
hwaddr base_mmio = VIRT_PCI_MEM_BASE;
|
|
@@ -410,6 +465,11 @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams)
|
|
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(lams, nodename, pch_pic_phandle);
|
|
+
|
|
g_free(nodename);
|
|
}
|
|
|
|
@@ -569,7 +629,10 @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
|
|
return dev;
|
|
}
|
|
|
|
-static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams)
|
|
+static void loongarch_devices_init(DeviceState *pch_pic,
|
|
+ LoongArchMachineState *lams,
|
|
+ uint32_t *pch_pic_phandle,
|
|
+ uint32_t *pch_msi_phandle)
|
|
{
|
|
MachineClass *mc = MACHINE_GET_CLASS(lams);
|
|
DeviceState *gpex_dev;
|
|
@@ -615,6 +678,9 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
|
|
gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i);
|
|
}
|
|
|
|
+ /* Add pcie node */
|
|
+ fdt_add_pcie_node(lams, pch_pic_phandle, pch_msi_phandle);
|
|
+
|
|
serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0,
|
|
qdev_get_gpio_in(pch_pic,
|
|
VIRT_UART_IRQ - VIRT_GSI_BASE),
|
|
@@ -772,7 +838,7 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
|
|
/* Add PCH MSI node */
|
|
fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle);
|
|
|
|
- loongarch_devices_init(pch_pic, lams);
|
|
+ loongarch_devices_init(pch_pic, lams, &pch_pic_phandle, &pch_msi_phandle);
|
|
}
|
|
|
|
static void loongarch_firmware_init(LoongArchMachineState *lams)
|
|
@@ -1048,7 +1114,6 @@ static void loongarch_init(MachineState *machine)
|
|
lams->powerdown_notifier.notify = virt_powerdown_req;
|
|
qemu_register_powerdown_notifier(&lams->powerdown_notifier);
|
|
|
|
- fdt_add_pcie_node(lams);
|
|
/*
|
|
* Since lowmem region starts from 0 and Linux kernel legacy start address
|
|
* at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer
|
|
--
|
|
2.39.1
|
|
|