Aaron Durbin (adurbin@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5012
-gerrit
commit dc11885e50dc6f39b89e98a63f30f1a45757f073 Author: Aaron Durbin adurbin@chromium.org Date: Thu Dec 12 10:27:11 2013 -0800
baytrail: allow ramstage_cache_location() usage in ramstage
To prepare for caching reference code for S3 resume the ramstage cache needs to be accesible in ramstage as well.
BUG=chrome-os-partner:22867 BRANCH=None TEST=Built and booted. S3 resumed.
Change-Id: I4c825c965b98cd71ea0eb9c93fe168a358da4c97 Signed-off-by: Aaron Durbin adurbin@chromium.org Reviewed-on: https://chromium-review.googlesource.com/179776 Reviewed-by: Duncan Laurie dlaurie@chromium.org --- src/soc/intel/baytrail/Makefile.inc | 2 ++ src/soc/intel/baytrail/romstage/romstage.c | 14 ------------ src/soc/intel/baytrail/stage_cache.c | 35 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc index f601c7e..eafa65f 100644 --- a/src/soc/intel/baytrail/Makefile.inc +++ b/src/soc/intel/baytrail/Makefile.inc @@ -45,6 +45,8 @@ ramstage-y += lpss.c ramstage-y += pcie.c ramstage-y += sd.c ramstage-y += perf_power.c +ramstage-y += stage_cache.c +romstage-y += stage_cache.c
# Remove as ramstage gets fleshed out ramstage-y += placeholders.c diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index 2cc70ae..8f1f395 100644 --- a/src/soc/intel/baytrail/romstage/romstage.c +++ b/src/soc/intel/baytrail/romstage/romstage.c @@ -30,7 +30,6 @@ #endif #include <elog.h> #include <ramstage_cache.h> -#include <ramstage_cache.h> #include <romstage_handoff.h> #include <timestamp.h> #include <vendorcode/google/chromeos/chromeos.h> @@ -359,19 +358,6 @@ static void *setup_stack_and_mttrs(void) return slot; }
-struct ramstage_cache *ramstage_cache_location(long *size) -{ - char *smm_base; - /* 1MiB cache size */ - const long cache_size = CONFIG_SMM_RESERVED_SIZE; - - /* Ramstage cache lives in TSEG region which is the definition of - * cbmem_top(). */ - smm_base = cbmem_top(); - *size = cache_size; - return (void *)&smm_base[smm_region_size() - cache_size]; -} - void ramstage_cache_invalid(struct ramstage_cache *cache) { #if CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE diff --git a/src/soc/intel/baytrail/stage_cache.c b/src/soc/intel/baytrail/stage_cache.c new file mode 100644 index 0000000..3bda56d --- /dev/null +++ b/src/soc/intel/baytrail/stage_cache.c @@ -0,0 +1,35 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <cbmem.h> +#include <ramstage_cache.h> +#include <baytrail/smm.h> + +struct ramstage_cache *ramstage_cache_location(long *size) +{ + char *smm_base; + /* 1MiB cache size */ + const long cache_size = CONFIG_SMM_RESERVED_SIZE; + + /* Ramstage cache lives in TSEG region which is the definition of + * cbmem_top(). */ + smm_base = cbmem_top(); + *size = cache_size; + return (void *)&smm_base[smm_region_size() - cache_size]; +}