diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-06-04 09:28:11 +0800 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-06-05 11:43:24 +1000 |
| commit | 9ea274ef840bc90fc6df40bf884325cdb565b689 (patch) | |
| tree | e86df6ee4cf253bf50ce927d1241fa59b8758ef9 /hw/homer.c | |
| parent | 417333aa73103b3cc05b27df5e4b328fe71dab5f (diff) | |
| download | skiboot-9ea274ef840bc90fc6df40bf884325cdb565b689.zip skiboot-9ea274ef840bc90fc6df40bf884325cdb565b689.tar.gz skiboot-9ea274ef840bc90fc6df40bf884325cdb565b689.tar.bz2 | |
core/mem_region: Create reservations of type REGION_HW_RESERVEDskiboot-5.0.3
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 <jk@ozlabs.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw/homer.c')
| -rw-r--r-- | hw/homer.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 */ |