GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfam10-15: Rename DCACHE_BSP_STACK_SIZE 

The original name DCACHE_BSP_STACK_SIZE will be exclusively
used to define the fixed size of BSP stack when it is located
near the beginning of CAR region. This implementation has the
stack located at the very end of CAR region.

Remove other fam10-15 exclusive configs from global space.

Change-Id: I8b92891be2ed62944a9eddde39ed20a12f4875c0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34880
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2019-08-15 15:37:30 +03:00
parent 126d4198a9
commit 184a1176f3
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/Kconfig
View File

@ -23,12 +23,6 @@ config DCACHE_RAM_SIZE
config DCACHE_BSP_STACK_SIZE config DCACHE_BSP_STACK_SIZE
hex hex
config DCACHE_BSP_STACK_SLUSH
hex
config DCACHE_AP_STACK_SIZE
hex
config SMP config SMP
bool bool
default y if MAX_CPUS != 1 default y if MAX_CPUS != 1

4
src/cpu/amd/car/cache_as_ram.inc
View File

@ -22,8 +22,8 @@
#define CacheSize CONFIG_DCACHE_RAM_SIZE #define CacheSize CONFIG_DCACHE_RAM_SIZE
#define CacheBase CONFIG_DCACHE_RAM_BASE #define CacheBase CONFIG_DCACHE_RAM_BASE
#define CacheSizeBSPStack CONFIG_DCACHE_BSP_STACK_SIZE #define CacheSizeBSPStack CONFIG_DCACHE_BSP_TOP_STACK_SIZE
#define CacheSizeBSPSlush CONFIG_DCACHE_BSP_STACK_SLUSH #define CacheSizeBSPSlush CONFIG_DCACHE_BSP_TOP_STACK_SLUSH
/* For CAR with Fam10h. */ /* For CAR with Fam10h. */
#define CacheSizeAPStack CONFIG_DCACHE_AP_STACK_SIZE #define CacheSizeAPStack CONFIG_DCACHE_AP_STACK_SIZE

6
src/cpu/amd/car/post_cache_as_ram.c
View File

@ -131,9 +131,9 @@ asmlinkage void *post_cache_as_ram(void)
* boundary during romstage execution * boundary during romstage execution
*/ */
volatile uint32_t *lower_stack_boundary; volatile uint32_t *lower_stack_boundary;
lower_stack_boundary = lower_stack_boundary = (void *)((CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE) -
(void *)((CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE) CONFIG_DCACHE_BSP_TOP_STACK_SIZE);
- CONFIG_DCACHE_BSP_STACK_SIZE);
if ((*lower_stack_boundary) != 0xdeadbeef) if ((*lower_stack_boundary) != 0xdeadbeef)
printk(BIOS_WARNING, "BSP overran lower stack boundary. Undefined behaviour may result!\n"); printk(BIOS_WARNING, "BSP overran lower stack boundary. Undefined behaviour may result!\n");

4
src/cpu/amd/family_10h-family_15h/Kconfig
View File

@ -37,11 +37,11 @@ config DCACHE_RAM_SIZE
hex hex
default 0x0c000 default 0x0c000
config DCACHE_BSP_STACK_SIZE config DCACHE_BSP_TOP_STACK_SIZE
hex hex
default 0x4000 default 0x4000
config DCACHE_BSP_STACK_SLUSH config DCACHE_BSP_TOP_STACK_SLUSH
hex hex
default 0x4000 if USE_LARGE_DCACHE default 0x4000 if USE_LARGE_DCACHE
default 0x1000 default 0x1000

17
src/cpu/amd/family_10h-family_15h/init_cpus.c
View File

@ -379,12 +379,19 @@ u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
uint8_t fam15_bsp_core1_apicid; uint8_t fam15_bsp_core1_apicid;
struct node_core_id id; struct node_core_id id;
/* Please refer to the calculations and explaination in cache_as_ram.inc before modifying these values */ /* Please refer to the calculations and explaination in cache_as_ram.inc
* before modifying these values */
uint32_t max_ap_stack_region_size = CONFIG_MAX_CPUS * CONFIG_DCACHE_AP_STACK_SIZE; uint32_t max_ap_stack_region_size = CONFIG_MAX_CPUS * CONFIG_DCACHE_AP_STACK_SIZE;
uint32_t max_bsp_stack_region_size = CONFIG_DCACHE_BSP_STACK_SIZE + CONFIG_DCACHE_BSP_STACK_SLUSH; uint32_t max_bsp_stack_region_size = CONFIG_DCACHE_BSP_TOP_STACK_SIZE +
uint32_t bsp_stack_region_upper_boundary = CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE; CONFIG_DCACHE_BSP_TOP_STACK_SLUSH;
uint32_t bsp_stack_region_lower_boundary = bsp_stack_region_upper_boundary - max_bsp_stack_region_size; uint32_t bsp_stack_region_upper_boundary = CONFIG_DCACHE_RAM_BASE +
void *lower_stack_region_boundary = (void *)(bsp_stack_region_lower_boundary - max_ap_stack_region_size); CONFIG_DCACHE_RAM_SIZE;
uint32_t bsp_stack_region_lower_boundary = bsp_stack_region_upper_boundary -
max_bsp_stack_region_size;
void *lower_stack_region_boundary = (void *)(bsp_stack_region_lower_boundary -
max_ap_stack_region_size);
if (((void*)(sysinfo + 1)) > lower_stack_region_boundary) if (((void*)(sysinfo + 1)) > lower_stack_region_boundary)
printk(BIOS_WARNING, printk(BIOS_WARNING,
"sysinfo extends into stack region (sysinfo range: [%p,%p] lower stack region boundary: %p)\n", "sysinfo extends into stack region (sysinfo range: [%p,%p] lower stack region boundary: %p)\n",