[7/8] Update the ACPI table for the Loongarch CPU

1.Create a new GED device type for Loongarch,
mount cpu_madt function to update the ACPI table
2.Update the APIC table for loongarch based on
CPU information to support CPU hot-(un)plug

Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Cc: Song Gao <gaosong@loongson.cn>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <anisinha@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Eduardo Habkost <eduardo@habkost.net>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: Yanan Wang <wangyanan55@huawei.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: xianglai li <lixianglai@loongson.cn>
---
 hw/acpi/acpi-cpu-hotplug-stub.c               |  9 +++++
 hw/loongarch/acpi-build.c                     | 35 ++++++++++++++++--
 hw/loongarch/generic_event_device_loongarch.c | 36 +++++++++++++++++++
 hw/loongarch/meson.build                      |  2 +-
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 hw/loongarch/generic_event_device_loongarch.c

On Thu, 20 Jul 2023 15:15:12 +0800
xianglai li <lixianglai@loongson.cn> wrote:

> 1.Create a new GED device type for Loongarch,
> mount cpu_madt function to update the ACPI table

madt changes should be its own patch

> 2.Update the APIC table for loongarch based on
> CPU information to support CPU hot-(un)plug
> 
> Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn>
> Cc: Song Gao <gaosong@loongson.cn>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Ani Sinha <anisinha@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: Eduardo Habkost <eduardo@habkost.net>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
> Cc: Yanan Wang <wangyanan55@huawei.com>
> Cc: "Daniel P. Berrangé" <berrange@redhat.com>
> Cc: Peter Xu <peterx@redhat.com>
> Cc: David Hildenbrand <david@redhat.com>
> Signed-off-by: xianglai li <lixianglai@loongson.cn>
> ---
>  hw/acpi/acpi-cpu-hotplug-stub.c               |  9 +++++
>  hw/loongarch/acpi-build.c                     | 35 ++++++++++++++++--
>  hw/loongarch/generic_event_device_loongarch.c | 36 +++++++++++++++++++
>  hw/loongarch/meson.build                      |  2 +-
>  4 files changed, 79 insertions(+), 3 deletions(-)
>  create mode 100644 hw/loongarch/generic_event_device_loongarch.c
> 
> diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stub.c
> index 2aec90d968..af9fda2cf4 100644
> --- a/hw/acpi/acpi-cpu-hotplug-stub.c
> +++ b/hw/acpi/acpi-cpu-hotplug-stub.c
> @@ -19,6 +19,15 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
>      return;
>  }
>  
> +void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
> +                    hwaddr mmap_io_base,
> +                    const char *res_root,
> +                    const char *event_handler_method,
> +                    AmlRegionSpace rs)
> +{
> +    return;
> +}
> +
>  void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list)
>  {
>      return;
> diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
> index 0b62c3a2f7..312908fb2f 100644
> --- a/hw/loongarch/acpi-build.c
> +++ b/hw/loongarch/acpi-build.c
> @@ -46,6 +46,23 @@
>  #define ACPI_BUILD_DPRINTF(fmt, ...)
>  #endif
>  
> +void virt_madt_cpu_entry(int uid,
> +                         const CPUArchIdList *apic_ids,
> +                         GArray *entry, bool force_enabled)
> +{
> +    uint32_t apic_id = apic_ids->cpus[uid].arch_id;
> +    /* Flags – Local APIC Flags */
> +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
> +                     1 /* Enabled */ : 0;
> +
> +    /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
> +    build_append_int_noprefix(entry, 0, 1);       /* Type */
> +    build_append_int_noprefix(entry, 8, 1);       /* Length */
> +    build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
> +    build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
> +    build_append_int_noprefix(entry, flags, 4); /* Flags */
> +}
> +
>  /* build FADT */
>  static void init_common_fadt_data(AcpiFadtData *data)
>  {
> @@ -121,15 +138,18 @@ build_madt(GArray *table_data, BIOSLinker *linker, LoongArchMachineState *lams)
>      build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */
>  
>      for (i = 0; i < arch_ids->len; i++) {
> +        uint32_t flags;
> +
>          /* Processor Core Interrupt Controller Structure */
>          arch_id = arch_ids->cpus[i].arch_id;
> +        flags = arch_ids->cpus[i].cpu ? 1 : 0;
>  
>          build_append_int_noprefix(table_data, 17, 1);    /* Type */
>          build_append_int_noprefix(table_data, 15, 1);    /* Length */
>          build_append_int_noprefix(table_data, 1, 1);     /* Version */
> -        build_append_int_noprefix(table_data, i + 1, 4); /* ACPI Processor ID */
> +        build_append_int_noprefix(table_data, i, 4);     /* ACPI Processor ID */
>          build_append_int_noprefix(table_data, arch_id, 4); /* Core ID */
> -        build_append_int_noprefix(table_data, 1, 4);     /* Flags */
> +        build_append_int_noprefix(table_data, flags, 4);   /* Flags */
>      }
>  
>      /* Extend I/O Interrupt Controller Structure */
> @@ -292,6 +312,17 @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
>                                   AML_SYSTEM_MEMORY,
>                                   VIRT_GED_MEM_ADDR);
>      }
> +
> +    if (event & ACPI_GED_CPU_HOTPLUG_EVT) {
> +        CPUHotplugFeatures opts = {
> +            .acpi_1_compatible = false,
> +            .has_legacy_cphp = false
> +        };
> +
> +        build_cpus_aml(dsdt, machine, opts, VIRT_GED_CPUHP_ADDR,
> +                       "\\_SB", "\\_GPE._E01", AML_SYSTEM_MEMORY);
> +
> +    }
>      acpi_dsdt_add_power_button(dsdt);
>  }
>  
> diff --git a/hw/loongarch/generic_event_device_loongarch.c b/hw/loongarch/generic_event_device_loongarch.c
> new file mode 100644
> index 0000000000..1fe550239b
> --- /dev/null
> +++ b/hw/loongarch/generic_event_device_loongarch.c
> @@ -0,0 +1,36 @@
> +/*
> + * loongarch variant of the generic event device for hw reduced acpi
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/acpi/generic_event_device.h"
> +#include "hw/loongarch/virt.h"
> +
> +static void acpi_ged_loongarch_class_init(ObjectClass *class, void *data)
> +{
> +    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
> +
> +    adevc->madt_cpu = virt_madt_cpu_entry;
> +}
> +
> +static const TypeInfo acpi_ged_loongarch_info = {
> +    .name          = TYPE_ACPI_GED_LOONGARCH,
> +    .parent        = TYPE_ACPI_GED,
> +    .class_init    = acpi_ged_loongarch_class_init,
> +    .interfaces = (InterfaceInfo[]) {
> +        { TYPE_HOTPLUG_HANDLER },
> +        { TYPE_ACPI_DEVICE_IF },
> +        { }
> +    }
> +};
> +
> +static void acpi_ged_loongarch_register_types(void)
> +{
> +    type_register_static(&acpi_ged_loongarch_info);
> +}
> +
> +type_init(acpi_ged_loongarch_register_types)
> diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
> index c0421502ab..8d21addee3 100644
> --- a/hw/loongarch/meson.build
> +++ b/hw/loongarch/meson.build
> @@ -3,6 +3,6 @@ loongarch_ss.add(files(
>      'fw_cfg.c',
>  ))
>  loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
> -loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
> +loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c', 'generic_event_device_loongarch.c'))
>  
>  hw_arch += {'loongarch': loongarch_ss}

Hi Igor Mammedov:


On 7/28/23 9:26 PM, Igor Mammedov wrote:
> On Thu, 20 Jul 2023 15:15:12 +0800
> xianglai li <lixianglai@loongson.cn> wrote:
>
>> 1.Create a new GED device type for Loongarch,
>> mount cpu_madt function to update the ACPI table
> madt changes should be its own patch


Okay, I'll put the Madt-related changes into a separate patch.


Thanks,

xianglai

>> 2.Update the APIC table for loongarch based on
>> CPU information to support CPU hot-(un)plug
>>
>> Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn>
>> Cc: Song Gao <gaosong@loongson.cn>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Ani Sinha <anisinha@redhat.com>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Richard Henderson <richard.henderson@linaro.org>
>> Cc: Eduardo Habkost <eduardo@habkost.net>
>> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
>> Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
>> Cc: Yanan Wang <wangyanan55@huawei.com>
>> Cc: "Daniel P. Berrangé" <berrange@redhat.com>
>> Cc: Peter Xu <peterx@redhat.com>
>> Cc: David Hildenbrand <david@redhat.com>
>> Signed-off-by: xianglai li <lixianglai@loongson.cn>
>> ---
>>   hw/acpi/acpi-cpu-hotplug-stub.c               |  9 +++++
>>   hw/loongarch/acpi-build.c                     | 35 ++++++++++++++++--
>>   hw/loongarch/generic_event_device_loongarch.c | 36 +++++++++++++++++++
>>   hw/loongarch/meson.build                      |  2 +-
>>   4 files changed, 79 insertions(+), 3 deletions(-)
>>   create mode 100644 hw/loongarch/generic_event_device_loongarch.c
>>
>> diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stub.c
>> index 2aec90d968..af9fda2cf4 100644
>> --- a/hw/acpi/acpi-cpu-hotplug-stub.c
>> +++ b/hw/acpi/acpi-cpu-hotplug-stub.c
>> @@ -19,6 +19,15 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
>>       return;
>>   }
>>   
>> +void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
>> +                    hwaddr mmap_io_base,
>> +                    const char *res_root,
>> +                    const char *event_handler_method,
>> +                    AmlRegionSpace rs)
>> +{
>> +    return;
>> +}
>> +
>>   void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list)
>>   {
>>       return;
>> diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
>> index 0b62c3a2f7..312908fb2f 100644
>> --- a/hw/loongarch/acpi-build.c
>> +++ b/hw/loongarch/acpi-build.c
>> @@ -46,6 +46,23 @@
>>   #define ACPI_BUILD_DPRINTF(fmt, ...)
>>   #endif
>>   
>> +void virt_madt_cpu_entry(int uid,
>> +                         const CPUArchIdList *apic_ids,
>> +                         GArray *entry, bool force_enabled)
>> +{
>> +    uint32_t apic_id = apic_ids->cpus[uid].arch_id;
>> +    /* Flags – Local APIC Flags */
>> +    uint32_t flags = apic_ids->cpus[uid].cpu != NULL || force_enabled ?
>> +                     1 /* Enabled */ : 0;
>> +
>> +    /* Rev 1.0b, Table 5-13 Processor Local APIC Structure */
>> +    build_append_int_noprefix(entry, 0, 1);       /* Type */
>> +    build_append_int_noprefix(entry, 8, 1);       /* Length */
>> +    build_append_int_noprefix(entry, uid, 1);     /* ACPI Processor ID */
>> +    build_append_int_noprefix(entry, apic_id, 1); /* APIC ID */
>> +    build_append_int_noprefix(entry, flags, 4); /* Flags */
>> +}
>> +
>>   /* build FADT */
>>   static void init_common_fadt_data(AcpiFadtData *data)
>>   {
>> @@ -121,15 +138,18 @@ build_madt(GArray *table_data, BIOSLinker *linker, LoongArchMachineState *lams)
>>       build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */
>>   
>>       for (i = 0; i < arch_ids->len; i++) {
>> +        uint32_t flags;
>> +
>>           /* Processor Core Interrupt Controller Structure */
>>           arch_id = arch_ids->cpus[i].arch_id;
>> +        flags = arch_ids->cpus[i].cpu ? 1 : 0;
>>   
>>           build_append_int_noprefix(table_data, 17, 1);    /* Type */
>>           build_append_int_noprefix(table_data, 15, 1);    /* Length */
>>           build_append_int_noprefix(table_data, 1, 1);     /* Version */
>> -        build_append_int_noprefix(table_data, i + 1, 4); /* ACPI Processor ID */
>> +        build_append_int_noprefix(table_data, i, 4);     /* ACPI Processor ID */
>>           build_append_int_noprefix(table_data, arch_id, 4); /* Core ID */
>> -        build_append_int_noprefix(table_data, 1, 4);     /* Flags */
>> +        build_append_int_noprefix(table_data, flags, 4);   /* Flags */
>>       }
>>   
>>       /* Extend I/O Interrupt Controller Structure */
>> @@ -292,6 +312,17 @@ build_la_ged_aml(Aml *dsdt, MachineState *machine)
>>                                    AML_SYSTEM_MEMORY,
>>                                    VIRT_GED_MEM_ADDR);
>>       }
>> +
>> +    if (event & ACPI_GED_CPU_HOTPLUG_EVT) {
>> +        CPUHotplugFeatures opts = {
>> +            .acpi_1_compatible = false,
>> +            .has_legacy_cphp = false
>> +        };
>> +
>> +        build_cpus_aml(dsdt, machine, opts, VIRT_GED_CPUHP_ADDR,
>> +                       "\\_SB", "\\_GPE._E01", AML_SYSTEM_MEMORY);
>> +
>> +    }
>>       acpi_dsdt_add_power_button(dsdt);
>>   }
>>   
>> diff --git a/hw/loongarch/generic_event_device_loongarch.c b/hw/loongarch/generic_event_device_loongarch.c
>> new file mode 100644
>> index 0000000000..1fe550239b
>> --- /dev/null
>> +++ b/hw/loongarch/generic_event_device_loongarch.c
>> @@ -0,0 +1,36 @@
>> +/*
>> + * loongarch variant of the generic event device for hw reduced acpi
>> + *
>> + * This program is free software; you can redistribute it and/or modify it
>> + * under the terms and conditions of the GNU General Public License,
>> + * version 2 or later, as published by the Free Software Foundation.
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "hw/acpi/generic_event_device.h"
>> +#include "hw/loongarch/virt.h"
>> +
>> +static void acpi_ged_loongarch_class_init(ObjectClass *class, void *data)
>> +{
>> +    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
>> +
>> +    adevc->madt_cpu = virt_madt_cpu_entry;
>> +}
>> +
>> +static const TypeInfo acpi_ged_loongarch_info = {
>> +    .name          = TYPE_ACPI_GED_LOONGARCH,
>> +    .parent        = TYPE_ACPI_GED,
>> +    .class_init    = acpi_ged_loongarch_class_init,
>> +    .interfaces = (InterfaceInfo[]) {
>> +        { TYPE_HOTPLUG_HANDLER },
>> +        { TYPE_ACPI_DEVICE_IF },
>> +        { }
>> +    }
>> +};
>> +
>> +static void acpi_ged_loongarch_register_types(void)
>> +{
>> +    type_register_static(&acpi_ged_loongarch_info);
>> +}
>> +
>> +type_init(acpi_ged_loongarch_register_types)
>> diff --git a/hw/loongarch/meson.build b/hw/loongarch/meson.build
>> index c0421502ab..8d21addee3 100644
>> --- a/hw/loongarch/meson.build
>> +++ b/hw/loongarch/meson.build
>> @@ -3,6 +3,6 @@ loongarch_ss.add(files(
>>       'fw_cfg.c',
>>   ))
>>   loongarch_ss.add(when: 'CONFIG_LOONGARCH_VIRT', if_true: [files('virt.c'), fdt])
>> -loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c'))
>> +loongarch_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-build.c', 'generic_event_device_loongarch.c'))
>>   
>>   hw_arch += {'loongarch': loongarch_ss}