sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/soc/intel/braswell/northcluster.c: Correct calculation of FSP memory area

Browse Source 
Calculation of memory reserved by FSP is incorrect.
Use CBMEM_ID_FSP_RESERVED_MEMORY to determine the memory area

BUG=N/A
TEST=Intel CherryHill CRB

Change-Id: If68bda39ba2b1f3be4ed4bc872710be7bbd4948b
Signed-off-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-on: https://review.coreboot.org/c/29333
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
This commit is contained in:
Frans Hendriks 2018-10-30 15:07:39 +01:00 committed by Patrick Georgi
parent fa011db6f0
commit c6d672fe1d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/soc/intel/braswell/northcluster.c
View File

@ -94,6 +94,7 @@ static void nc_read_resources(struct device *dev)
unsigned long fsp_res_base_k; unsigned long fsp_res_base_k;
unsigned long base_k, size_k; unsigned long base_k, size_k;
const unsigned long four_gig_kib = (4 << (30 - 10)); const unsigned long four_gig_kib = (4 << (30 - 10));
void *fsp_reserved_memory_area;
int index = 0; int index = 0;
/* Read standard PCI resources. */ /* Read standard PCI resources. */
@ -105,7 +106,14 @@ static void nc_read_resources(struct device *dev)
tseg_top_k = tseg_base_k + RES_IN_KIB(smm_size); tseg_top_k = tseg_base_k + RES_IN_KIB(smm_size);
/* Determine the base of the FSP reserved memory */ /* Determine the base of the FSP reserved memory */
fsp_res_base_k = RES_IN_KIB((unsigned long) cbmem_top()); fsp_reserved_memory_area = cbmem_find(CBMEM_ID_FSP_RESERVED_MEMORY);
if (fsp_reserved_memory_area) {
fsp_res_base_k =
RES_IN_KIB((unsigned int)fsp_reserved_memory_area);
} else {
/* If no FSP reserverd area */
fsp_res_base_k = tseg_base_k;
}
/* PCIe memory-mapped config space access - 256 MiB. */ /* PCIe memory-mapped config space access - 256 MiB. */
mmconf = iosf_bunit_read(BUNIT_MMCONF_REG) & ~((1 << 28) - 1); mmconf = iosf_bunit_read(BUNIT_MMCONF_REG) & ~((1 << 28) - 1);
@ -116,8 +124,8 @@ static void nc_read_resources(struct device *dev)
size_k = RES_IN_KIB(0xa0000) - base_k; size_k = RES_IN_KIB(0xa0000) - base_k;
ram_resource(dev, index++, base_k, size_k); ram_resource(dev, index++, base_k, size_k);
/* 0xc0000 -> fsp_res_base - cacheable and usable */ /* High memory -> fsp_res_base - cacheable and usable */
base_k = RES_IN_KIB(0xc0000); base_k = RES_IN_KIB(0x100000);
size_k = fsp_res_base_k - base_k; size_k = fsp_res_base_k - base_k;
ram_resource(dev, index++, base_k, size_k); ram_resource(dev, index++, base_k, size_k);