Change in coreboot[master]: drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36110 )

Change subject: drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges
......................................................................

drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges

Rename the freeranges array to better match what they represent, i.e.
ranges that are used by the current running program and CAR region that
is not unallocated.

Skip adding the CAR region if cache-as-RAM is not active.

Change-Id: I78ee5536d890f30450a5ad2a753c948b02634d6d
Signed-off-by: Marshall Dawson 
---
M src/drivers/intel/fsp2_0/memory_init.c
1 file changed, 5 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/36110/1

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index a075f01..e7ddb15 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -390,7 +390,7 @@
    struct region_device file_data;
    const char *name = CONFIG_FSP_M_CBFS;
    struct memranges memmap;
-	struct range_entry freeranges[2];
+	struct range_entry prog_ranges[2];

elog_boot_notify(s3wake);

@@ -402,9 +402,10 @@
    cbfs_file_data(&file_data, &file_desc);

/* Build up memory map of romstage address space including CAR. */
-	memranges_init_empty(&memmap, &freeranges[0], ARRAY_SIZE(freeranges));
-	memranges_insert(&memmap, (uintptr_t)_car_region_start,
-		_car_unallocated_start - _car_region_start, 0);
+	memranges_init_empty(&memmap, &prog_ranges[0], ARRAY_SIZE(prog_ranges));
+	if (ENV_CACHE_AS_RAM)
+		memranges_insert(&memmap, (uintptr_t)_car_region_start,
+			_car_unallocated_start - _car_region_start, 0);
    memranges_insert(&memmap, (uintptr_t)_program, REGION_SIZE(program), 0);

if (!CONFIG(FSP_M_XIP))

[Martin Roth (Code Review)]

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36110 )

Change subject: drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges
......................................................................

Patch Set 2: Code-Review+2

[Martin Roth (Code Review)]

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36110 )

Change subject: drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges
......................................................................

drivers/intel/fsp2_0: Add ENV_CACHE_AS_RAM check for consumed ranges

Rename the freeranges array to better match what they represent, i.e.
ranges that are used by the current running program and CAR region that
is not unallocated.

Skip adding the CAR region if cache-as-RAM is not active.

Change-Id: I78ee5536d890f30450a5ad2a753c948b02634d6d
Signed-off-by: Marshall Dawson 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36110
Reviewed-by: Martin Roth 
Tested-by: build bot (Jenkins) 
---
M src/drivers/intel/fsp2_0/memory_init.c
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index a075f01..e7ddb15 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -390,7 +390,7 @@
    struct region_device file_data;
    const char *name = CONFIG_FSP_M_CBFS;
    struct memranges memmap;
-	struct range_entry freeranges[2];
+	struct range_entry prog_ranges[2];

elog_boot_notify(s3wake);

@@ -402,9 +402,10 @@
    cbfs_file_data(&file_data, &file_desc);

/* Build up memory map of romstage address space including CAR. */
-	memranges_init_empty(&memmap, &freeranges[0], ARRAY_SIZE(freeranges));
-	memranges_insert(&memmap, (uintptr_t)_car_region_start,
-		_car_unallocated_start - _car_region_start, 0);
+	memranges_init_empty(&memmap, &prog_ranges[0], ARRAY_SIZE(prog_ranges));
+	if (ENV_CACHE_AS_RAM)
+		memranges_insert(&memmap, (uintptr_t)_car_region_start,
+			_car_unallocated_start - _car_region_start, 0);
    memranges_insert(&memmap, (uintptr_t)_program, REGION_SIZE(program), 0);

if (!CONFIG(FSP_M_XIP))