diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/bootloader/bootloaderif.H | 6 | ||||
| -rw-r--r-- | src/include/kernel/memstate.H | 3 | ||||
| -rw-r--r-- | src/include/kernel/misc.H | 9 | ||||
| -rw-r--r-- | src/include/kernel/vmmmgr.H | 14 | ||||
| -rw-r--r-- | src/include/sys/mm.h | 3 |
5 files changed, 17 insertions, 18 deletions
diff --git a/src/include/bootloader/bootloaderif.H b/src/include/bootloader/bootloaderif.H index dd1c3a8ff..25b3520e8 100644 --- a/src/include/bootloader/bootloaderif.H +++ b/src/include/bootloader/bootloaderif.H @@ -40,11 +40,13 @@ namespace Bootloader{ // Size of exception vector reserved space at start of the HBBL section #define HBBL_EXCEPTION_VECTOR_SIZE (12 * KILOBYTE) +#define MAX_HBB_SIZE (512 * KILOBYTE) + // The Bootloader to Hostboot communication area exists after the working HBB #ifdef BOOTLOADER -#define BLTOHB_COMM_DATA_ADDR (getHRMOR() - ( 2*MEGABYTE) + 512*KILOBYTE) +#define BLTOHB_COMM_DATA_ADDR (getHRMOR() - ( 2*MEGABYTE) + MAX_HBB_SIZE) #else -#define BLTOHB_COMM_DATA_ADDR (getHRMOR() + 512*KILOBYTE) +#define BLTOHB_COMM_DATA_ADDR (getHRMOR() + MAX_HBB_SIZE) #endif // Expected BlToHbData eye catch diff --git a/src/include/kernel/memstate.H b/src/include/kernel/memstate.H index b5215a806..84acf3b4e 100644 --- a/src/include/kernel/memstate.H +++ b/src/include/kernel/memstate.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -63,7 +63,6 @@ namespace KernelMemState REDUCED_CACHE = 0x00000008, FULL_CACHE = 0x0000000A, MS_32MEG = 0x00000020, - PRE_SECURE_BOOT = 0x000000FF, }; struct mem_location diff --git a/src/include/kernel/misc.H b/src/include/kernel/misc.H index f08af361f..4c570423a 100644 --- a/src/include/kernel/misc.H +++ b/src/include/kernel/misc.H @@ -152,15 +152,6 @@ namespace KernelMisc }; - /** @fn expand_half_cache - * - * @brief Expands the image footprint from a quarter-cache (top 512k of - * each cache column) to a half-cache (full 1mb of each column). - * - * @return 0 or -errno - */ - int expand_half_cache(); - /** @fn expand_full_cache * * @brief Expands the image footprint from a half-cache to full-cache diff --git a/src/include/kernel/vmmmgr.H b/src/include/kernel/vmmmgr.H index 84a981b24..9c437fe23 100644 --- a/src/include/kernel/vmmmgr.H +++ b/src/include/kernel/vmmmgr.H @@ -47,18 +47,16 @@ class VmmManager // Place the page table at the top side of the cache, 256k in size. INITIAL_PT_OFFSET = INITIAL_MEM_SIZE - 1*MEGABYTE, PTSIZE = 256*KILOBYTE, - HTABORG_OFFSET = INITIAL_PT_OFFSET, // Put the DMA Pages just after the Page Table MBOX_DMA_PAGES = 64, // must be <= 64 MBOX_DMA_PAGESIZE = (1 * KILOBYTE), - MBOX_DMA_ADDR = INITIAL_PT_OFFSET + PTSIZE, MBOX_DMA_SIZE = MBOX_DMA_PAGES * MBOX_DMA_PAGESIZE, /** We need to reserve a hole in heap memory for the page table, * etc. Use these constants to define the hole. */ FIRST_RESERVED_PAGE = INITIAL_PT_OFFSET, - END_RESERVED_PAGE = INITIAL_PT_OFFSET + PTSIZE + MBOX_DMA_SIZE, + END_RESERVED_PAGE = INITIAL_PT_OFFSET + PTSIZE, BLTOHB_DATA_START = END_RESERVED_PAGE, @@ -215,6 +213,13 @@ class VmmManager */ static int mmLinearMap(void *i_paddr, uint64_t i_size); + /** @fn pageTableOffset() + * @brief Gets starting address of Page Table + * + * @return uint64_t - starting address of Page Table + */ + static uint64_t pageTableOffset(); + protected: VmmManager(); ~VmmManager() {}; @@ -274,6 +279,9 @@ class VmmManager /** See mmLinearMap */ int _mmLinearMap(void*, uint64_t); + /** See pageTableOffset */ + uint64_t _pageTableOffset() const; + public: friend class Block; friend class StackSegment; diff --git a/src/include/sys/mm.h b/src/include/sys/mm.h index e7b49f8f7..b89c82fea 100644 --- a/src/include/sys/mm.h +++ b/src/include/sys/mm.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -102,7 +102,6 @@ int mm_set_permission(void* va, uint64_t size, uint64_t access_type); enum MM_EXTEND_SIZE { - MM_EXTEND_PARTIAL_CACHE, //< Extend memory to include 512KB to 4MB MM_EXTEND_REDUCED_CACHE, //< Extend memory to include reduced cache (8MB). MM_EXTEND_FULL_CACHE, //< Extend memory to include full cache (10MB). MM_EXTEND_REAL_MEMORY, //< Extend memory into real mainstore. |
