* [PULL 0/5] loongarch-to-apply queue
@ 2023-03-03 2:40 Song Gao
2023-03-03 2:40 ` [PULL 1/5] hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE Song Gao
` (5 more replies)
0 siblings, 6 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:40 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, peter.maydell
The following changes since commit 262312d7ba6e2966acedb4f9c134fd19176b4083:
Merge tag 'pull-testing-next-010323-1' of https://gitlab.com/stsquad/qemu into staging (2023-03-02 13:02:53 +0000)
are available in the Git repository at:
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230303
for you to fetch changes up to 0d588c4f999699a430b32c563fe9ccc1710b8fd7:
hw/loongarch/virt: add system_powerdown hmp command support (2023-03-03 09:37:30 +0800)
----------------------------------------------------------------
pull-loongarch-20230303
----------------------------------------------------------------
Bibo Mao (1):
hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE
Song Gao (4):
loongarch: Add smbios command line option.
docs/system/loongarch: update loongson3.rst and rename it to virt.rst
target/loongarch: Implement Chip Configuraiton Version Register(0x0000)
hw/loongarch/virt: add system_powerdown hmp command support
docs/system/loongarch/{loongson3.rst => virt.rst} | 97 +++++++++--------------
hw/loongarch/acpi-build.c | 3 +-
hw/loongarch/virt.c | 20 ++++-
include/hw/loongarch/virt.h | 1 +
include/hw/pci-host/ls7a.h | 17 ++--
qemu-options.hx | 2 +-
target/loongarch/cpu.c | 2 +
target/loongarch/cpu.h | 1 +
8 files changed, 70 insertions(+), 73 deletions(-)
rename docs/system/loongarch/{loongson3.rst => virt.rst} (51%)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PULL 1/5] hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
@ 2023-03-03 2:40 ` Song Gao
2023-03-03 2:41 ` [PULL 2/5] loongarch: Add smbios command line option Song Gao
` (4 subsequent siblings)
5 siblings, 0 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:40 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, peter.maydell, Bibo Mao
From: Bibo Mao <maobibo@loongson.cn>
In theory gsi base can start from 0 on loongarch virt machine,
however gsi base is hard-coded in linux kernel loongarch system,
else system fails to boot.
This patch renames macro PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE,
keeps value unchanged. GSI base is common concept in acpi spec
and easy to understand.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221228030719.991878-1-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
hw/loongarch/acpi-build.c | 2 +-
hw/loongarch/virt.c | 8 ++++----
include/hw/pci-host/ls7a.h | 17 +++++++++--------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index f551296a0e..8aed50e858 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -271,7 +271,7 @@ static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams)
.pio.size = VIRT_PCI_IO_SIZE,
.ecam.base = VIRT_PCI_CFG_BASE,
.ecam.size = VIRT_PCI_CFG_SIZE,
- .irq = PCH_PIC_IRQ_OFFSET + VIRT_DEVICE_IRQS,
+ .irq = VIRT_GSI_BASE + VIRT_DEVICE_IRQS,
.bus = lams->pci_bus,
};
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 66be925068..49d25059f8 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -432,7 +432,7 @@ static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, VIRT_GED_REG_ADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
- qdev_get_gpio_in(pch_pic, VIRT_SCI_IRQ - PCH_PIC_IRQ_OFFSET));
+ qdev_get_gpio_in(pch_pic, VIRT_SCI_IRQ - VIRT_GSI_BASE));
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
return dev;
}
@@ -452,7 +452,7 @@ static DeviceState *create_platform_bus(DeviceState *pch_pic)
sysbus = SYS_BUS_DEVICE(dev);
for (i = 0; i < VIRT_PLATFORM_BUS_NUM_IRQS; i++) {
- irq = VIRT_PLATFORM_BUS_IRQ - PCH_PIC_IRQ_OFFSET + i;
+ irq = VIRT_PLATFORM_BUS_IRQ - VIRT_GSI_BASE + i;
sysbus_connect_irq(sysbus, i, qdev_get_gpio_in(pch_pic, irq));
}
@@ -509,7 +509,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0,
qdev_get_gpio_in(pch_pic,
- VIRT_UART_IRQ - PCH_PIC_IRQ_OFFSET),
+ VIRT_UART_IRQ - VIRT_GSI_BASE),
115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);
fdt_add_uart_node(lams);
@@ -531,7 +531,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *
create_unimplemented_device("pci-dma-cfg", 0x1001041c, 0x4);
sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE,
qdev_get_gpio_in(pch_pic,
- VIRT_RTC_IRQ - PCH_PIC_IRQ_OFFSET));
+ VIRT_RTC_IRQ - VIRT_GSI_BASE));
fdt_add_rtc_node(lams);
pm_mem = g_new(MemoryRegion, 1);
diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h
index ff4b979912..e753449593 100644
--- a/include/hw/pci-host/ls7a.h
+++ b/include/hw/pci-host/ls7a.h
@@ -26,24 +26,25 @@
#define VIRT_PCH_MSI_ADDR_LOW 0x2FF00000UL
/*
- * According to the kernel pch irq start from 64 offset
- * 0 ~ 16 irqs used for non-pci device while 16 ~ 64 irqs
- * used for pci device.
+ * GSI_BASE is hard-coded with 64 in linux kernel, else kernel fails to boot
+ * 0 - 15 GSI for ISA devices even if there is no ISA devices
+ * 16 - 63 GSI for CPU devices such as timers/perf monitor etc
+ * 64 - GSI for external devices
*/
#define VIRT_PCH_PIC_IRQ_NUM 32
-#define PCH_PIC_IRQ_OFFSET 64
+#define VIRT_GSI_BASE 64
#define VIRT_DEVICE_IRQS 16
-#define VIRT_UART_IRQ (PCH_PIC_IRQ_OFFSET + 2)
+#define VIRT_UART_IRQ (VIRT_GSI_BASE + 2)
#define VIRT_UART_BASE 0x1fe001e0
#define VIRT_UART_SIZE 0X100
-#define VIRT_RTC_IRQ (PCH_PIC_IRQ_OFFSET + 3)
+#define VIRT_RTC_IRQ (VIRT_GSI_BASE + 3)
#define VIRT_MISC_REG_BASE (VIRT_PCH_REG_BASE + 0x00080000)
#define VIRT_RTC_REG_BASE (VIRT_MISC_REG_BASE + 0x00050100)
#define VIRT_RTC_LEN 0x100
-#define VIRT_SCI_IRQ (PCH_PIC_IRQ_OFFSET + 4)
+#define VIRT_SCI_IRQ (VIRT_GSI_BASE + 4)
#define VIRT_PLATFORM_BUS_BASEADDRESS 0x16000000
#define VIRT_PLATFORM_BUS_SIZE 0x2000000
#define VIRT_PLATFORM_BUS_NUM_IRQS 2
-#define VIRT_PLATFORM_BUS_IRQ 69
+#define VIRT_PLATFORM_BUS_IRQ (VIRT_GSI_BASE + 5)
#endif
--
2.31.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PULL 2/5] loongarch: Add smbios command line option.
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
2023-03-03 2:40 ` [PULL 1/5] hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE Song Gao
@ 2023-03-03 2:41 ` Song Gao
2023-03-03 2:41 ` [PULL 3/5] docs/system/loongarch: update loongson3.rst and rename it to virt.rst Song Gao
` (3 subsequent siblings)
5 siblings, 0 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:41 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, peter.maydell, Michael S . Tsirkin, Markus Armbruster
LoongArch has enabled CONFIG_SMBIOS, but didn't enable CLI '-smbios'.
Fixes: 3efa6fa1e629 ("hw/loongarch: Add smbios support")
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20230227035905.1290953-2-gaosong@loongson.cn>
---
qemu-options.hx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index beeb4475ba..d42f60fb91 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2585,7 +2585,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
" specify SMBIOS type 17 fields\n"
"-smbios type=41[,designation=str][,kind=str][,instance=%d][,pcidev=str]\n"
" specify SMBIOS type 41 fields\n",
- QEMU_ARCH_I386 | QEMU_ARCH_ARM)
+ QEMU_ARCH_I386 | QEMU_ARCH_ARM | QEMU_ARCH_LOONGARCH)
SRST
``-smbios file=binary``
Load SMBIOS entry from binary file.
--
2.31.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PULL 3/5] docs/system/loongarch: update loongson3.rst and rename it to virt.rst
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
2023-03-03 2:40 ` [PULL 1/5] hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE Song Gao
2023-03-03 2:41 ` [PULL 2/5] loongarch: Add smbios command line option Song Gao
@ 2023-03-03 2:41 ` Song Gao
2023-03-03 2:41 ` [PULL 4/5] target/loongarch: Implement Chip Configuraiton Version Register(0x0000) Song Gao
` (2 subsequent siblings)
5 siblings, 0 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:41 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, peter.maydell
Since the EDK2 had already support LoongArch, update build bios,
and update cpu type, cross-tools.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20230227035905.1290953-1-gaosong@loongson.cn>
---
.../loongarch/{loongson3.rst => virt.rst} | 97 ++++++++-----------
1 file changed, 38 insertions(+), 59 deletions(-)
rename docs/system/loongarch/{loongson3.rst => virt.rst} (51%)
diff --git a/docs/system/loongarch/loongson3.rst b/docs/system/loongarch/virt.rst
similarity index 51%
rename from docs/system/loongarch/loongson3.rst
rename to docs/system/loongarch/virt.rst
index 489ea20f8f..c37268b404 100644
--- a/docs/system/loongarch/loongson3.rst
+++ b/docs/system/loongarch/virt.rst
@@ -19,14 +19,14 @@ The ``virt`` machine supports:
- Fw_cfg device
- PCI/PCIe devices
- Memory device
-- CPU device. Type: la464-loongarch-cpu.
+- CPU device. Type: la464.
CPU and machine Type
--------------------
The ``qemu-system-loongarch64`` provides emulation for virt
machine. You can specify the machine type ``virt`` and
-cpu type ``la464-loongarch-cpu``.
+cpu type ``la464``.
Boot options
------------
@@ -35,95 +35,74 @@ We can boot the LoongArch virt machine by specifying the uefi bios,
initrd, and linux kernel. And those source codes and binary files
can be accessed by following steps.
-(1) booting command:
+(1) Build qemu-system-loongarch64:
.. code-block:: bash
- $ qemu-system-loongarch64 -machine virt -m 4G -cpu la464-loongarch-cpu \
- -smp 1 -bios QEMU_EFI.fd -kernel vmlinuz.efi -initrd initrd.img \
- -append "root=/dev/ram rdinit=/sbin/init console=ttyS0,115200" \
- --nographic
-
-Note: The running speed may be a little slow, as the performance of our
-qemu and uefi bios is not perfect, and it is being fixed.
-
-(2) cross compiler tools:
-
-.. code-block:: bash
-
- wget https://github.com/loongson/build-tools/releases/download/ \
- 2022.05.29/loongarch64-clfs-5.0-cross-tools-gcc-full.tar.xz
-
- tar -vxf loongarch64-clfs-5.0-cross-tools-gcc-full.tar.xz
-
-(3) qemu compile configure option:
-
-.. code-block:: bash
-
- ./configure --disable-rdma --disable-pvrdma --prefix=usr \
+ ./configure --disable-rdma --disable-pvrdma --prefix=/usr \
--target-list="loongarch64-softmmu" \
--disable-libiscsi --disable-libnfs --disable-libpmem \
--disable-glusterfs --enable-libusb --enable-usb-redir \
--disable-opengl --disable-xen --enable-spice \
--enable-debug --disable-capstone --disable-kvm \
--enable-profiler
- make
+ make -j8
-(4) uefi bios source code and compile method:
+(2) Set cross tools:
.. code-block:: bash
- git clone https://github.com/loongson/edk2-LoongarchVirt.git
-
- cd edk2-LoongarchVirt
-
- git submodule update --init
-
- export PATH=$YOUR_COMPILER_PATH/bin:$PATH
-
- export WORKSPACE=`pwd`
+ wget https://github.com/loongson/build-tools/releases/download/2022.09.06/loongarch64-clfs-6.3-cross-tools-gcc-glibc.tar.xz
- export PACKAGES_PATH=$WORKSPACE/edk2-LoongarchVirt
+ tar -vxf loongarch64-clfs-6.3-cross-tools-gcc-glibc.tar.xz -C /opt
- export GCC5_LOONGARCH64_PREFIX=loongarch64-unknown-linux-gnu-
+ export PATH=/opt/cross-tools/bin:$PATH
+ export LD_LIBRARY_PATH=/opt/cross-tools/lib:$LD_LIBRARY_PATH
+ export LD_LIBRARY_PATH=/opt/cross-tools/loongarch64-unknown-linux-gnu/lib/:$LD_LIBRARY_PATH
- edk2-LoongarchVirt/edksetup.sh
+Note: You need get the latest cross-tools at https://github.com/loongson/build-tools
- make -C edk2-LoongarchVirt/BaseTools
+(3) Build BIOS:
- build --buildtarget=DEBUG --tagname=GCC5 --arch=LOONGARCH64 --platform=OvmfPkg/LoongArchQemu/Loongson.dsc
+ See: https://github.com/tianocore/edk2-platforms/tree/master/Platform/Loongson/LoongArchQemuPkg#readme
- build --buildtarget=RELEASE --tagname=GCC5 --arch=LOONGARCH64 --platform=OvmfPkg/LoongArchQemu/Loongson.dsc
+Note: To build the release version of the bios, set --buildtarget=RELEASE,
+ the bios file path: Build/LoongArchQemu/RELEASE_GCC5/FV/QEMU_EFI.fd
-The efi binary file path:
-
- Build/LoongArchQemu/DEBUG_GCC5/FV/QEMU_EFI.fd
-
- Build/LoongArchQemu/RELEASE_GCC5/FV/QEMU_EFI.fd
-
-(5) linux kernel source code and compile method:
+(4) Build kernel:
.. code-block:: bash
git clone https://github.com/loongson/linux.git
- export PATH=$YOUR_COMPILER_PATH/bin:$PATH
-
- export LD_LIBRARY_PATH=$YOUR_COMPILER_PATH/lib:$LD_LIBRARY_PATH
+ cd linux
- export LD_LIBRARY_PATH=$YOUR_COMPILER_PATH/loongarch64-unknown-linux-gnu/lib/:$LD_LIBRARY_PATH
+ git checkout loongarch-next
make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu- loongson3_defconfig
- make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu-
-
- make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu- install
-
- make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu- modules_install
+ make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu- -j32
Note: The branch of linux source code is loongarch-next.
+ the kernel file: arch/loongarch/boot/vmlinuz.efi
-(6) initrd file:
+(5) Get initrd:
You can use busybox tool and the linux modules to make a initrd file. Or you can access the
binary files: https://github.com/yangxiaojuan-loongson/qemu-binary
+
+.. code-block:: bash
+
+ git clone https://github.com/yangxiaojuan-loongson/qemu-binary
+
+Note: the initrd file is ramdisk
+
+(6) Booting LoongArch:
+
+.. code-block:: bash
+
+ $ ./build/qemu-system-loongarch64 -machine virt -m 4G -cpu la464 \
+ -smp 1 -bios QEMU_EFI.fd -kernel vmlinuz.efi -initrd ramdisk \
+ -serial stdio -monitor telnet:localhost:4495,server,nowait \
+ -append "root=/dev/ram rdinit=/sbin/init console=ttyS0,115200" \
+ --nographic
--
2.31.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PULL 4/5] target/loongarch: Implement Chip Configuraiton Version Register(0x0000)
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
` (2 preceding siblings ...)
2023-03-03 2:41 ` [PULL 3/5] docs/system/loongarch: update loongson3.rst and rename it to virt.rst Song Gao
@ 2023-03-03 2:41 ` Song Gao
2023-03-03 2:41 ` [PULL 5/5] hw/loongarch/virt: add system_powerdown hmp command support Song Gao
2023-03-04 13:59 ` [PULL 0/5] loongarch-to-apply queue Peter Maydell
5 siblings, 0 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:41 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, peter.maydell
According to the 3A5000 manual 4.1 implement Chip Configuration
Version Register(0x0000).
Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230227071046.1445572-1-gaosong@loongson.cn>
---
target/loongarch/cpu.c | 2 ++
target/loongarch/cpu.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index d6513f2d9d..97e6579f6a 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -546,6 +546,8 @@ static void loongarch_qemu_write(void *opaque, hwaddr addr,
static uint64_t loongarch_qemu_read(void *opaque, hwaddr addr, unsigned size)
{
switch (addr) {
+ case VERSION_REG:
+ return 0x11ULL;
case FEATURE_REG:
return 1ULL << IOCSRF_MSI | 1ULL << IOCSRF_EXTIOI |
1ULL << IOCSRF_CSRIPI;
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index d60693fafe..e11c875188 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -28,6 +28,7 @@
#define IOCSRF_GMOD 9
#define IOCSRF_VM 11
+#define VERSION_REG 0x0
#define FEATURE_REG 0x8
#define VENDOR_REG 0x10
#define CPUNAME_REG 0x20
--
2.31.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PULL 5/5] hw/loongarch/virt: add system_powerdown hmp command support
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
` (3 preceding siblings ...)
2023-03-03 2:41 ` [PULL 4/5] target/loongarch: Implement Chip Configuraiton Version Register(0x0000) Song Gao
@ 2023-03-03 2:41 ` Song Gao
2023-03-04 13:59 ` [PULL 0/5] loongarch-to-apply queue Peter Maydell
5 siblings, 0 replies; 16+ messages in thread
From: Song Gao @ 2023-03-03 2:41 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, peter.maydell, Philippe Mathieu-Daudé
For loongarch virt machine, add powerdown notification callback
and send ACPI_POWER_DOWN_STATUS event by acpi ged. Also add
acpi dsdt table for ACPI_POWER_BUTTON_DEVICE device in this
patch.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20230303010548.295580-1-gaosong@loongson.cn>
---
hw/loongarch/acpi-build.c | 1 +
hw/loongarch/virt.c | 12 ++++++++++++
include/hw/loongarch/virt.h | 1 +
3 files changed, 14 insertions(+)
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index 8aed50e858..6cb2472d33 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -260,6 +260,7 @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
AML_SYSTEM_MEMORY,
VIRT_GED_MEM_ADDR);
}
+ acpi_dsdt_add_power_button(dsdt);
}
static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams)
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 49d25059f8..38ef7cc49f 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -316,6 +316,14 @@ static void virt_machine_done(Notifier *notifier, void *data)
loongarch_acpi_setup(lams);
}
+static void virt_powerdown_req(Notifier *notifier, void *opaque)
+{
+ LoongArchMachineState *s = container_of(notifier,
+ LoongArchMachineState, powerdown_notifier);
+
+ acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
+}
+
struct memmap_entry {
uint64_t address;
uint64_t length;
@@ -859,6 +867,10 @@ static void loongarch_init(MachineState *machine)
VIRT_PLATFORM_BUS_IRQ);
lams->machine_done.notify = virt_machine_done;
qemu_add_machine_init_done_notifier(&lams->machine_done);
+ /* connect powerdown request */
+ 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
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index f5f818894e..7ae8a91229 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -45,6 +45,7 @@ struct LoongArchMachineState {
/* State for other subsystems/APIs: */
FWCfgState *fw_cfg;
Notifier machine_done;
+ Notifier powerdown_notifier;
OnOffAuto acpi;
char *oem_id;
char *oem_table_id;
--
2.31.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
` (4 preceding siblings ...)
2023-03-03 2:41 ` [PULL 5/5] hw/loongarch/virt: add system_powerdown hmp command support Song Gao
@ 2023-03-04 13:59 ` Peter Maydell
5 siblings, 0 replies; 16+ messages in thread
From: Peter Maydell @ 2023-03-04 13:59 UTC (permalink / raw)
To: Song Gao; +Cc: qemu-devel, richard.henderson
On Fri, 3 Mar 2023 at 02:41, Song Gao <gaosong@loongson.cn> wrote:
>
> The following changes since commit 262312d7ba6e2966acedb4f9c134fd19176b4083:
>
> Merge tag 'pull-testing-next-010323-1' of https://gitlab.com/stsquad/qemu into staging (2023-03-02 13:02:53 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230303
>
> for you to fetch changes up to 0d588c4f999699a430b32c563fe9ccc1710b8fd7:
>
> hw/loongarch/virt: add system_powerdown hmp command support (2023-03-03 09:37:30 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20230303
>
> ----------------------------------------------------------------
> Bibo Mao (1):
> hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE
>
> Song Gao (4):
> loongarch: Add smbios command line option.
> docs/system/loongarch: update loongson3.rst and rename it to virt.rst
> target/loongarch: Implement Chip Configuraiton Version Register(0x0000)
> hw/loongarch/virt: add system_powerdown hmp command support
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2024-05-16 9:28 ` Peter Maydell
@ 2024-05-17 1:06 ` gaosong
0 siblings, 0 replies; 16+ messages in thread
From: gaosong @ 2024-05-17 1:06 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, richard.henderson
在 2024/5/16 下午5:28, Peter Maydell 写道:
> On Thu, 16 May 2024 at 10:12, Song Gao <gaosong@loongson.cn> wrote:
>> The following changes since commit 922582ace2df59572a671f5c0c5c6c5c706995e5:
>>
>> Merge tag 'pull-hppa-20240515' of https://gitlab.com/rth7680/qemu into staging (2024-05-15 11:46:58 +0200)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240516
>>
>> for you to fetch changes up to d55d16700a2e2b36c7e34724d4d77f4a75c5243a:
>>
>> target/loongarch/kvm: fpu save the vreg registers high 192bit (2024-05-16 16:32:35 +0800)
>>
>> ----------------------------------------------------------------
>> pull-loongarch-20240516
>>
>> ----------------------------------------------------------------
>> Bibo Mao (3):
>> hw/loongarch: Add compat machine for 9.1
>> hw/loongarch: Remove minimum and default memory size
>> tests: Add migration test for loongarch64
> RTH: I had a comment about adding the versioned machine type, so we
> should hold off on applying this until that is resolved, I think.
Agreed, We will try resolved it. Thanks for your explanation.
Thanks.
Song Gao
> thanks
> -- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2024-05-16 9:11 Song Gao
@ 2024-05-16 9:28 ` Peter Maydell
2024-05-17 1:06 ` gaosong
0 siblings, 1 reply; 16+ messages in thread
From: Peter Maydell @ 2024-05-16 9:28 UTC (permalink / raw)
To: Song Gao; +Cc: qemu-devel, richard.henderson
On Thu, 16 May 2024 at 10:12, Song Gao <gaosong@loongson.cn> wrote:
>
> The following changes since commit 922582ace2df59572a671f5c0c5c6c5c706995e5:
>
> Merge tag 'pull-hppa-20240515' of https://gitlab.com/rth7680/qemu into staging (2024-05-15 11:46:58 +0200)
>
> are available in the Git repository at:
>
> https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240516
>
> for you to fetch changes up to d55d16700a2e2b36c7e34724d4d77f4a75c5243a:
>
> target/loongarch/kvm: fpu save the vreg registers high 192bit (2024-05-16 16:32:35 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20240516
>
> ----------------------------------------------------------------
> Bibo Mao (3):
> hw/loongarch: Add compat machine for 9.1
> hw/loongarch: Remove minimum and default memory size
> tests: Add migration test for loongarch64
RTH: I had a comment about adding the versioned machine type, so we
should hold off on applying this until that is resolved, I think.
thanks
-- PMM
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PULL 0/5] loongarch-to-apply queue
@ 2024-05-16 9:11 Song Gao
2024-05-16 9:28 ` Peter Maydell
0 siblings, 1 reply; 16+ messages in thread
From: Song Gao @ 2024-05-16 9:11 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson
The following changes since commit 922582ace2df59572a671f5c0c5c6c5c706995e5:
Merge tag 'pull-hppa-20240515' of https://gitlab.com/rth7680/qemu into staging (2024-05-15 11:46:58 +0200)
are available in the Git repository at:
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240516
for you to fetch changes up to d55d16700a2e2b36c7e34724d4d77f4a75c5243a:
target/loongarch/kvm: fpu save the vreg registers high 192bit (2024-05-16 16:32:35 +0800)
----------------------------------------------------------------
pull-loongarch-20240516
----------------------------------------------------------------
Bibo Mao (3):
hw/loongarch: Add compat machine for 9.1
hw/loongarch: Remove minimum and default memory size
tests: Add migration test for loongarch64
Song Gao (2):
target/loongarch/kvm: Fix VM recovery from disk failures
target/loongarch/kvm: fpu save the vreg registers high 192bit
hw/loongarch/virt.c | 66 +++++++++++++++++++++++---------
target/loongarch/kvm/kvm.c | 6 +++
target/loongarch/machine.c | 6 ++-
tests/migration/Makefile | 2 +-
tests/migration/loongarch64/Makefile | 18 +++++++++
tests/migration/loongarch64/a-b-kernel.S | 49 ++++++++++++++++++++++++
tests/migration/loongarch64/a-b-kernel.h | 16 ++++++++
tests/migration/migration-test.h | 3 ++
tests/qtest/meson.build | 2 +-
tests/qtest/migration-test.c | 10 +++++
10 files changed, 156 insertions(+), 22 deletions(-)
create mode 100644 tests/migration/loongarch64/Makefile
create mode 100644 tests/migration/loongarch64/a-b-kernel.S
create mode 100644 tests/migration/loongarch64/a-b-kernel.h
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2023-06-16 10:01 Song Gao
@ 2023-06-17 8:02 ` Richard Henderson
0 siblings, 0 replies; 16+ messages in thread
From: Richard Henderson @ 2023-06-17 8:02 UTC (permalink / raw)
To: Song Gao, qemu-devel
On 6/16/23 12:01, Song Gao wrote:
> The following changes since commit 7efd65423ab22e6f5890ca08ae40c84d6660242f:
>
> Merge tag 'pull-riscv-to-apply-20230614' ofhttps://github.com/alistair23/qemu into staging (2023-06-14 05:28:51 +0200)
>
> are available in the Git repository at:
>
> https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230616
>
> for you to fetch changes up to 505aa8d8f29b79fcef77563bb4124208badbd8d4:
>
> target/loongarch: Fix CSR.DMW0-3.VSEG check (2023-06-16 17:58:46 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20230616
>
> * Fix CSR.DMW0-3.VSEG check
> * Add cpu arch_id support
> * Set physical cpuid route for LoongArch ipi device
> * Add numa support
> * Supplement cpu topology arguments
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.
r~
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PULL 0/5] loongarch-to-apply queue
@ 2023-06-16 10:01 Song Gao
2023-06-17 8:02 ` Richard Henderson
0 siblings, 1 reply; 16+ messages in thread
From: Song Gao @ 2023-06-16 10:01 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson
The following changes since commit 7efd65423ab22e6f5890ca08ae40c84d6660242f:
Merge tag 'pull-riscv-to-apply-20230614' of https://github.com/alistair23/qemu into staging (2023-06-14 05:28:51 +0200)
are available in the Git repository at:
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230616
for you to fetch changes up to 505aa8d8f29b79fcef77563bb4124208badbd8d4:
target/loongarch: Fix CSR.DMW0-3.VSEG check (2023-06-16 17:58:46 +0800)
----------------------------------------------------------------
pull-loongarch-20230616
* Fix CSR.DMW0-3.VSEG check
* Add cpu arch_id support
* Set physical cpuid route for LoongArch ipi device
* Add numa support
* Supplement cpu topology arguments
----------------------------------------------------------------
Jiajie Chen (1):
target/loongarch: Fix CSR.DMW0-3.VSEG check
Tianrui Zhao (4):
hw/loongarch/virt: Add cpu arch_id support
hw/intc: Set physical cpuid route for LoongArch ipi device
hw/loongarch: Add numa support
hw/loongarch: Supplement cpu topology arguments
hw/intc/loongarch_ipi.c | 44 +++++++++++--
hw/loongarch/Kconfig | 1 +
hw/loongarch/acpi-build.c | 78 ++++++++++++++++++-----
hw/loongarch/virt.c | 144 ++++++++++++++++++++++++++++++++++++++----
target/loongarch/cpu.h | 2 +
target/loongarch/tlb_helper.c | 4 +-
6 files changed, 235 insertions(+), 38 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2023-05-15 11:19 Song Gao
@ 2023-05-15 17:13 ` Richard Henderson
0 siblings, 0 replies; 16+ messages in thread
From: Richard Henderson @ 2023-05-15 17:13 UTC (permalink / raw)
To: Song Gao, qemu-devel
On 5/15/23 04:19, Song Gao wrote:
> The following changes since commit 8844bb8d896595ee1d25d21c770e6e6f29803097:
>
> Merge tag 'or1k-pull-request-20230513' ofhttps://github.com/stffrdhrn/qemu into staging (2023-05-13 11:23:14 +0100)
>
> are available in the Git repository at:
>
> https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230515
>
> for you to fetch changes up to 7ef0eb35a4e6961d7e40f03f16ed241c95ae93f9:
>
> hw/intc: Add NULL pointer check on LoongArch ipi device (2023-05-15 19:09:33 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20230515
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.
r~
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PULL 0/5] loongarch-to-apply queue
@ 2023-05-15 11:19 Song Gao
2023-05-15 17:13 ` Richard Henderson
0 siblings, 1 reply; 16+ messages in thread
From: Song Gao @ 2023-05-15 11:19 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson
The following changes since commit 8844bb8d896595ee1d25d21c770e6e6f29803097:
Merge tag 'or1k-pull-request-20230513' of https://github.com/stffrdhrn/qemu into staging (2023-05-13 11:23:14 +0100)
are available in the Git repository at:
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230515
for you to fetch changes up to 7ef0eb35a4e6961d7e40f03f16ed241c95ae93f9:
hw/intc: Add NULL pointer check on LoongArch ipi device (2023-05-15 19:09:33 +0800)
----------------------------------------------------------------
pull-loongarch-20230515
----------------------------------------------------------------
Alexander Bulekov (1):
loongarch: mark loongarch_ipi_iocsr re-entrnacy safe
Song Gao (4):
tests/avocado: Add LoongArch machine start test
hw/loongarch/virt: Modify ipi as percpu device
hw/loongarch/virt: Set max 256 cpus support on loongarch virt machine
hw/intc: Add NULL pointer check on LoongArch ipi device
MAINTAINERS | 1 +
hw/intc/loongarch_extioi.c | 4 +-
hw/intc/loongarch_ipi.c | 86 +++++++++++++++++++++-----------------
hw/intc/trace-events | 1 +
hw/loongarch/virt.c | 25 ++++++-----
include/hw/intc/loongarch_extioi.h | 10 +++--
include/hw/intc/loongarch_ipi.h | 10 ++---
include/hw/loongarch/virt.h | 3 +-
tests/avocado/machine_loongarch.py | 58 +++++++++++++++++++++++++
9 files changed, 136 insertions(+), 62 deletions(-)
create mode 100644 tests/avocado/machine_loongarch.py
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PULL 0/5] loongarch-to-apply queue
2022-10-17 6:39 Song Gao
@ 2022-10-17 21:22 ` Stefan Hajnoczi
0 siblings, 0 replies; 16+ messages in thread
From: Stefan Hajnoczi @ 2022-10-17 21:22 UTC (permalink / raw)
To: Song Gao; +Cc: qemu-devel, richard.henderson, stefanha
[-- Attachment #1: Type: text/plain, Size: 115 bytes --]
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any user-visible changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PULL 0/5] loongarch-to-apply queue
@ 2022-10-17 6:39 Song Gao
2022-10-17 21:22 ` Stefan Hajnoczi
0 siblings, 1 reply; 16+ messages in thread
From: Song Gao @ 2022-10-17 6:39 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, stefanha
The following changes since commit 5c2439a92ce4a1c5a53070bd803d6f7647e702ca:
Merge tag 'pull-riscv-to-apply-20221014' of https://github.com/alistair23/qemu into staging (2022-10-16 15:53:13 -0400)
are available in the Git repository at:
https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221017
for you to fetch changes up to 5ef4a4af8b41fb175374726f379a2aea79929023:
hw/intc: Fix LoongArch ipi device emulation (2022-10-17 10:28:35 +0800)
----------------------------------------------------------------
pull-loongarch-20221017
----------------------------------------------------------------
Song Gao (3):
target/loongarch: bstrins.w src register need EXT_NONE
target/loongarch: Fix fnm{sub/add}_{s/d} set wrong flags
softfloat: logB(0) should raise divideByZero exception
WANG Xuerui (1):
linux-user: Fix struct statfs ABI on loongarch64
Xiaojuan Yang (1):
hw/intc: Fix LoongArch ipi device emulation
fpu/softfloat-parts.c.inc | 1 +
hw/intc/loongarch_ipi.c | 1 -
linux-user/syscall_defs.h | 3 ++-
target/loongarch/insn_trans/trans_bit.c.inc | 36 ++++++++++++++++----------
target/loongarch/insn_trans/trans_farith.c.inc | 12 ++++-----
5 files changed, 31 insertions(+), 22 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-05-17 1:06 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-03 2:40 [PULL 0/5] loongarch-to-apply queue Song Gao
2023-03-03 2:40 ` [PULL 1/5] hw/loongarch/virt: rename PCH_PIC_IRQ_OFFSET with VIRT_GSI_BASE Song Gao
2023-03-03 2:41 ` [PULL 2/5] loongarch: Add smbios command line option Song Gao
2023-03-03 2:41 ` [PULL 3/5] docs/system/loongarch: update loongson3.rst and rename it to virt.rst Song Gao
2023-03-03 2:41 ` [PULL 4/5] target/loongarch: Implement Chip Configuraiton Version Register(0x0000) Song Gao
2023-03-03 2:41 ` [PULL 5/5] hw/loongarch/virt: add system_powerdown hmp command support Song Gao
2023-03-04 13:59 ` [PULL 0/5] loongarch-to-apply queue Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2024-05-16 9:11 Song Gao
2024-05-16 9:28 ` Peter Maydell
2024-05-17 1:06 ` gaosong
2023-06-16 10:01 Song Gao
2023-06-17 8:02 ` Richard Henderson
2023-05-15 11:19 Song Gao
2023-05-15 17:13 ` Richard Henderson
2022-10-17 6:39 Song Gao
2022-10-17 21:22 ` Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.