From nobody Sun Nov 9 16:00:47 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 1551158963604623.7196139672503; Mon, 25 Feb 2019 21:29:23 -0800 (PST) Received: from localhost ([127.0.0.1]:49387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyVIq-0007KP-Hn for importer@patchew.org; Tue, 26 Feb 2019 00:29:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyUlH-0005PC-IG for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyUlF-0002ty-IW for qemu-devel@nongnu.org; Mon, 25 Feb 2019 23:54:35 -0500 Received: from ozlabs.org ([203.11.71.1]:48363) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyUlA-0002Ty-I0; Mon, 25 Feb 2019 23:54:32 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 447mfM4Cw4z9sNt; Tue, 26 Feb 2019 15:53:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1551156795; bh=h3Gs2lJbXlMOi2IaZmnvaBQHgYpOKfqM+mN5C5fzsBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h9PlqkUJMCxqm8Lv6w5gECK7crfWOkhp7fBSmkx5FIhfSiQ41qTJjQZi8YKXD+tl/ I4mQwW6WXFTbVWzWCdq3V3Mo61CyreqaOW3qkqE1YNvNvKxSc58+zB6Rqe+BVN4nRm XifRLAaQzJl+CEo//Alr0CRz7zOmOjV8IyXIty1w= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 26 Feb 2019 15:52:44 +1100 Message-Id: <20190226045304.25618-31-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 30/50] spapr: Generate FDT fragment for LMBs 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: <155059666331.1466090.6766540766297333313.stgit@bahia.lab.toulo= use-stg.fr.ibm.com> Signed-off-by: David Gibson Reported-by: Peter Maydell --- hw/ppc/spapr.c | 33 ++++++++++++++++++--------------- hw/ppc/spapr_drc.c | 1 + include/hw/ppc/spapr.h | 4 +++- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 00eb3b643c..b92deee771 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3333,14 +3333,26 @@ static void spapr_nmi(NMIState *n, int cpu_index, E= rror **errp) } } =20 +int spapr_lmb_dt_populate(sPAPRDRConnector *drc, sPAPRMachineState *spapr, + void *fdt, int *fdt_start_offset, Error **errp) +{ + uint64_t addr; + uint32_t node; + + addr =3D spapr_drc_index(drc) * SPAPR_MEMORY_BLOCK_SIZE; + node =3D object_property_get_uint(OBJECT(drc->dev), PC_DIMM_NODE_PROP, + &error_abort); + *fdt_start_offset =3D spapr_populate_memory_node(fdt, node, addr, + SPAPR_MEMORY_BLOCK_SIZE= ); + return 0; +} + static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t= size, - uint32_t node, bool dedicated_hp_event_source, - Error **errp) + bool dedicated_hp_event_source, Error **errp) { sPAPRDRConnector *drc; uint32_t nr_lmbs =3D size/SPAPR_MEMORY_BLOCK_SIZE; - int i, fdt_offset, fdt_size; - void *fdt; + int i; uint64_t addr =3D addr_start; bool hotplugged =3D spapr_drc_hotplugged(dev); Error *local_err =3D NULL; @@ -3350,11 +3362,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_= t addr_start, uint64_t size, addr / SPAPR_MEMORY_BLOCK_SIZE); g_assert(drc); =20 - fdt =3D create_device_tree(&fdt_size); - fdt_offset =3D spapr_populate_memory_node(fdt, node, addr, - SPAPR_MEMORY_BLOCK_SIZE); - - spapr_drc_attach(drc, dev, fdt, fdt_offset, &local_err); + spapr_drc_attach(drc, dev, NULL, 0, &local_err); if (local_err) { while (addr > addr_start) { addr -=3D SPAPR_MEMORY_BLOCK_SIZE; @@ -3362,7 +3370,6 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t= addr_start, uint64_t size, addr / SPAPR_MEMORY_BLOCK_SIZE); spapr_drc_detach(drc); } - g_free(fdt); error_propagate(errp, local_err); return; } @@ -3395,7 +3402,6 @@ static void spapr_memory_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, sPAPRMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); PCDIMMDevice *dimm =3D PC_DIMM(dev); uint64_t size, addr; - uint32_t node; =20 size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); =20 @@ -3410,10 +3416,7 @@ static void spapr_memory_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, goto out_unplug; } =20 - node =3D object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, - &error_abort); - spapr_add_lmbs(dev, addr, size, node, - spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), + spapr_add_lmbs(dev, addr, size, spapr_ovec_test(ms->ov5_cas, OV5_HP_EV= T), &local_err); if (local_err) { goto out_unplug; diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 66b965a0a7..634c28695a 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -700,6 +700,7 @@ static void spapr_drc_lmb_class_init(ObjectClass *k, vo= id *data) drck->typename =3D "MEM"; drck->drc_name_prefix =3D "LMB "; drck->release =3D spapr_lmb_release; + drck->dt_populate =3D spapr_lmb_dt_populate; } =20 static const TypeInfo spapr_dr_connector_info =3D { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 659204ea93..0ec309da49 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -764,9 +764,11 @@ void spapr_reallocate_hpt(sPAPRMachineState *spapr, in= t shift, void spapr_clear_pending_events(sPAPRMachineState *spapr); int spapr_max_server_number(sPAPRMachineState *spapr); =20 -/* CPU and LMB DRC release callbacks. */ +/* DRC callbacks. */ void spapr_core_release(DeviceState *dev); void spapr_lmb_release(DeviceState *dev); +int spapr_lmb_dt_populate(sPAPRDRConnector *drc, sPAPRMachineState *spapr, + void *fdt, int *fdt_start_offset, Error **errp); =20 void spapr_rtc_read(sPAPRRTCState *rtc, struct tm *tm, uint32_t *ns); int spapr_rtc_import_offset(sPAPRRTCState *rtc, int64_t legacy_offset); --=20 2.20.1