* [PATCH 0/2] Add FDT table support with acpi ged pm register
@ 2024-09-06 2:19 Bibo Mao
2024-09-06 2:19 ` [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register Bibo Mao
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Bibo Mao @ 2024-09-06 2:19 UTC (permalink / raw)
To: Michael S . Tsirkin, Igor Mammedov, Song Gao
Cc: Ani Sinha, Jiaxun Yang, Jason A . Donenfeld,
Thomas Weißschuh, qemu-devel
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 in 32-bit mode.
Bibo Mao (2):
acpi: ged: Add macro for acpi ged sleep register
hw/loongarch/virt: Add FDT table support with acpi ged pm register
hw/acpi/generic_event_device.c | 6 ++--
hw/loongarch/virt.c | 39 ++++++++++++++++++++++++++
include/hw/acpi/generic_event_device.h | 3 ++
3 files changed, 45 insertions(+), 3 deletions(-)
base-commit: e638d685ec2a0700fb9529cbd1b2823ac4120c53
--
2.39.3
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register 2024-09-06 2:19 [PATCH 0/2] Add FDT table support with acpi ged pm register Bibo Mao @ 2024-09-06 2:19 ` Bibo Mao 2024-09-10 17:32 ` Michael S. Tsirkin 2024-09-06 2:19 ` [PATCH 2/2] hw/loongarch/virt: Add FDT table support with acpi ged pm register Bibo Mao ` (2 subsequent siblings) 3 siblings, 1 reply; 7+ messages in thread From: Bibo Mao @ 2024-09-06 2:19 UTC (permalink / raw) To: Michael S . Tsirkin, Igor Mammedov, Song Gao Cc: Ani Sinha, Jiaxun Yang, Jason A . Donenfeld, Thomas Weißschuh, qemu-devel Macro definition is added for acpi ged sleep register, so that ged emulation driver can use this, also it can be used in FDT table if ged is exposed with FDT table. Signed-off-by: Bibo Mao <maobibo@loongson.cn> --- hw/acpi/generic_event_device.c | 6 +++--- include/hw/acpi/generic_event_device.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 15b4c3ebbf..10a338877c 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -201,9 +201,9 @@ 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_MASK) >> ACPI_GED_SLP_TYP_SHIFT; + slp_en = !!(data & ACPI_GED_SLP_ENABLE); + 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 index 40af3550b5..526fea6efe 100644 --- a/include/hw/acpi/generic_event_device.h +++ b/include/hw/acpi/generic_event_device.h @@ -82,7 +82,10 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED) #define ACPI_GED_RESET_VALUE 0x42 /* ACPI_GED_REG_SLEEP_CTL.SLP_TYP value for S5 (aka poweroff) */ +#define ACPI_GED_SLP_TYP_SHIFT 0x02 #define ACPI_GED_SLP_TYP_S5 0x05 +#define ACPI_GED_SLP_TYP_MASK 0x1C +#define ACPI_GED_SLP_ENABLE 0x20 #define GED_DEVICE "GED" #define AML_GED_EVT_REG "EREG" -- 2.39.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register 2024-09-06 2:19 ` [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register Bibo Mao @ 2024-09-10 17:32 ` Michael S. Tsirkin 2024-09-11 1:00 ` maobibo 0 siblings, 1 reply; 7+ messages in thread From: Michael S. Tsirkin @ 2024-09-10 17:32 UTC (permalink / raw) To: Bibo Mao Cc: Igor Mammedov, Song Gao, Ani Sinha, Jiaxun Yang, Jason A . Donenfeld, Thomas Weißschuh, qemu-devel On Fri, Sep 06, 2024 at 10:19:42AM +0800, Bibo Mao wrote: > Macro definition is added for acpi ged sleep register, so that ged > emulation driver can use this, also it can be used in FDT table if > ged is exposed with FDT table. > > Signed-off-by: Bibo Mao <maobibo@loongson.cn> > --- > hw/acpi/generic_event_device.c | 6 +++--- > include/hw/acpi/generic_event_device.h | 3 +++ > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c > index 15b4c3ebbf..10a338877c 100644 > --- a/hw/acpi/generic_event_device.c > +++ b/hw/acpi/generic_event_device.c > @@ -201,9 +201,9 @@ 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_MASK) >> ACPI_GED_SLP_TYP_SHIFT; > + slp_en = !!(data & ACPI_GED_SLP_ENABLE); > + 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 > index 40af3550b5..526fea6efe 100644 > --- a/include/hw/acpi/generic_event_device.h > +++ b/include/hw/acpi/generic_event_device.h > @@ -82,7 +82,10 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED) > #define ACPI_GED_RESET_VALUE 0x42 > > /* ACPI_GED_REG_SLEEP_CTL.SLP_TYP value for S5 (aka poweroff) */ > +#define ACPI_GED_SLP_TYP_SHIFT 0x02 > #define ACPI_GED_SLP_TYP_S5 0x05 > +#define ACPI_GED_SLP_TYP_MASK 0x1C > +#define ACPI_GED_SLP_ENABLE 0x20 The comment is wrong now, isn't it? Pls document each value, copying name from spec verbatim. > > #define GED_DEVICE "GED" > #define AML_GED_EVT_REG "EREG" > -- > 2.39.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register 2024-09-10 17:32 ` Michael S. Tsirkin @ 2024-09-11 1:00 ` maobibo 0 siblings, 0 replies; 7+ messages in thread From: maobibo @ 2024-09-11 1:00 UTC (permalink / raw) To: Michael S. Tsirkin Cc: Igor Mammedov, Song Gao, Ani Sinha, Jiaxun Yang, Jason A . Donenfeld, Thomas Weißschuh, qemu-devel On 2024/9/11 上午1:32, Michael S. Tsirkin wrote: > On Fri, Sep 06, 2024 at 10:19:42AM +0800, Bibo Mao wrote: >> Macro definition is added for acpi ged sleep register, so that ged >> emulation driver can use this, also it can be used in FDT table if >> ged is exposed with FDT table. >> >> Signed-off-by: Bibo Mao <maobibo@loongson.cn> >> --- >> hw/acpi/generic_event_device.c | 6 +++--- >> include/hw/acpi/generic_event_device.h | 3 +++ >> 2 files changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c >> index 15b4c3ebbf..10a338877c 100644 >> --- a/hw/acpi/generic_event_device.c >> +++ b/hw/acpi/generic_event_device.c >> @@ -201,9 +201,9 @@ 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_MASK) >> ACPI_GED_SLP_TYP_SHIFT; >> + slp_en = !!(data & ACPI_GED_SLP_ENABLE); >> + 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 >> index 40af3550b5..526fea6efe 100644 >> --- a/include/hw/acpi/generic_event_device.h >> +++ b/include/hw/acpi/generic_event_device.h >> @@ -82,7 +82,10 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED) >> #define ACPI_GED_RESET_VALUE 0x42 >> >> /* ACPI_GED_REG_SLEEP_CTL.SLP_TYP value for S5 (aka poweroff) */ >> +#define ACPI_GED_SLP_TYP_SHIFT 0x02 >> #define ACPI_GED_SLP_TYP_S5 0x05 >> +#define ACPI_GED_SLP_TYP_MASK 0x1C >> +#define ACPI_GED_SLP_ENABLE 0x20 > > The comment is wrong now, isn't it? > Pls document each value, copying name from spec verbatim. The name comes from linux header files with little modification. #define ACPI_X_WAKE_STATUS 0x80 #define ACPI_X_SLEEP_TYPE_MASK 0x1C #define ACPI_X_SLEEP_TYPE_POSITION 0x02 #define ACPI_X_SLEEP_ENABLE 0x20 yeap, it will better if comes from spec verbatim. I will investigate and refresh the patch in next version. Regards Bibo Mao > >> >> #define GED_DEVICE "GED" >> #define AML_GED_EVT_REG "EREG" >> -- >> 2.39.3 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] hw/loongarch/virt: Add FDT table support with acpi ged pm register 2024-09-06 2:19 [PATCH 0/2] Add FDT table support with acpi ged pm register Bibo Mao 2024-09-06 2:19 ` [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register Bibo Mao @ 2024-09-06 2:19 ` Bibo Mao 2024-09-06 4:03 ` [PATCH 0/2] " Jason A. Donenfeld 2024-09-09 1:36 ` gaosong 3 siblings, 0 replies; 7+ messages in thread From: Bibo Mao @ 2024-09-06 2:19 UTC (permalink / raw) To: Michael S . Tsirkin, Igor Mammedov, Song Gao Cc: Ani Sinha, Jiaxun Yang, Jason A . Donenfeld, Thomas Weißschuh, qemu-devel 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 in 32-bit mode. Signed-off-by: Bibo Mao <maobibo@loongson.cn> --- hw/loongarch/virt.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 29040422aa..8283130ba3 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -279,6 +279,44 @@ 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_ENABLE | + (ACPI_GED_SLP_TYP_S5 << ACPI_GED_SLP_TYP_SHIFT)); + g_free(name); +} + static void fdt_add_uart_node(LoongArchVirtMachineState *lvms, uint32_t *pch_pic_phandle) { @@ -724,6 +762,7 @@ 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.39.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Add FDT table support with acpi ged pm register 2024-09-06 2:19 [PATCH 0/2] Add FDT table support with acpi ged pm register Bibo Mao 2024-09-06 2:19 ` [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register Bibo Mao 2024-09-06 2:19 ` [PATCH 2/2] hw/loongarch/virt: Add FDT table support with acpi ged pm register Bibo Mao @ 2024-09-06 4:03 ` Jason A. Donenfeld 2024-09-09 1:36 ` gaosong 3 siblings, 0 replies; 7+ messages in thread From: Jason A. Donenfeld @ 2024-09-06 4:03 UTC (permalink / raw) To: Bibo Mao Cc: Michael S . Tsirkin, Igor Mammedov, Song Gao, Ani Sinha, Jiaxun Yang, Thomas Weißschuh, qemu-devel This series appears to work in my testing. Tested-by: Jason A. Donenfeld <Jason@zx2c4.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Add FDT table support with acpi ged pm register 2024-09-06 2:19 [PATCH 0/2] Add FDT table support with acpi ged pm register Bibo Mao ` (2 preceding siblings ...) 2024-09-06 4:03 ` [PATCH 0/2] " Jason A. Donenfeld @ 2024-09-09 1:36 ` gaosong 3 siblings, 0 replies; 7+ messages in thread From: gaosong @ 2024-09-09 1:36 UTC (permalink / raw) To: Bibo Mao, Michael S . Tsirkin, Igor Mammedov Cc: Ani Sinha, Jiaxun Yang, Jason A . Donenfeld, Thomas Weißschuh, qemu-devel 在 2024/9/6 上午10:19, Bibo Mao 写道: > 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 in 32-bit mode. > > Bibo Mao (2): > acpi: ged: Add macro for acpi ged sleep register > hw/loongarch/virt: Add FDT table support with acpi ged pm register > > hw/acpi/generic_event_device.c | 6 ++-- > hw/loongarch/virt.c | 39 ++++++++++++++++++++++++++ > include/hw/acpi/generic_event_device.h | 3 ++ > 3 files changed, 45 insertions(+), 3 deletions(-) > > > base-commit: e638d685ec2a0700fb9529cbd1b2823ac4120c53 > Reviewed-by: Song Gao <gaosong@loongson.cn> Tested-by: Song Gao <gaosong@loongson.cn> Thanks. Song Gao ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-11 1:01 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-09-06 2:19 [PATCH 0/2] Add FDT table support with acpi ged pm register Bibo Mao 2024-09-06 2:19 ` [PATCH 1/2] acpi: ged: Add macro for acpi ged sleep register Bibo Mao 2024-09-10 17:32 ` Michael S. Tsirkin 2024-09-11 1:00 ` maobibo 2024-09-06 2:19 ` [PATCH 2/2] hw/loongarch/virt: Add FDT table support with acpi ged pm register Bibo Mao 2024-09-06 4:03 ` [PATCH 0/2] " Jason A. Donenfeld 2024-09-09 1:36 ` gaosong
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).