From nobody Sun Nov 9 16:22:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551157949676154.79017284928125; Mon, 25 Feb 2019 21:12:29 -0800 (PST) Received: from localhost ([127.0.0.1]:49038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyV2X-00028G-IU for importer@patchew.org; Tue, 26 Feb 2019 00:12:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUkr-000528-Rp for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyUkp-0002V2-Eb for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:09 -0500 Received: from ozlabs.org ([203.11.71.1]:40587) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyUko-0002Ps-Nc; Mon, 25 Feb 2019 23:54:07 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 447mfM0sJRz9sNg; Tue, 26 Feb 2019 15:53:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1551156795; bh=PozyvyBkpzRVwWH33mG91XcWtebCdz+l1vKOKWY3U6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abEhBIGBLTUQNYtwuvro/gLebUAr61I25FhgyxkE6KQlYQuIZbDkKFa/pZDyfvCWZ 70a23PHy4n59a80nx4Rp1mXfZjrFWj+lHKpy2/PGaY0pNMvP5Co9zqYWZsri6Hp1CF N8hz6J/gOYFlij9oJAndkVjI/uJjEdHxWz6nxNLs= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 26 Feb 2019 15:52:45 +1100 Message-Id: <20190226045304.25618-32-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226045304.25618-1-david@gibson.dropbear.id.au> References: <20190226045304.25618-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 31/50] spapr: Generate FDT fragment for CPUs at configure connector time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, gkurz@kaod.org, Greg Kurz , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Signed-off-by: Greg Kurz Message-Id: <155059666839.1466090.3833376527523126752.stgit@bahia.lab.toulo= use-stg.fr.ibm.com> Signed-off-by: David Gibson --- hw/ppc/spapr.c | 52 +++++++++++++++++++----------------------- hw/ppc/spapr_drc.c | 1 + include/hw/ppc/spapr.h | 2 ++ 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b92deee771..6cf7a9f5c1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3636,27 +3636,6 @@ out: error_propagate(errp, local_err); } =20 -static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, - sPAPRMachineState *spapr) -{ - PowerPCCPU *cpu =3D POWERPC_CPU(cs); - DeviceClass *dc =3D DEVICE_GET_CLASS(cs); - int id =3D spapr_get_vcpu_id(cpu); - void *fdt; - int offset, fdt_size; - char *nodename; - - fdt =3D create_device_tree(&fdt_size); - nodename =3D g_strdup_printf("%s@%x", dc->fw_name, id); - offset =3D fdt_add_subnode(fdt, 0, nodename); - - spapr_populate_cpu_dt(cs, fdt, offset, spapr); - g_free(nodename); - - *fdt_offset =3D offset; - return fdt; -} - /* Callback to be called during DRC release. */ void spapr_core_release(DeviceState *dev) { @@ -3717,6 +3696,27 @@ void spapr_core_unplug_request(HotplugHandler *hotpl= ug_dev, DeviceState *dev, spapr_hotplug_req_remove_by_index(drc); } =20 +int spapr_core_dt_populate(sPAPRDRConnector *drc, sPAPRMachineState *spapr, + void *fdt, int *fdt_start_offset, Error **errp) +{ + sPAPRCPUCore *core =3D SPAPR_CPU_CORE(drc->dev); + CPUState *cs =3D CPU(core->threads[0]); + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + DeviceClass *dc =3D DEVICE_GET_CLASS(cs); + int id =3D spapr_get_vcpu_id(cpu); + char *nodename; + int offset; + + nodename =3D g_strdup_printf("%s@%x", dc->fw_name, id); + offset =3D fdt_add_subnode(fdt, 0, nodename); + g_free(nodename); + + spapr_populate_cpu_dt(cs, fdt, offset, spapr); + + *fdt_start_offset =3D offset; + return 0; +} + static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -3725,7 +3725,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_d= ev, DeviceState *dev, sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); sPAPRCPUCore *core =3D SPAPR_CPU_CORE(OBJECT(dev)); CPUCore *cc =3D CPU_CORE(dev); - CPUState *cs =3D CPU(core->threads[0]); + CPUState *cs; sPAPRDRConnector *drc; Error *local_err =3D NULL; CPUArchId *core_slot; @@ -3744,14 +3744,8 @@ static void spapr_core_plug(HotplugHandler *hotplug_= dev, DeviceState *dev, g_assert(drc || !mc->has_hotpluggable_cpus); =20 if (drc) { - void *fdt; - int fdt_offset; - - fdt =3D spapr_populate_hotplug_cpu_dt(cs, &fdt_offset, spapr); - - spapr_drc_attach(drc, dev, fdt, fdt_offset, &local_err); + spapr_drc_attach(drc, dev, NULL, 0, &local_err); if (local_err) { - g_free(fdt); error_propagate(errp, local_err); return; } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 634c28695a..aa26aa40be 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -680,6 +680,7 @@ static void spapr_drc_cpu_class_init(ObjectClass *k, vo= id *data) drck->typename =3D "CPU"; drck->drc_name_prefix =3D "CPU "; drck->release =3D spapr_core_release; + drck->dt_populate =3D spapr_core_dt_populate; } =20 static void spapr_drc_pci_class_init(ObjectClass *k, void *data) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 0ec309da49..5e3c760725 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -766,6 +766,8 @@ int spapr_max_server_number(sPAPRMachineState *spapr); =20 /* DRC callbacks. */ void spapr_core_release(DeviceState *dev); +int spapr_core_dt_populate(sPAPRDRConnector *drc, sPAPRMachineState *spapr, + void *fdt, int *fdt_start_offset, Error **errp); void spapr_lmb_release(DeviceState *dev); int spapr_lmb_dt_populate(sPAPRDRConnector *drc, sPAPRMachineState *spapr, void *fdt, int *fdt_start_offset, Error **errp); --=20 2.20.1