diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2016-11-04 11:32:29 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-11-28 11:59:27 -0500 |
| commit | fb330b92dd7dc909e1aa57e2ccf9d898dc491201 (patch) | |
| tree | 504611852662998ad5be99edc8b56718a312520f /src/include/usr/vmmconst.h | |
| parent | 9a0fdcd8ff57347c86244c7c4006856e1321d203 (diff) | |
| download | talos-hostboot-fb330b92dd7dc909e1aa57e2ccf9d898dc491201.tar.gz talos-hostboot-fb330b92dd7dc909e1aa57e2ccf9d898dc491201.zip | |
Change HOMER logic to use offset instead of address
Due to the changes in the P9 memory map, we can no longer assume
that address zero exists as we're booting. These changes modify
the logic related to assigning memory space for the HOMER to use
an offset from the local HRMOR instead of assuming a zero base.
Change-Id: If03c236ef9f2ddfee2dfd03337d6b202a5eb347d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32317
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/usr/vmmconst.h')
| -rw-r--r-- | src/include/usr/vmmconst.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/include/usr/vmmconst.h b/src/include/usr/vmmconst.h index 1c91ae326..a7a68cc79 100644 --- a/src/include/usr/vmmconst.h +++ b/src/include/usr/vmmconst.h @@ -131,28 +131,30 @@ enum BlockPriority /** Page Size in bits per SLBE */ #define SLBE_b 12 -/** Hardwired pointer to HOMER images in real mem */ -/** HOMER starts at 128MB + 32MB = 160MB */ +/** Hardwired offsets from HRMOR to HOMER images in real mem */ +/** HOMER starts immediately after our HB memory */ +/** <n0p0 HRMOR = 128MB> + <memory size = 32MB> = 160MB */ /** HOMER is 4 MB per proc, 8 procs = 32MB */ /** Each HOMER must start on a 4MB offset to meet OCC requirements */ -#define VMM_HOMER_REGION_START_ADDR (128*MEGABYTE + 32*MEGABYTE) +#define VMM_HOMER_REGION_START_OFFSET (VMM_MEMORY_SIZE) #define VMM_HOMER_INSTANCE_SIZE_IN_MB (4) #define VMM_HOMER_INSTANCE_SIZE \ (VMM_HOMER_INSTANCE_SIZE_IN_MB*MEGABYTE) #define VMM_HOMER_REGION_SIZE (VMM_HOMER_INSTANCE_SIZE*8) +#define VMM_HOMER_REGION_END_OFFSET \ + (VMM_HOMER_REGION_START_OFFSET + VMM_HOMER_REGION_SIZE) /** HOMER_REGION_END = 192MB */ -#define VMM_HOMER_REGION_END_ADDR \ - (VMM_HOMER_REGION_START_ADDR + VMM_HOMER_REGION_SIZE) /** Physical Memory for OCC common space - 8MB total */ /** OCC Common must be on an 8MB offset */ /** Start = End of Homer, currently 192MB */ -#define VMM_OCC_COMMON_START_ADDR VMM_HOMER_REGION_END_ADDR +#define VMM_OCC_COMMON_START_OFFSET VMM_HOMER_REGION_END_OFFSET #define VMM_OCC_COMMON_SIZE_IN_MB 8 #define VMM_OCC_COMMON_SIZE \ (VMM_OCC_COMMON_SIZE_IN_MB*MEGABYTE) -#define VMM_OCC_COMMON_END \ - (VMM_OCC_COMMON_START_ADDR + VMM_OCC_COMMON_SIZE) +#define VMM_OCC_COMMON_END_OFFSET \ + (VMM_OCC_COMMON_START_OFFSET + VMM_OCC_COMMON_SIZE) +/** End of Common Area = 200MB */ /** Total Memory required for HOMERs and OCC Common */ #define VMM_ALL_HOMER_OCC_MEMORY_SIZE \ |
