The following changes since commit f774a677507966222624a9b2859f06ede7608100:

Merge tag 'pull-target-arm-20241015-1' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2024-10-15 15:18:22 +0100)

https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20241016

for you to fetch changes up to e376c2d87cbbad3483adcd5e827bdd144edb7d2c:

hw/loongarch/fw_cfg: Build in common_ss[] (2024-10-16 16:06:07 +0800)

pull-loongarch-20241016

Bibo Mao (3):

acpi: ged: Add macro for acpi sleep control register

hw/loongarch/virt: Add FDT table support with acpi ged pm register

target/loongarch: Avoid bits shift exceeding width of bool type

Philippe Mathieu-Daudé (2):

hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion

hw/loongarch/fw_cfg: Build in common_ss[]

hw/acpi/generic_event_device.c | 6 +++---

hw/loongarch/meson.build | 2 +-

hw/loongarch/virt.c | 39 ++++++++++++++++++++++++++++++++++

include/hw/acpi/generic_event_device.h | 7 ++++--

include/hw/loongarch/virt.h | 1 -

target/loongarch/arch_dump.c | 6 +-----

6 files changed, 49 insertions(+), 12 deletions(-)

From: Bibo Mao <maobibo@loongson.cn>

ACPI ged is used for power management on LoongArch virt platform, in

general it is parsed from acpi table. However if system boot directly from

elf kernel, no UEFI bios is provided and acpi table cannot be used also.

Here acpi ged pm register is exposed with FDT table, it is compatbile

with syscon method in FDT table, only that acpi ged pm register is accessed

with 8-bit mode, rather with 32-bit mode.

hw/loongarch/virt.c | 39 +++++++++++++++++++++++++++++++++++++++

1 file changed, 39 insertions(+)

@@ -XXX,XX +XXX,XX @@ static void fdt_add_rtc_node(LoongArchVirtMachineState *lvms,

g_free(nodename);

}

+static void fdt_add_ged_reset(LoongArchVirtMachineState *lvms)

+{

+ char *name;

+ uint32_t ged_handle;

+ MachineState *ms = MACHINE(lvms);

+ hwaddr base = VIRT_GED_REG_ADDR;

+ hwaddr size = ACPI_GED_REG_COUNT;

+

+ ged_handle = qemu_fdt_alloc_phandle(ms->fdt);

+ name = g_strdup_printf("/ged@%" PRIx64, base);

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon");

+ qemu_fdt_setprop_cells(ms->fdt, name, "reg", 0x0, base, 0x0, size);

+ /* 8 bit registers */

+ qemu_fdt_setprop_cell(ms->fdt, name, "reg-shift", 0);

+ qemu_fdt_setprop_cell(ms->fdt, name, "reg-io-width", 1);

+ qemu_fdt_setprop_cell(ms->fdt, name, "phandle", ged_handle);

+ ged_handle = qemu_fdt_get_phandle(ms->fdt, name);

+ g_free(name);

+

+ name = g_strdup_printf("/reboot");

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-reboot");

+ qemu_fdt_setprop_cell(ms->fdt, name, "regmap", ged_handle);

+ qemu_fdt_setprop_cell(ms->fdt, name, "offset", ACPI_GED_REG_RESET);

+ qemu_fdt_setprop_cell(ms->fdt, name, "value", ACPI_GED_RESET_VALUE);

+ g_free(name);

+

+ name = g_strdup_printf("/poweroff");

+ qemu_fdt_add_subnode(ms->fdt, name);

+ qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-poweroff");

+ qemu_fdt_setprop_cell(ms->fdt, name, "regmap", ged_handle);

+ qemu_fdt_setprop_cell(ms->fdt, name, "offset", ACPI_GED_REG_SLEEP_CTL);

+ qemu_fdt_setprop_cell(ms->fdt, name, "value", ACPI_GED_SLP_EN |

+ (ACPI_GED_SLP_TYP_S5 << ACPI_GED_SLP_TYP_POS));

+ g_free(name);

+}

+

static void fdt_add_uart_node(LoongArchVirtMachineState *lvms,

uint32_t *pch_pic_phandle, hwaddr base,

int irq, bool chosen)

@@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic,

qdev_get_gpio_in(pch_pic,

VIRT_RTC_IRQ - VIRT_GSI_BASE));

fdt_add_rtc_node(lvms, pch_pic_phandle);

+ fdt_add_ged_reset(lvms);

/* acpi ged */

lvms->acpi_ged = create_acpi_ged(pch_pic, lvms);

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

