UPSTREAM: src/cpu: Capitalize ROM and RAM

BUG=None
BRANCH=None
TEST=None

Change-Id: Ice2c8033f60af8c2471cc00f57a9dc83dbd69892
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/15935
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: https://chromium-review.googlesource.com/366260
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Elyes HAOUAS 2016-07-28 19:15:34 +02:00 committed by chrome-bot
parent 96dfe03ce6
commit 4faa0797cb
12 changed files with 14 additions and 14 deletions

View file

@ -80,7 +80,7 @@ cache_as_ram_setup:
movl $0xc00000e3, 0x18(%edi) movl $0xc00000e3, 0x18(%edi)
movl %eax, 0x1c(%edi) movl %eax, 0x1c(%edi)
# load rom based identity mapped page tables # load ROM based identity mapped page tables
mov %ecx, %eax mov %ecx, %eax
mov %eax, %cr3 mov %eax, %cr3

View file

@ -166,7 +166,7 @@ void post_cache_as_ram(void)
void cache_as_ram_new_stack (void) void cache_as_ram_new_stack (void)
{ {
print_car_debug("Disabling cache as ram now\n"); print_car_debug("Disabling cache as RAM now\n");
disable_cache_as_ram_bsp(); disable_cache_as_ram_bsp();
disable_cache(); disable_cache();

View file

@ -171,7 +171,7 @@ done_cache_as_ram_main:
pop %esi pop %esi
pop %edi pop %edi
/* Clear the cache out to ram */ /* Clear the cache out to RAM */
wbinvd wbinvd
/* re-enable the cache */ /* re-enable the cache */
movl %cr0, %eax movl %cr0, %eax

View file

@ -198,7 +198,7 @@ done_cache_as_ram_main:
pop %esi pop %esi
pop %edi pop %edi
/* Clear the cache out to ram */ /* Clear the cache out to RAM */
wbinvd wbinvd
/* re-enable the cache */ /* re-enable the cache */
movl %cr0, %eax movl %cr0, %eax

View file

@ -81,7 +81,7 @@ cache_as_ram_setup:
movl $0xc00000e3, 0x18(%edi) movl $0xc00000e3, 0x18(%edi)
movl %eax, 0x1c(%edi) movl %eax, 0x1c(%edi)
# load rom based identity mapped page tables # load ROM based identity mapped page tables
mov %ecx, %eax mov %ecx, %eax
mov %eax, %cr3 mov %eax, %cr3

View file

@ -145,7 +145,7 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
/* Enable caching for ram init code to run faster */ /* Enable caching for RAM init code to run faster */
movl $MTRR_PHYS_BASE(2), %ecx movl $MTRR_PHYS_BASE(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
xorl %edx, %edx xorl %edx, %edx

View file

@ -113,8 +113,8 @@ static void *setup_romstage_stack_after_car(void)
num_mtrrs++; num_mtrrs++;
top_of_ram = (uint32_t)cbmem_top(); top_of_ram = (uint32_t)cbmem_top();
/* Cache 8MiB below the top of ram. On haswell systems the top of /* Cache 8MiB below the top of RAM. On haswell systems the top of
* ram under 4GiB is the start of the TSEG region. It is required to * RAM under 4GiB is the start of the TSEG region. It is required to
* be 8MiB aligned. Set this area as cacheable so it can be used later * be 8MiB aligned. Set this area as cacheable so it can be used later
* for ramstage before setting up the entire RAM as cacheable. */ * for ramstage before setting up the entire RAM as cacheable. */
slot = stack_push(slot, mtrr_mask_upper); /* upper mask */ slot = stack_push(slot, mtrr_mask_upper); /* upper mask */
@ -123,7 +123,7 @@ static void *setup_romstage_stack_after_car(void)
slot = stack_push(slot, (top_of_ram - (8 << 20)) | MTRR_TYPE_WRBACK); slot = stack_push(slot, (top_of_ram - (8 << 20)) | MTRR_TYPE_WRBACK);
num_mtrrs++; num_mtrrs++;
/* Cache 8MiB at the top of ram. Top of ram on haswell systems /* Cache 8MiB at the top of RAM. Top of RAM on haswell systems
* is where the TSEG region resides. However, it is not restricted * is where the TSEG region resides. However, it is not restricted
* to SMM mode until SMM has been relocated. By setting the region * to SMM mode until SMM has been relocated. By setting the region
* to cacheable it provides faster access when relocating the SMM * to cacheable it provides faster access when relocating the SMM

View file

@ -20,7 +20,7 @@
void stage_cache_external_region(void **base, size_t *size) void stage_cache_external_region(void **base, size_t *size)
{ {
/* The ramstage cache lives in the TSEG region at RESERVED_SMM_OFFSET. /* The ramstage cache lives in the TSEG region at RESERVED_SMM_OFFSET.
* The top of ram is defined to be the TSEG base address. */ * The top of RAM is defined to be the TSEG base address. */
*size = RESERVED_SMM_SIZE; *size = RESERVED_SMM_SIZE;
*base = (void *)((uint32_t)cbmem_top() + RESERVED_SMM_OFFSET); *base = (void *)((uint32_t)cbmem_top() + RESERVED_SMM_OFFSET);
} }

View file

@ -147,7 +147,7 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
/* Enable caching for ram init code to run faster */ /* Enable caching for RAM init code to run faster */
movl $MTRR_PHYS_BASE(2), %ecx movl $MTRR_PHYS_BASE(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
xorl %edx, %edx xorl %edx, %edx

View file

@ -95,7 +95,7 @@ _start16bit:
* *
* Also load an IDT with NULL limit to prevent the 16bit IDT being used * Also load an IDT with NULL limit to prevent the 16bit IDT being used
* in protected mode before c_start.S sets up a 32bit IDT when entering * in protected mode before c_start.S sets up a 32bit IDT when entering
* ram stage. In practise: CPU will shutdown on any exception. * RAM stage. In practise: CPU will shutdown on any exception.
* See IA32 manual Vol 3A 19.26 Interrupts. * See IA32 manual Vol 3A 19.26 Interrupts.
*/ */

View file

@ -1,5 +1,5 @@
/* /*
* _ROMTOP : The top of the rom used where we * _ROMTOP : The top of the ROM used where we
* need to put the reset vector. * need to put the reset vector.
*/ */

View file

@ -88,7 +88,7 @@ static void copy_secondary_start_to_lowest_1M(void)
memcpy(lowmem_backup, lowmem_backup_ptr, lowmem_backup_size); memcpy(lowmem_backup, lowmem_backup_ptr, lowmem_backup_size);
} }
/* copy the _secondary_start to the ram below 1M*/ /* copy the _secondary_start to the RAM below 1M*/
memcpy((unsigned char *)AP_SIPI_VECTOR, (unsigned char *)_secondary_start, code_size); memcpy((unsigned char *)AP_SIPI_VECTOR, (unsigned char *)_secondary_start, code_size);
printk(BIOS_DEBUG, "start_eip=0x%08lx, code_size=0x%08lx\n", printk(BIOS_DEBUG, "start_eip=0x%08lx, code_size=0x%08lx\n",