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>
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From de1c8d6be3de67ff9854e9b008a000e1898aaacb Mon Sep 17 00:00:00 2001
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
|
Date: Mon, 8 Jun 2020 21:50:08 +0100
|
|
Subject: [PATCH] hw/acpi: Init GED framework with cpu hotplug events
|
|
|
|
ACPI GED(as described in the ACPI 6.2 spec) can be used to generate ACPI events
|
|
when OSPM/guest receives an interrupt listed in the _CRS object of GED. OSPM
|
|
then maps or demultiplexes the event by evaluating _EVT method.
|
|
|
|
This change adds the support of cpu hotplug event initialization in the
|
|
existing GED framework.
|
|
|
|
Co-developed-by: Salil Mehta <salil.mehta@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
Co-developed-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
---
|
|
hw/acpi/generic_event_device.c | 8 ++++++++
|
|
include/hw/acpi/generic_event_device.h | 5 +++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
|
|
index a3d31631fe..d2fa1d0e4a 100644
|
|
--- a/hw/acpi/generic_event_device.c
|
|
+++ b/hw/acpi/generic_event_device.c
|
|
@@ -25,6 +25,7 @@ static const uint32_t ged_supported_events[] = {
|
|
ACPI_GED_MEM_HOTPLUG_EVT,
|
|
ACPI_GED_PWR_DOWN_EVT,
|
|
ACPI_GED_NVDIMM_HOTPLUG_EVT,
|
|
+ ACPI_GED_CPU_HOTPLUG_EVT,
|
|
};
|
|
|
|
/*
|
|
@@ -400,6 +401,13 @@ static void acpi_ged_initfn(Object *obj)
|
|
memory_region_init_io(&ged_st->regs, obj, &ged_regs_ops, ged_st,
|
|
TYPE_ACPI_GED "-regs", ACPI_GED_REG_COUNT);
|
|
sysbus_init_mmio(sbd, &ged_st->regs);
|
|
+
|
|
+ s->cpuhp.device = OBJECT(s);
|
|
+ memory_region_init(&s->container_cpuhp, OBJECT(dev), "cpuhp container",
|
|
+ ACPI_CPU_HOTPLUG_REG_LEN);
|
|
+ sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->container_cpuhp);
|
|
+ cpu_hotplug_hw_init(&s->container_cpuhp, OBJECT(dev),
|
|
+ &s->cpuhp_state, 0);
|
|
}
|
|
|
|
static void acpi_ged_class_init(ObjectClass *class, void *data)
|
|
diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
|
|
index ba84ce0214..a803ea818e 100644
|
|
--- a/include/hw/acpi/generic_event_device.h
|
|
+++ b/include/hw/acpi/generic_event_device.h
|
|
@@ -60,6 +60,7 @@
|
|
#define HW_ACPI_GENERIC_EVENT_DEVICE_H
|
|
|
|
#include "hw/sysbus.h"
|
|
+#include "hw/acpi/cpu_hotplug.h"
|
|
#include "hw/acpi/memory_hotplug.h"
|
|
#include "hw/acpi/ghes.h"
|
|
#include "qom/object.h"
|
|
@@ -95,6 +96,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)
|
|
#define ACPI_GED_MEM_HOTPLUG_EVT 0x1
|
|
#define ACPI_GED_PWR_DOWN_EVT 0x2
|
|
#define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4
|
|
+#define ACPI_GED_CPU_HOTPLUG_EVT 0x8
|
|
|
|
typedef struct GEDState {
|
|
MemoryRegion evt;
|
|
@@ -106,6 +108,9 @@ struct AcpiGedState {
|
|
SysBusDevice parent_obj;
|
|
MemHotplugState memhp_state;
|
|
MemoryRegion container_memhp;
|
|
+ CPUHotplugState cpuhp_state;
|
|
+ MemoryRegion container_cpuhp;
|
|
+ AcpiCpuHotplug cpuhp;
|
|
GEDState ged_state;
|
|
uint32_t ged_event_bitmap;
|
|
qemu_irq irq;
|
|
--
|
|
2.27.0
|
|
|