public inbox for qemu-devel@nongnu.org
 help / color / mirror / Atom feed
* [PATCH V3 0/2] add rtc acpi table
@ 2026-03-20  0:36 Xianglai Li
  2026-03-20  0:36 ` [PATCH V3 1/2] hw/loongarch: " Xianglai Li
  2026-03-20  0:36 ` [PATCH V3 2/2] hw/loongarch: modify rtc fdt table Xianglai Li
  0 siblings, 2 replies; 5+ messages in thread
From: Xianglai Li @ 2026-03-20  0:36 UTC (permalink / raw)
  To: qemu-devel, lixianglai; +Cc: Song Gao, Bibo Mao, Jiaxun Yang, Huacai Chen

1.Add the acpi table to the loongson rtc hardware so that the virtual machine
kernel can use the loongson RTC-related drivers.

2.Delete the interrupt information in the rtc fdt table. 

change:
V2->V3:
Split the modifications related to ACPI and FDT for RTC into two patches

V1->V2:
1.Add a comment to explain why the acpi table no longer provides interrupt numbers
2.Delete the interrupt number from the rtc fdt table 

Cc: Song Gao <gaosong@loongson.cn> 
Cc: Bibo Mao <maobibo@loongson.cn> 
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> 
Cc: Huacai Chen <zltjiangshi@gmail.com>

Xianglai Li (2):
  hw/loongarch: add rtc acpi table
  hw/loongarch: modify rtc fdt table

 hw/loongarch/virt-acpi-build.c | 25 +++++++++++++++++++++++++
 hw/loongarch/virt-fdt-build.c  | 16 ++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

-- 
2.39.1



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH V3 1/2] hw/loongarch: add rtc acpi table
  2026-03-20  0:36 [PATCH V3 0/2] add rtc acpi table Xianglai Li
@ 2026-03-20  0:36 ` Xianglai Li
  2026-03-20  9:36   ` Jonathan Cameron via qemu development
  2026-03-20  0:36 ` [PATCH V3 2/2] hw/loongarch: modify rtc fdt table Xianglai Li
  1 sibling, 1 reply; 5+ messages in thread
From: Xianglai Li @ 2026-03-20  0:36 UTC (permalink / raw)
  To: qemu-devel, lixianglai; +Cc: Song Gao, Bibo Mao, Jiaxun Yang, Huacai Chen

Add the acpi table to the loongson rtc hardware so that the virtual machine
kernel can use the loongson RTC-related drivers.

Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
---
Cc: Song Gao <gaosong@loongson.cn> 
Cc: Bibo Mao <maobibo@loongson.cn> 
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> 
Cc: Huacai Chen <zltjiangshi@gmail.com>

 hw/loongarch/virt-acpi-build.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
index 3e34bedcd6..42820001d7 100644
--- a/hw/loongarch/virt-acpi-build.c
+++ b/hw/loongarch/virt-acpi-build.c
@@ -460,6 +460,30 @@ static void acpi_dsdt_add_tpm(Aml *scope, LoongArchVirtMachineState *vms)
 }
 #endif
 
+static void acpi_dsdt_add_rtc(Aml *scope)
+{
+    Aml *dev = aml_device("RTC");
+
+    aml_append(dev, aml_name_decl("_HID", aml_string("LOON0001")));
+    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
+
+    Aml *crs = aml_resource_template();
+    aml_append(crs,
+        aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
+                         AML_NON_CACHEABLE, AML_READ_WRITE,
+                         0, VIRT_RTC_REG_BASE,
+                         VIRT_RTC_REG_BASE + VIRT_RTC_LEN - 1,
+                         0, VIRT_RTC_LEN));
+    /*
+     * The virtual machine model does not support suspend and wake-up,
+     * and rtc is no longer the wake-up source. Therefore, the current
+     * rtc table no longer provides the rtc alarm interrupt number to
+     * avoid the software initializing alarm.
+     */
+    aml_append(dev, aml_name_decl("_CRS", crs));
+    aml_append(scope, dev);
+}
+
 /* build DSDT */
 static void
 build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
@@ -475,6 +499,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
     for (i = 0; i < VIRT_UART_COUNT; i++) {
         build_uart_device_aml(dsdt, i);
     }
+    acpi_dsdt_add_rtc(dsdt);
     build_pci_device_aml(dsdt, lvms);
     build_la_ged_aml(dsdt, machine);
     build_flash_aml(dsdt, lvms);
-- 
2.39.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH V3 2/2] hw/loongarch: modify rtc fdt table
  2026-03-20  0:36 [PATCH V3 0/2] add rtc acpi table Xianglai Li
  2026-03-20  0:36 ` [PATCH V3 1/2] hw/loongarch: " Xianglai Li
