Hi Xianglai, FYI. RFC V2 is out and you can now drop the arch agnostic patches from your patch-set. Please check the details in the cover letter which one you need to pick and rebase from:
https://lore.kernel.org/qemu-devel/20230926100436.28284-1-salil.me...@huawei.com/T/#t I am planning to float the architecture agnostic patch-set within this week which will have same patches and in same order as mentioned in the cover letter. This will untie the development across different architectures. Many thanks Salil. > From: xianglai li <lixiang...@loongson.cn> > Sent: Tuesday, September 26, 2023 10:54 AM > To: qemu-devel@nongnu.org > Cc: Bernhard Beschow <shen...@gmail.com>; Salil Mehta > <salil.me...@opnsrc.net>; Salil Mehta <salil.me...@huawei.com>; Xiaojuan > Yang <yangxiaoj...@loongson.cn>; Song Gao <gaos...@loongson.cn>; Michael S. > Tsirkin <m...@redhat.com>; Igor Mammedov <imamm...@redhat.com>; Ani Sinha > <anisi...@redhat.com>; Paolo Bonzini <pbonz...@redhat.com>; Richard > Henderson <richard.hender...@linaro.org>; Eduardo Habkost > <edua...@habkost.net>; Marcel Apfelbaum <marcel.apfelb...@gmail.com>; > Philippe Mathieu-Daudé <phi...@linaro.org>; wangyanan (Y) > <wangyana...@huawei.com>; Daniel P. Berrangé <berra...@redhat.com>; Peter > Xu <pet...@redhat.com>; David Hildenbrand <da...@redhat.com>; Bibo Mao > <maob...@loongson.cn> > Subject: [PATCH v3 2/7] Update CPUs AML with cpu-(ctrl)dev change > > CPUs Control device(\\_SB.PCI0) register interface for the x86 arch > is based on PCI and is IO port based and hence existing cpus AML code > assumes _CRS objects would evaluate to a system resource which describes > IO Port address. > But on Loongarch arch CPUs control device(\\_SB.PRES) register interface > is memory-mapped hence _CRS object should evaluate to system resource > which describes memory-mapped base address. > > This cpus AML code change updates the existing interface of the build cpus > AML > function to accept both IO/MEMORY type regions and update the _CRS object > correspondingly. > > Co-authored-by: "Bernhard Beschow" <shen...@gmail.com> > Co-authored-by: "Salil Mehta" <salil.me...@opnsrc.net> > Co-authored-by: "Salil Mehta" <salil.me...@huawei.com> > Cc: "Bernhard Beschow" <shen...@gmail.com> > Cc: "Salil Mehta" <salil.me...@huawei.com> > Cc: "Salil Mehta" <salil.me...@opnsrc.net> > Cc: Xiaojuan Yang <yangxiaoj...@loongson.cn> > Cc: Song Gao <gaos...@loongson.cn> > Cc: "Michael S. Tsirkin" <m...@redhat.com> > Cc: Igor Mammedov <imamm...@redhat.com> > Cc: Ani Sinha <anisi...@redhat.com> > Cc: Paolo Bonzini <pbonz...@redhat.com> > Cc: Richard Henderson <richard.hender...@linaro.org> > Cc: Eduardo Habkost <edua...@habkost.net> > Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com> > Cc: "Philippe Mathieu-Daudé" <phi...@linaro.org> > Cc: Yanan Wang <wangyana...@huawei.com> > Cc: "Daniel P. Berrangé" <berra...@redhat.com> > Cc: Peter Xu <pet...@redhat.com> > Cc: David Hildenbrand <da...@redhat.com> > Cc: Bibo Mao <maob...@loongson.cn> > Signed-off-by: xianglai li <lixiang...@loongson.cn> > --- > hw/acpi/cpu.c | 20 +++++++++++++++----- > hw/i386/acpi-build.c | 3 ++- > include/hw/acpi/cpu.h | 5 +++-- > 3 files changed, 20 insertions(+), 8 deletions(-) > > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c > index 5bad983928..0afa04832e 100644 > --- a/hw/acpi/cpu.c > +++ b/hw/acpi/cpu.c > @@ -6,6 +6,7 @@ > #include "qapi/qapi-events-acpi.h" > #include "trace.h" > #include "sysemu/numa.h" > +#include "hw/acpi/cpu_hotplug.h" > > #define OVMF_CPUHP_SMI_CMD 4 > > @@ -332,9 +333,10 @@ const VMStateDescription vmstate_cpu_hotplug = { > #define CPU_FW_EJECT_EVENT "CEJF" > > void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures > opts, > - build_madt_cpu_fn build_madt_cpu, hwaddr io_base, > + build_madt_cpu_fn build_madt_cpu, hwaddr mmap_io_base, > const char *res_root, > - const char *event_handler_method) > + const char *event_handler_method, > + AmlRegionSpace rs) > { > Aml *ifctx; > Aml *field; > @@ -359,14 +361,22 @@ void build_cpus_aml(Aml *table, MachineState > *machine, CPUHotplugFeatures opts, > aml_append(cpu_ctrl_dev, aml_mutex(CPU_LOCK, 0)); > > crs = aml_resource_template(); > - aml_append(crs, aml_io(AML_DECODE16, io_base, io_base, 1, > + if (rs == AML_SYSTEM_IO) { > + aml_append(crs, aml_io(AML_DECODE16, mmap_io_base, > mmap_io_base, 1, > ACPI_CPU_HOTPLUG_REG_LEN)); > + } else { > + aml_append(crs, aml_memory32_fixed(mmap_io_base, > + ACPI_CPU_HOTPLUG_REG_LEN, AML_READ_WRITE)); > + } > + > aml_append(cpu_ctrl_dev, aml_name_decl("_CRS", crs)); > > + g_assert(rs == AML_SYSTEM_IO || rs == AML_SYSTEM_MEMORY); > /* declare CPU hotplug MMIO region with related access fields */ > aml_append(cpu_ctrl_dev, > - aml_operation_region("PRST", AML_SYSTEM_IO, aml_int(io_base), > - ACPI_CPU_HOTPLUG_REG_LEN)); > + aml_operation_region("PRST", rs, > + aml_int(mmap_io_base), > + ACPI_CPU_HOTPLUG_REG_LEN)); > > field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, > AML_WRITE_AS_ZEROS); > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 863a939210..7016205d15 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1550,7 +1550,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > .fw_unplugs_cpu = pm->smi_on_cpu_unplug, > }; > build_cpus_aml(dsdt, machine, opts, pc_madt_cpu_entry, > - pm->cpu_hp_io_base, "\\_SB.PCI0", "\\_GPE._E02"); > + pm->cpu_hp_io_base, "\\_SB.PCI0", "\\_GPE._E02", > + AML_SYSTEM_IO); > } > > if (pcms->memhp_io_base && nr_mem) { > diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h > index bc901660fb..601f644e57 100644 > --- a/include/hw/acpi/cpu.h > +++ b/include/hw/acpi/cpu.h > @@ -60,9 +60,10 @@ typedef void (*build_madt_cpu_fn)(int uid, const > CPUArchIdList *apic_ids, > GArray *entry, bool force_enabled); > > void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures > opts, > - build_madt_cpu_fn build_madt_cpu, hwaddr io_base, > + build_madt_cpu_fn build_madt_cpu, hwaddr mmap_io_base, > const char *res_root, > - const char *event_handler_method); > + const char *event_handler_method, > + AmlRegionSpace rs); > > void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList > ***list); > > -- > 2.39.1 >