include/hw/loongarch/virt.h | 1 -

1 file changed, 1 deletion(-)

diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h

--- a/include/hw/loongarch/virt.h

+++ b/include/hw/loongarch/virt.h

#ifndef HW_LOONGARCH_H

#define HW_LOONGARCH_H

-#include "target/loongarch/cpu.h"

#include "hw/boards.h"

#include "qemu/queue.h"

#include "hw/block/flash.h"

2.34.1

From: Bibo Mao <maobibo@loongson.cn>

Variable env->cf[i] is defined as bool type, it is treated as int type

with shift operation. However the max possible width is 56 for the shift

operation, exceeding the width of int type. And there is existing api

read_fcc() which is converted to u64 type with bitwise shift, it can be

used to dump fp registers into coredump note segment.

Resolves: Coverity CID 1561133

Signed-off-by: Bibo Mao <maobibo@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20240914064645.2099169-1-maobibo@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>

---

target/loongarch/arch_dump.c | 6 +-----

1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/target/loongarch/arch_dump.c b/target/loongarch/arch_dump.c

--- a/target/loongarch/arch_dump.c

+++ b/target/loongarch/arch_dump.c

@@ -XXX,XX +XXX,XX @@ static int loongarch_write_elf64_fprpreg(WriteCoreDumpFunction f,

loongarch_note_init(&note, s, "CORE", 5, NT_PRFPREG, sizeof(note.fpu));

note.fpu.fcsr = cpu_to_dump64(s, env->fcsr0);

- for (i = 0; i < 8; i++) {

- note.fpu.fcc |= env->cf[i] << (8 * i);

- }

- note.fpu.fcc = cpu_to_dump64(s, note.fpu.fcc);

+ note.fpu.fcc = cpu_to_dump64(s, read_fcc(env));

for (i = 0; i < 32; ++i) {

note.fpu.fpr[i] = cpu_to_dump64(s, env->fpr[i].vreg.UD[0]);

2.34.1

From: Bibo Mao <maobibo@loongson.cn>

Macro definition is added for acpi sleep control register, ged emulation

driver can use the macro , also it can be used in FDT table if ged is

exposed with FDT table.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Message-Id: <20240918014206.2165821-2-maobibo@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>

hw/acpi/generic_event_device.c | 6 +++---

include/hw/acpi/generic_event_device.h | 7 +++++--

2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c

--- a/hw/acpi/generic_event_device.c

+++ b/hw/acpi/generic_event_device.c

@@ -XXX,XX +XXX,XX @@ static void ged_regs_write(void *opaque, hwaddr addr, uint64_t data,

switch (addr) {

case ACPI_GED_REG_SLEEP_CTL:

- slp_typ = (data >> 2) & 0x07;

- slp_en = (data >> 5) & 0x01;

- if (slp_en && slp_typ == 5) {

+ slp_typ = (data >> ACPI_GED_SLP_TYP_POS) & ACPI_GED_SLP_TYP_MASK;

+ slp_en = !!(data & ACPI_GED_SLP_EN);

+ if (slp_en && slp_typ == ACPI_GED_SLP_TYP_S5) {

qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

}

return;

diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h

--- a/include/hw/acpi/generic_event_device.h

+++ b/include/hw/acpi/generic_event_device.h

@@ -XXX,XX +XXX,XX @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)

/* ACPI_GED_REG_RESET value for reset*/

#define ACPI_GED_RESET_VALUE 0x42

-/* ACPI_GED_REG_SLEEP_CTL.SLP_TYP value for S5 (aka poweroff) */

-#define ACPI_GED_SLP_TYP_S5 0x05

+/* [ACPI 5.0 Chapter 4.8.3.7] Sleep Control and Status Register */

+#define ACPI_GED_SLP_TYP_POS 0x2 /* SLP_TYPx Bit Offset */

+#define ACPI_GED_SLP_TYP_MASK 0x07 /* SLP_TYPx 3-bit mask */

+#define ACPI_GED_SLP_TYP_S5 0x05 /* System _S5 State (Soft Off) */

+#define ACPI_GED_SLP_EN 0x20 /* SLP_EN write-only bit */

#define GED_DEVICE "GED"

#define AML_GED_EVT_REG "EREG"

2.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Nothing in LoongArch fw_cfg.c requires target specific definitions.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-Id: <20240927213254.17552-3-philmd@linaro.org>

Signed-off-by: Song Gao <gaosong@loongson.cn>

---

hw/loongarch/meson.build | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)