From 5b826e7ed09ecf3b2837d147fec6b593f629e450 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Fri, 4 Dec 2020 15:07:59 -0500 Subject: [PATCH 01/14] ppc/spapr: Add hotremovable flag on DIMM LMBs on drmem_v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Greg Kurz Message-id: <20201204150800.264829-2-gkurz@redhat.com> Patchwork-id: 100217 O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 1/2] ppc/spapr: Add hotremovable flag on DIMM LMBs on drmem_v2 Bugzilla: 1901837 RH-Acked-by: Danilo de Paula RH-Acked-by: David Gibson RH-Acked-by: Laurent Vivier From: Leonardo Bras On reboot, all memory that was previously added using object_add and device_add is placed in this DIMM area. The new SPAPR_LMB_FLAGS_HOTREMOVABLE flag helps Linux to put this memory in the correct memory zone, so no unmovable allocations are made there, allowing the object to be easily hot-removed by device_del and object_del. This new flag was accepted in Power Architecture documentation. Signed-off-by: Leonardo Bras Reviewed-by: Bharata B Rao Message-Id: <20200511200201.58537-1-leobras.c@gmail.com> [dwg: Fixed syntax error spotted by Cédric Le Goater] Signed-off-by: David Gibson (cherry picked from commit 0911a60c76b8598f1863c6951b2b690059465153) Signed-off-by: Greg Kurz Conflicts: hw/ppc/pnv.c The changes in this file clearly don't belong to this patch. Same goes for the changes in target/ppc/cpu.h and target/ppc/excp_helper.c. Something went wrong when the patch was applied. Anyway, downstream doesn't especially care for pnv, so just drop the changes. Signed-off-by: Danilo C. L. de Paula --- hw/ppc/spapr.c | 3 ++- include/hw/ppc/spapr.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a330f038b95..c74079702d0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -690,7 +690,8 @@ static int spapr_populate_drmem_v2(SpaprMachineState *spapr, void *fdt, g_assert(drc); elem = spapr_get_drconf_cell(size / lmb_size, addr, spapr_drc_index(drc), node, - SPAPR_LMB_FLAGS_ASSIGNED); + (SPAPR_LMB_FLAGS_ASSIGNED | + SPAPR_LMB_FLAGS_HOTREMOVABLE)); QSIMPLEQ_INSERT_TAIL(&drconf_queue, elem, entry); nr_entries++; cur_addr = addr + size; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index aa89cc4a95c..e047dabf300 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -847,6 +847,7 @@ int spapr_rtc_import_offset(SpaprRtcState *rtc, int64_t legacy_offset); #define SPAPR_LMB_FLAGS_ASSIGNED 0x00000008 #define SPAPR_LMB_FLAGS_DRC_INVALID 0x00000020 #define SPAPR_LMB_FLAGS_RESERVED 0x00000080 +#define SPAPR_LMB_FLAGS_HOTREMOVABLE 0x00000100 void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg); -- 2.27.0