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

Sandybridge: Remove remnants of FDT support from MRC cache code 

Originally, ChromeBooks would get the offset of the MRC cache
from an entry in the u-boot device tree. Not everyone wants to
use u-boot on Sandybridge systems, however.
Since the new code (based on Kconfig) is now fully working, we
can drop the u-boot device tree remnants.

Change-Id: I4e012ea981f16dce9a4d155254facd29874b28ef
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1051
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Stefan Reinauer 2012-05-23 14:16:47 -07:00 committed by Patrick Georgi
parent 6e901fd3d2
commit 88fc0b9e8d
1 changed files with 11 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/northbridge/intel/sandybridge/mrccache.c
View File

@ -28,19 +28,6 @@
#include "sandybridge.h" #include "sandybridge.h"
#include <spi.h> #include <spi.h>
#include <spi_flash.h> #include <spi_flash.h>
/* Using the FDT FMAP for finding the MRC cache area requires including FDT
* support in coreboot, which we would like to avoid. There are a number of
* options:
* - Have each mainboard Kconfig supply a hard-coded offset
* - For ChromeOS devices: implement native FMAP
* - For non-ChromeOS devices: use CBFS
* For now let's leave this code in here until the issue is sorted out in
* a way that works for everyone.
*/
#undef USE_FDT_FMAP_FOR_MRC_CACHE
#ifdef USE_FDT_FMAP_FOR_MRC_CACHE
#include <fdt/libfdt.h>
#endif
struct mrc_data_container *next_mrc_block(struct mrc_data_container *mrc_cache) struct mrc_data_container *next_mrc_block(struct mrc_data_container *mrc_cache)
{ {
@ -61,64 +48,19 @@ int is_mrc_cache(struct mrc_data_container *mrc_cache)
return (!!mrc_cache) && (mrc_cache->mrc_signature == MRC_DATA_SIGNATURE); return (!!mrc_cache) && (mrc_cache->mrc_signature == MRC_DATA_SIGNATURE);
} }
/* Right now, the offsets for the MRC cache area are hard-coded in the
* northbridge Kconfig. In order to make this more flexible, there are
* a number of options:
* - Have each mainboard Kconfig supply a hard-coded offset
* - For ChromeOS devices: implement native FMAP
* - For non-ChromeOS devices: use CBFS
*/
u32 get_mrc_cache_region(struct mrc_data_container **mrc_region_ptr) u32 get_mrc_cache_region(struct mrc_data_container **mrc_region_ptr)
{ {
u8 *mrc_region;
u32 region_size;
#ifdef USE_FDT_FMAP_FOR_MRC_CACHE
u32 *data;
const struct fdt_header *fdt_header;
const struct fdt_property *fdtp;
int offset, len;
const char *compatible = "chromeos,flashmap";
const char *subnode = "rw-mrc-cache";
const char *property = "reg";
u64 flashrom_base = 0;
fdt_header = cbfs_find_file(CONFIG_FDT_FILE_NAME, CBFS_TYPE_FDT); u32 region_size = CONFIG_MRC_CACHE_SIZE;
*mrc_region_ptr = (struct mrc_data_container *)
if (!fdt_header) { (CONFIG_MRC_CACHE_BASE + CONFIG_MRC_CACHE_LOCATION);
printk(BIOS_ERR, "%s: no FDT found!\n", __func__);
return 0;
}
offset = fdt_node_offset_by_compatible(fdt_header, 0, compatible);
if (offset < 0) {
printk(BIOS_ERR, "%s: no %s node found!\n",
__func__, compatible);
return 0;
}
if (fdt_get_base_addr(fdt_header, offset, &flashrom_base) < 0) {
printk(BIOS_ERR, "%s: no base address in node name!\n",
__func__);
return 0;
}
offset = fdt_subnode_offset(fdt_header, offset, subnode);
if (offset < 0) {
printk(BIOS_ERR, "%s: no %s found!\n", __func__, subnode);
return 0;
}
fdtp = fdt_get_property(fdt_header, offset, property, &len);
if (!fdtp || (len != 8)) {
printk(BIOS_ERR, "%s: property %s at %p, len %d!\n",
__func__, property, fdtp, len);
return 0;
}
data = (u32 *)fdtp->data;
// Calculate actual address of the MRC cache in memory
region_size = fdt32_to_cpu(data[1]);
mrc_region = (u8*)((unsigned long)flashrom_base + fdt32_to_cpu(data[0]));
#else
region_size = CONFIG_MRC_CACHE_SIZE;
mrc_region = (u8*)(CONFIG_MRC_CACHE_BASE + CONFIG_MRC_CACHE_LOCATION);
#endif
*mrc_region_ptr = (struct mrc_data_container *)mrc_region;
return region_size; return region_size;
} }
@ -182,7 +124,7 @@ struct mrc_data_container *find_current_mrc_cache(void)
entry_id++; entry_id++;
mrc_cache = mrc_next; mrc_cache = mrc_next;
mrc_next = next_mrc_block(mrc_cache); mrc_next = next_mrc_block(mrc_cache);
/* Stay in the mrcdata region defined in fdt */ /* Stay in the mrc data region */
if ((void*)mrc_next >= (void*)(mrc_region + region_size)) if ((void*)mrc_next >= (void*)(mrc_region + region_size))
break; break;
} }