From patchwork Mon Aug 17 06:49:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 507773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44F89140293 for ; Mon, 17 Aug 2015 16:50:13 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 1DADE1A2AFA for ; Mon, 17 Aug 2015 16:50:13 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id A5E451A1DDC for ; Mon, 17 Aug 2015 16:49:57 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 7E1F6140293; Mon, 17 Aug 2015 16:49:57 +1000 (AEST) MIME-Version: 1.0 Message-Id: <1439794193.542609.610399203572.4.gpush@pudge> In-Reply-To: <1439794193.542192.340390056346.0.gpush@pudge> To: skiboot@lists.ozlabs.org From: Jeremy Kerr Date: Mon, 17 Aug 2015 14:49:53 +0800 Subject: [Skiboot] [PATCH 4/7 v3] core/mem_region: allow pre-existing reserved-memory nodes X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" If the HB device tree provides a top-level reserved-memory node, we'll abort(). We want to be able to handle a pre-populated reserved-memory node in a future change, so handle this case gracefully. Signed-off-by: Jeremy Kerr --- core/mem_region.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/mem_region.c b/core/mem_region.c index f46afda..f4cab8c 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -1011,10 +1011,13 @@ void mem_region_add_dt_reserved(void) mem_regions_finalised = true; /* establish top-level reservation node */ - node = dt_new(dt_root, "reserved-memory"); - dt_add_property_cells(node, "#address-cells", 2); - dt_add_property_cells(node, "#size-cells", 2); - dt_add_property(node, "ranges", NULL, 0); + node = dt_find_by_path(dt_root, "reserved-memory"); + if (!node) { + node = dt_new(dt_root, "reserved-memory"); + dt_add_property_cells(node, "#address-cells", 2); + dt_add_property_cells(node, "#size-cells", 2); + dt_add_property(node, "ranges", NULL, 0); + } /* First pass: calculate length of property data */ list_for_each(®ions, region, list) {