@ 2026-03-20  0:36 ` Xianglai Li
  1 sibling, 0 replies; 5+ messages in thread
From: Xianglai Li @ 2026-03-20  0:36 UTC (permalink / raw)
  To: qemu-devel, lixianglai; +Cc: Song Gao, Bibo Mao, Jiaxun Yang, Huacai Chen

Delete the interrupt information in the rtc fdt table.

Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
---
Cc: Song Gao <gaosong@loongson.cn> 
Cc: Bibo Mao <maobibo@loongson.cn> 
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> 
Cc: Huacai Chen <zltjiangshi@gmail.com>

 hw/loongarch/virt-fdt-build.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c
index 6c06b36fca..42f014a7bd 100644
--- a/hw/loongarch/virt-fdt-build.c
+++ b/hw/loongarch/virt-fdt-build.c
@@ -458,8 +458,7 @@ static void fdt_add_uart_node(LoongArchVirtMachineState *lvms,
     g_free(nodename);
 }
 
-static void fdt_add_rtc_node(LoongArchVirtMachineState *lvms,
-                             uint32_t *pch_pic_phandle)
+static void fdt_add_rtc_node(LoongArchVirtMachineState *lvms)
 {
     char *nodename;
     hwaddr base = VIRT_RTC_REG_BASE;
@@ -470,12 +469,13 @@ static void fdt_add_rtc_node(LoongArchVirtMachineState *lvms,
     qemu_fdt_add_subnode(ms->fdt, nodename);
     qemu_fdt_setprop_string(ms->fdt, nodename, "compatible",
                             "loongson,ls7a-rtc");
+    /*
+     * The virtual machine model does not support suspend and wake-up,
+     * and rtc is no longer the wake-up source. Therefore, the current
+     * rtc table no longer provides the rtc alarm interrupt number to
+     * avoid the software initializing alarm.
+     */
     qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
-    qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
-                           VIRT_RTC_IRQ - VIRT_GSI_BASE ,
-                           FDT_IRQ_TYPE_LEVEL_HIGH);
-    qemu_fdt_setprop_cell(ms->fdt, nodename, "interrupt-parent",
-                          *pch_pic_phandle);
     g_free(nodename);
 }
 
@@ -550,7 +550,7 @@ void virt_fdt_setup(LoongArchVirtMachineState *lvms)
         fdt_add_uart_node(lvms, &pch_pic_phandle, base, irq, i == 0);
     }
 
-    fdt_add_rtc_node(lvms, &pch_pic_phandle);
+    fdt_add_rtc_node(lvms);
     fdt_add_ged_reset(lvms);
     platform_bus_add_all_fdt_nodes(machine->fdt, "/platic",
                                    VIRT_PLATFORM_BUS_BASEADDRESS,
-- 
2.39.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH V3 1/2] hw/loongarch: add rtc acpi table
  2026-03-20  0:36 ` [PATCH V3 1/2] hw/loongarch: " Xianglai Li
@ 2026-03-20  9:36   ` Jonathan Cameron via qemu development
  2026-03-20 10:05     ` lixianglai
  0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron via qemu development @ 2026-03-20  9:36 UTC (permalink / raw)
  To: Xianglai Li; +Cc: qemu-devel, Song Gao, Bibo Mao, Jiaxun Yang, Huacai Chen

On Fri, 20 Mar 2026 08:36:52 +0800
Xianglai Li <lixianglai@loongson.cn> wrote:

> Add the acpi table to the loongson rtc hardware so that the virtual machine
> kernel can use the loongson RTC-related drivers.
> 
> Signed-off-by: Xianglai Li <lixianglai@loongson.cn>

Hi

No data updates for

tests/dta/acpi/loongarch64/virt?

