[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 8/8] x86: ich9: let firmware negotiate 'CPU hot-unplug with SM
From: |
Igor Mammedov |
Subject: |
[PATCH v2 8/8] x86: ich9: let firmware negotiate 'CPU hot-unplug with SMI' feature |
Date: |
Mon, 7 Dec 2020 09:07:39 -0500 |
Keep CPU hotunplug with SMI disabled on 5.2 and older and enable
it by default on newer machine types.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v1:
- ensure that unplug can't be enabled without hotplug (Laszlo)
---
hw/i386/pc.c | 4 +++-
hw/isa/lpc_ich9.c | 8 +++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 781523684c..6476d8d853 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -97,7 +97,9 @@
#include "trace.h"
#include CONFIG_DEVICES
-GlobalProperty pc_compat_5_2[] = {};
+GlobalProperty pc_compat_5_2[] = {
+ { "ICH9-LPC", "x-smi-cpu-hotunplug", "off" },
+};
const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2);
GlobalProperty pc_compat_5_1[] = {
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index da80430144..d3145bf014 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -392,6 +392,12 @@ static void smi_features_ok_callback(void *opaque)
return;
}
+ if (guest_cpu_hotplug_features ==
+ BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT)) {
+ /* cpu hot-unplug is unsupported without cpu-hotplug */
+ return;
+ }
+
/* valid feature subset requested, lock it down, report success */
lpc->smi_negotiated_features = guest_features;
lpc->smi_features_ok = 1;
@@ -774,7 +780,7 @@ static Property ich9_lpc_properties[] = {
DEFINE_PROP_BIT64("x-smi-cpu-hotplug", ICH9LPCState, smi_host_features,
ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT, true),
DEFINE_PROP_BIT64("x-smi-cpu-hotunplug", ICH9LPCState, smi_host_features,
- ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT, false),
+ ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT, true),
DEFINE_PROP_END_OF_LIST(),
};
--
2.27.0
- [PATCH v2 0/8] add support for cpu hot-unplug with SMI broadcast enabled, Igor Mammedov, 2020/12/07
- [PATCH v2 1/8] hw: add compat machines for 6.0, Igor Mammedov, 2020/12/07
- [PATCH v2 3/8] x86: acpi: introduce AcpiPmInfo::smi_on_cpu_unplug, Igor Mammedov, 2020/12/07
- [PATCH v2 2/8] acpi: cpuhp: introduce 'firmware performs eject' status/control bits, Igor Mammedov, 2020/12/07
- [PATCH v2 4/8] tests/acpi: allow expected files change, Igor Mammedov, 2020/12/07
- [PATCH v2 5/8] x86: acpi: let the firmware handle pending "CPU remove" events in SMM, Igor Mammedov, 2020/12/07
- [PATCH v2 8/8] x86: ich9: let firmware negotiate 'CPU hot-unplug with SMI' feature,
Igor Mammedov <=
- [PATCH v2 6/8] tests/acpi: update expected files, Igor Mammedov, 2020/12/07
- [PATCH v2 7/8] x86: ich9: factor out "guest_cpu_hotplug_features", Igor Mammedov, 2020/12/07