c025e9059a
- coro: support live patch for libcare
- tests/acpi: Update expected ACPI tables for vcpu hotplug(update BinDir)
- arm/virt: Require mc->has_hotpluggable_cpus for cold-plugged vcpu
- arm/virt: Consider has_ged when set mc->has_hotpluggable_cpus
- arm/virt-acpi: Require possible_cpu_arch_ids for build_cpus_aml()
- acpi/ged: Remove cpuhp field of ged
- acpi/ged: Init cpu hotplug only when machine support it
- intc/gicv3: Fixes for vcpu hotplug
- arm/kvm: Set psci smccc filter only with vcpu hotplug
- accel/kvm: Use correct id for parked vcpu
- arm/virt: Fix adjudgement of core_id for vcpu hotplugged
- arm/virt.c: Convey local_err when set psci-conduit
- system/cpus: Fix resume_all_vcpus() under vCPU hotplug condition
- system/cpus: Fix pause_all_vcpus() under concurrent environment
- acpi/cpu: Fix cpu_hotplug_hw_init()
- arm/cpu: Some fixes for arm_cpu_unrealizefn()
- system/physmem: Fix possible double free when destroy cpu as
- hw/arm/virt: Expose cold-booted CPUs as MADT GICC Enabled
- tcg/mttcg: enable threads to unregister in tcg_ctxs[]
- hw/arm: Support hotplug capability check using _OSC method
- target/arm/kvm,tcg: Register/Handle SMCCC hypercall exits to VMM/Qemu
- target/arm/kvm: Write CPU state back to KVM on reset
- target/arm: Add support of *unrealize* ARMCPU during vCPU Hot-unplug
- physmem,gdbstub: Common helping funcs/changes to *unrealize* vCPU
- hw/arm: Changes required for reset and to support next boot
- arm/virt: Update the guest(via GED) about CPU hot-(un)plug events
- hw/intc/arm-gicv3*: Changes required to (re)init the vCPU register info
- hw/arm,gicv3: Changes to update GIC with vCPU hot-plug notification
- arm/virt: Changes to (un)wire GICC<->vCPU IRQs during hot-(un)plug
- arm/virt: Add/update basic hot-(un)plug framework
- hw/acpi: Update ACPI GED framework to support vCPU Hotplug
- arm/virt: Release objects for *disabled* possible vCPUs after init
- hw/acpi: Make _MAT method optional
- hw/arm: MADT Tbl change to size the guest with possible vCPUs
- hw/acpi: Update GED _EVT method AML with cpu scan
- hw/acpi: ACPI/AML Changes to reflect the correct _STA.{PRES,ENA} Bits to Guest
- arm/virt: Make ARM vCPU *present* status ACPI *persistent*
- arm/virt/acpi: Build CPUs AML with CPU Hotplug support
- tests/acpi/bios-tables-test: Allow changes to virt/DSDT file
- acpi/cpu: Add cpu_cppc building support
- arm/virt/acpi: Factor out CPPC building from DSDT CPU aml
- hw/acpi: Update CPUs AML with cpu-(ctrl)dev change
- arm/virt: Create GED dev before *disabled* CPU Objs are destroyed
- arm/virt: Add cpu hotplug events to GED during creation
- hw/acpi: Init GED framework with cpu hotplug events
- hw/acpi: Use qemu_present_cpu() API in ACPI CPU hotplug init
- hw/acpi: Add ACPI CPU hotplug init stub
- arm/acpi: Enable ACPI support for vcpu hotplug
- hw/acpi: Move CPU ctrl-dev MMIO region len macro to common header file
- arm/virt: Init PMU at host for all possible vcpus
- arm/virt,gicv3: Changes to pre-size GIC with possible vcpus @machine init
- arm/virt,kvm: Pre-create disabled possible vCPUs @machine init
- accel/kvm: Extract common KVM vCPU {creation,parking} code
- arm/virt,target/arm: Machine init time change common to vCPU {cold|hot}-plug
- hw/arm/virt: Move setting of common CPU properties in a function
- cpus-common: Add common CPU utility for possible vCPUs
- arm/virt,target/arm: Add new ARMCPU {socket,cluster,core,thread}-id property
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
73 lines
3.0 KiB
Diff
73 lines
3.0 KiB
Diff
From c75a0102a1bb00190b07b06ede8b1f9fa0bdaa3c Mon Sep 17 00:00:00 2001
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Date: Tue, 2 Apr 2024 16:52:10 +0800
|
|
Subject: [PATCH] acpi/cpu: Add cpu_cppc building support
|
|
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
---
|
|
hw/acpi/cpu.c | 8 +++++++-
|
|
hw/i386/acpi-build.c | 2 +-
|
|
include/hw/acpi/cpu.h | 6 +++++-
|
|
3 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
|
|
index cf0c7e8538..c8c11e51c6 100644
|
|
--- a/hw/acpi/cpu.c
|
|
+++ b/hw/acpi/cpu.c
|
|
@@ -342,7 +342,9 @@ 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 base_addr,
|
|
+ build_madt_cpu_fn build_madt_cpu,
|
|
+ build_cpu_cppc_fn build_cpu_cppc,
|
|
+ hwaddr base_addr,
|
|
const char *res_root,
|
|
const char *event_handler_method,
|
|
AmlRegionSpace rs)
|
|
@@ -668,6 +670,10 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
|
|
aml_append(dev, aml_name_decl("_UID", uid));
|
|
}
|
|
|
|
+ if (build_cpu_cppc) {
|
|
+ build_cpu_cppc(i, arch_ids->len, dev);
|
|
+ }
|
|
+
|
|
method = aml_method("_STA", 0, AML_SERIALIZED);
|
|
aml_append(method, aml_return(aml_call1(CPU_STS_METHOD, uid)));
|
|
aml_append(dev, method);
|
|
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
|
|
index db4ca8a66a..e10799ecc6 100644
|
|
--- a/hw/i386/acpi-build.c
|
|
+++ b/hw/i386/acpi-build.c
|
|
@@ -1545,7 +1545,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
|
|
.smi_path = pm->smi_on_cpuhp ? "\\_SB.PCI0.SMI0.SMIC" : NULL,
|
|
.fw_unplugs_cpu = pm->smi_on_cpu_unplug,
|
|
};
|
|
- build_cpus_aml(dsdt, machine, opts, pc_madt_cpu_entry,
|
|
+ build_cpus_aml(dsdt, machine, opts, pc_madt_cpu_entry, NULL,
|
|
pm->cpu_hp_io_base, "\\_SB.PCI0", "\\_GPE._E02",
|
|
AML_SYSTEM_IO);
|
|
}
|
|
diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
|
|
index 76bc7eb251..b31a2e50d9 100644
|
|
--- a/include/hw/acpi/cpu.h
|
|
+++ b/include/hw/acpi/cpu.h
|
|
@@ -59,8 +59,12 @@ typedef struct CPUHotplugFeatures {
|
|
typedef void (*build_madt_cpu_fn)(int uid, const CPUArchIdList *apic_ids,
|
|
GArray *entry, bool force_enabled);
|
|
|
|
+typedef void (*build_cpu_cppc_fn)(int uid, int num_cpu, Aml *dev);
|
|
+
|
|
void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
|
|
- build_madt_cpu_fn build_madt_cpu, hwaddr base_addr,
|
|
+ build_madt_cpu_fn build_madt_cpu,
|
|
+ build_cpu_cppc_fn build_cpu_cppc,
|
|
+ hwaddr base_addr,
|
|
const char *res_root,
|
|
const char *event_handler_method,
|
|
AmlRegionSpace rs);
|
|
--
|
|
2.27.0
|
|
|