From patchwork Tue Jul 21 09:09:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 498115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 14214140D31 for ; Tue, 21 Jul 2015 19:10:06 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id EC5CE1A1956 for ; Tue, 21 Jul 2015 19:10:05 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 209811A0ACF for ; Tue, 21 Jul 2015 19:09:55 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 0217A140D31; Tue, 21 Jul 2015 19:09:54 +1000 (AEST) MIME-Version: 1.0 Message-Id: <1437469789.288142.111914514220.2.gpush@pablo> In-Reply-To: <1437469789.287717.342631187377.1.gpush@pablo> To: skiboot@lists.ozlabs.org From: Jeremy Kerr Date: Tue, 21 Jul 2015 17:09:49 +0800 Subject: [Skiboot] [RFC, PATCH 2/2] hw/homer: Don't re-reserve homer-image and slw-image ranges 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: , Cc: Daniel M Crowell Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Hostboot is going to cover these ranges with its own reservations (to allow access from the HBRT image), so don't overwrite reservations with our own. Signed-off-by: Jeremy Kerr --- hw/homer.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/homer.c b/hw/homer.c index 6d5544e..88f7ae9 100644 --- a/hw/homer.c +++ b/hw/homer.c @@ -72,7 +72,12 @@ static void homer_init_chip(struct proc_chip *chip) if (read_pba_bar(chip, 0, &hbase, &hsize)) { prlog(PR_DEBUG, " HOMER Image at 0x%llx size %lldMB\n", hbase, hsize / 0x100000); - mem_reserve_hw("ibm,homer-image", hbase, hsize); + + if (!mem_range_is_reserved(hbase, hsize)) { + prlog(PR_WARNING, + "HOMER image is not reserved! Reserving\n"); + mem_reserve_hw("ibm,homer-image", hbase, hsize); + } chip->homer_base = hbase; chip->homer_size = hsize; @@ -90,9 +95,13 @@ static void homer_init_chip(struct proc_chip *chip) * Only reserve it if we have no homer image or if it * doesn't fit in it (only check the base). */ - if (sbase < hbase || sbase > (hbase + hsize) || - (hbase == 0 && sbase > 0)) + if ((sbase < hbase || sbase > (hbase + hsize) || + (hbase == 0 && sbase > 0)) && + !mem_range_is_reserved(sbase, ssize)) { + prlog(PR_WARNING, + "SLW image is not reserved! Reserving\n"); mem_reserve_hw("ibm,slw-image", sbase, ssize); + } chip->slw_base = sbase; chip->slw_bar_size = ssize;