From patchwork Fri Jul 24 06:50:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 499604 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 932BA1402A0 for ; Fri, 24 Jul 2015 16:51:05 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 76BBE1A0B8C for ; Fri, 24 Jul 2015 16:51:05 +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 7B5901A0743 for ; Fri, 24 Jul 2015 16:51:01 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 66CAF1402A0; Fri, 24 Jul 2015 16:51:01 +1000 (AEST) MIME-Version: 1.0 Message-Id: <1437720657.167554.318887612077.7.gpush@pablo> In-Reply-To: <1437720657.165281.93625520876.0.gpush@pablo> To: skiboot@lists.ozlabs.org From: Jeremy Kerr Date: Fri, 24 Jul 2015 14:50:57 +0800 Subject: [Skiboot] [PATCH 7/7 v2] hw/homer: Don't re-reserve homer 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: , 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 | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/hw/homer.c b/hw/homer.c index 6d5544e..84eb536 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; @@ -132,9 +141,15 @@ void homer_init(void) chip = next_chip(NULL); if (chip->homer_base && chip->occ_common_base) { - /* Reserve OCC comman area from BAR */ - mem_reserve_hw("ibm,occ-common-area", chip->occ_common_base, + /* Reserve OCC common area from BAR */ + if (!mem_range_is_reserved(chip->occ_common_base, + chip->occ_common_size)) { + prlog(PR_WARNING, + "OCC common area is not reserved! Reserving\n"); + mem_reserve_hw("ibm,occ-common-area", + chip->occ_common_base, chip->occ_common_size); + } } else { /* Allocate memory for HOMER and OCC common area */ host_services_occ_base_setup();