From patchwork Thu Jun 4 01:28:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 480343 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 4990114018C for ; Thu, 4 Jun 2015 11:30:21 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 34E281A0FB9 for ; Thu, 4 Jun 2015 11:30:21 +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 26EEA1A1925 for ; Thu, 4 Jun 2015 11:28:39 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1023) id 129391401F6; Thu, 4 Jun 2015 11:28:39 +1000 (AEST) MIME-Version: 1.0 Message-Id: <1433381291.609349.906076252724.1.gpush@pablo> To: skiboot@lists.ozlabs.org From: Jeremy Kerr Date: Thu, 04 Jun 2015 09:28:11 +0800 Subject: [Skiboot] [PATCH] core/mem_region: Create reservations of type REGION_HW_RESERVED 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" All current users of mem_reserve are actually wanting HW_RESERVED memory; these reservations are for memory initialised pre-skiboot. This change marks these regions as REGION_HW_RESERVED instead of REGION_RESERVED. We also rename mem_reserve to mem_reserve_hw to reflect this change. This fixes an issue where the PRD daemon cannot find reserved ranges (eg, the homer image) that have been created by skiboot itself. Signed-off-by: Jeremy Kerr --- core/mem_region.c | 4 ++-- core/test/run-mem_region_reservations.c | 3 ++- hw/homer.c | 6 +++--- include/mem_region.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/mem_region.c b/core/mem_region.c index f6d5a7a..21c48bc 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -664,13 +664,13 @@ static bool add_region(struct mem_region *region) return true; } -void mem_reserve(const char *name, uint64_t start, uint64_t len) +void mem_reserve_hw(const char *name, uint64_t start, uint64_t len) { struct mem_region *region; bool added; lock(&mem_region_lock); - region = new_region(name, start, len, NULL, REGION_RESERVED); + region = new_region(name, start, len, NULL, REGION_HW_RESERVED); assert(region); added = add_region(region); assert(added); diff --git a/core/test/run-mem_region_reservations.c b/core/test/run-mem_region_reservations.c index fcde110..59b6e06 100644 --- a/core/test/run-mem_region_reservations.c +++ b/core/test/run-mem_region_reservations.c @@ -208,7 +208,8 @@ int main(void) /* create our reservations */ for (i = 0; i < ARRAY_SIZE(test_regions); i++) - mem_reserve(test_regions[i].name, test_regions[i].addr, 0x1000); + mem_reserve_hw(test_regions[i].name, + test_regions[i].addr, 0x1000); /* release unused */ mem_region_release_unused(); diff --git a/hw/homer.c b/hw/homer.c index 95ae73a..6d5544e 100644 --- a/hw/homer.c +++ b/hw/homer.c @@ -72,7 +72,7 @@ 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("ibm,homer-image", hbase, hsize); + mem_reserve_hw("ibm,homer-image", hbase, hsize); chip->homer_base = hbase; chip->homer_size = hsize; @@ -92,7 +92,7 @@ static void homer_init_chip(struct proc_chip *chip) */ if (sbase < hbase || sbase > (hbase + hsize) || (hbase == 0 && sbase > 0)) - mem_reserve("ibm,slw-image", sbase, ssize); + mem_reserve_hw("ibm,slw-image", sbase, ssize); chip->slw_base = sbase; chip->slw_bar_size = ssize; @@ -133,7 +133,7 @@ void homer_init(void) chip = next_chip(NULL); if (chip->homer_base && chip->occ_common_base) { /* Reserve OCC comman area from BAR */ - mem_reserve("ibm,occ-common-area", chip->occ_common_base, + mem_reserve_hw("ibm,occ-common-area", chip->occ_common_base, chip->occ_common_size); } else { /* Allocate memory for HOMER and OCC common area */ diff --git a/include/mem_region.h b/include/mem_region.h index e2827c3..d1da02a 100644 --- a/include/mem_region.h +++ b/include/mem_region.h @@ -70,7 +70,7 @@ void mem_region_init(void); void mem_region_add_dt_reserved(void); /* Mark memory as reserved */ -void mem_reserve(const char *name, uint64_t start, uint64_t len); +void mem_reserve_hw(const char *name, uint64_t start, uint64_t len); struct mem_region *find_mem_region(const char *name);