diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-06-19 15:26:19 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-20 15:54:29 -0400 |
| commit | 0b680113fbc55b91bc7785ef235df32df6103eda (patch) | |
| tree | a8c11e0beee39d5d7e615a92791cc232f3624dcf /src/include/kernel | |
| parent | e43ee27ebd0f6028f74ee51793f4ca00b1fb04b9 (diff) | |
| download | talos-hostboot-0b680113fbc55b91bc7785ef235df32df6103eda.tar.gz talos-hostboot-0b680113fbc55b91bc7785ef235df32df6103eda.zip | |
Remove half cache init and do it in the page manager
Change-Id: I3e870c9b50d13704c4c88adfc96e5943cff9dae2
RTC: 175114
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42153
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/kernel')
| -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 |
3 files changed, 12 insertions, 14 deletions
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; |