> ---
> Cc: Song Gao <gaosong@loongson.cn> 
> Cc: Bibo Mao <maobibo@loongson.cn> 
> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> 
> Cc: Huacai Chen <zltjiangshi@gmail.com>
> 
>  hw/loongarch/virt-acpi-build.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
> index 3e34bedcd6..42820001d7 100644
> --- a/hw/loongarch/virt-acpi-build.c
> +++ b/hw/loongarch/virt-acpi-build.c
> @@ -460,6 +460,30 @@ static void acpi_dsdt_add_tpm(Aml *scope, LoongArchVirtMachineState *vms)
>  }
>  #endif
>  
> +static void acpi_dsdt_add_rtc(Aml *scope)
> +{
> +    Aml *dev = aml_device("RTC");
> +
> +    aml_append(dev, aml_name_decl("_HID", aml_string("LOON0001")));
> +    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> +
> +    Aml *crs = aml_resource_template();
> +    aml_append(crs,
> +        aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
> +                         AML_NON_CACHEABLE, AML_READ_WRITE,
> +                         0, VIRT_RTC_REG_BASE,
> +                         VIRT_RTC_REG_BASE + VIRT_RTC_LEN - 1,
> +                         0, VIRT_RTC_LEN));
> +    /*
> +     * The virtual machine model does not support suspend and wake-up,
> +     * and rtc is no longer the wake-up source. Therefore, the current
> +     * rtc table no longer provides the rtc alarm interrupt number to
> +     * avoid the software initializing alarm.
> +     */
> +    aml_append(dev, aml_name_decl("_CRS", crs));
> +    aml_append(scope, dev);
> +}
> +
>  /* build DSDT */
>  static void
>  build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> @@ -475,6 +499,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>      for (i = 0; i < VIRT_UART_COUNT; i++) {
>          build_uart_device_aml(dsdt, i);
>      }
> +    acpi_dsdt_add_rtc(dsdt);
>      build_pci_device_aml(dsdt, lvms);
>      build_la_ged_aml(dsdt, machine);
>      build_flash_aml(dsdt, lvms);



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH V3 1/2] hw/loongarch: add rtc acpi table
  2026-03-20  9:36   ` Jonathan Cameron via qemu development
@ 2026-03-20 10:05     ` lixianglai
  0 siblings, 0 replies; 5+ messages in thread
From: lixianglai @ 2026-03-20 10:05 UTC (permalink / raw)
  To: Jonathan Cameron; +Cc: qemu-devel, Song Gao, Bibo Mao, Jiaxun Yang, Huacai Chen

Hi Jonathan Cameron :
> On Fri, 20 Mar 2026 08:36:52 +0800
> Xianglai Li <lixianglai@loongson.cn> wrote:
>
>> Add the acpi table to the loongson rtc hardware so that the virtual machine
>> kernel can use the loongson RTC-related drivers.
>>
>> Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
> Hi
>
> No data updates for
>
> tests/dta/acpi/loongarch64/virt?
Oh! I missed it. I will fix it in the next patch.

Thanks!
Xianglai.

>> ---
>> Cc: Song Gao <gaosong@loongson.cn>
>> Cc: Bibo Mao <maobibo@loongson.cn>
>> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
>> Cc: Huacai Chen <zltjiangshi@gmail.com>
>>
>>   hw/loongarch/virt-acpi-build.c | 25 +++++++++++++++++++++++++
>>   1 file changed, 25 insertions(+)
>>
>> diff --git a/hw/loongarch/virt-acpi-build.c b/hw/loongarch/virt-acpi-build.c
>> index 3e34bedcd6..42820001d7 100644
>> --- a/hw/loongarch/virt-acpi-build.c
>> +++ b/hw/loongarch/virt-acpi-build.c
>> @@ -460,6 +460,30 @@ static void acpi_dsdt_add_tpm(Aml *scope, LoongArchVirtMachineState *vms)
>>   }
>>   #endif
>>   
>> +static void acpi_dsdt_add_rtc(Aml *scope)
>> +{
>> +    Aml *dev = aml_device("RTC");
>> +
>> +    aml_append(dev, aml_name_decl("_HID", aml_string("LOON0001")));
>> +    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
>> +
>> +    Aml *crs = aml_resource_template();
>> +    aml_append(crs,
>> +        aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
>> +                         AML_NON_CACHEABLE, AML_READ_WRITE,
>> +                         0, VIRT_RTC_REG_BASE,
>> +                         VIRT_RTC_REG_BASE + VIRT_RTC_LEN - 1,
>> +                         0, VIRT_RTC_LEN));
>> +    /*
>> +     * The virtual machine model does not support suspend and wake-up,
>> +     * and rtc is no longer the wake-up source. Therefore, the current
>> +     * rtc table no longer provides the rtc alarm interrupt number to
>> +     * avoid the software initializing alarm.
>> +     */
>> +    aml_append(dev, aml_name_decl("_CRS", crs));
>> +    aml_append(scope, dev);
>> +}
>> +
>>   /* build DSDT */
>>   static void
>>   build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>> @@ -475,6 +499,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>>       for (i = 0; i < VIRT_UART_COUNT; i++) {
>>           build_uart_device_aml(dsdt, i);
>>       }
>> +    acpi_dsdt_add_rtc(dsdt);
>>       build_pci_device_aml(dsdt, lvms);
>>       build_la_ged_aml(dsdt, machine);
>>       build_flash_aml(dsdt, lvms);



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-03-20 10:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-20  0:36 [PATCH V3 0/2] add rtc acpi table Xianglai Li
2026-03-20  0:36 ` [PATCH V3 1/2] hw/loongarch: " Xianglai Li
2026-03-20  9:36   ` Jonathan Cameron via qemu development
2026-03-20 10:05     ` lixianglai
2026-03-20  0:36 ` [PATCH V3 2/2] hw/loongarch: modify rtc fdt table Xianglai Li

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox