commit 8b93689a358b0a65a334cc3adf6141e79fab032f
author Kyösti Mälkki <kyosti.malkki@gmail.com> Thu Sep 12 13:45:15 2019 +0300
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Fri Sep 13 19:48:26 2019 +0000
tree 6d81db4b2ef72d0fc900f53ac175730afdb49a64
parent b6b13c9f2943a0f61a92d87127551ea8dc39a829

timestamps: Remove TIMESTAMP_CACHE_IN_BSS

This was implemented for LATE_CBMEM_INIT support which
has already been deprecated.

Change-Id: I39225ba675bc3389e051e15b400a905431969715
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35375
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/lib/timestamp.c

diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index b647ca2..dcb3124 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -27,34 +27,9 @@
 
 #define MAX_TIMESTAMPS 192
 
-/* When changing this number, adjust TIMESTAMP() size ASSERT() in memlayout.h */
-#define MAX_BSS_TIMESTAMP_CACHE 16
-
-struct __packed timestamp_cache {
-	struct timestamp_table table;
-	/* The struct timestamp_table has a 0 length array as its last field.
-	 * The  following 'entries' array serves as the storage space for the
-	 * cache when allocated in the BSS. */
-	struct timestamp_entry entries[MAX_BSS_TIMESTAMP_CACHE];
-};
-
 DECLARE_OPTIONAL_REGION(timestamp);
 
-#if ENV_ROMSTAGE_OR_BEFORE
-#define USE_TIMESTAMP_REGION (REGION_SIZE(timestamp) > 0)
-#else
-#define USE_TIMESTAMP_REGION 0
-#endif
-
-/* Currently we never store timestamp cache in .bss. */
-#define TIMESTAMP_CACHE_IN_BSS 0
-
-/*
- * Storage of cache entries prior to cbmem coming online.
- */
-static struct timestamp_cache timestamp_cache;
-
-/* This points to the active timestamp_table and can change within a stage.
+/* This points to the active timestamp_table and can change within a stage
    as CBMEM comes available. */
 static struct timestamp_table *glob_ts_table CAR_GLOBAL;
 
@@ -62,24 +37,22 @@
 				 uint64_t base)
 {
 	ts_cache->num_entries = 0;
-	ts_cache->max_entries = MAX_BSS_TIMESTAMP_CACHE;
 	ts_cache->base_time = base;
-
-	if (USE_TIMESTAMP_REGION)
-		ts_cache->max_entries = (REGION_SIZE(timestamp) -
-			offsetof(struct timestamp_table, entries))
-			/ sizeof(struct timestamp_entry);
+	ts_cache->max_entries = (REGION_SIZE(timestamp) -
+		offsetof(struct timestamp_table, entries))
+		/ sizeof(struct timestamp_entry);
 }
 
 static struct timestamp_table *timestamp_cache_get(void)
 {
 	struct timestamp_table *ts_cache = NULL;
 
-	if (TIMESTAMP_CACHE_IN_BSS) {
-		ts_cache = &timestamp_cache.table;
-	} else if (USE_TIMESTAMP_REGION) {
-		if (REGION_SIZE(timestamp) < sizeof(*ts_cache))
-			BUG();
+	if (!ENV_ROMSTAGE_OR_BEFORE)
+		return NULL;
+
+	if (REGION_SIZE(timestamp) < sizeof(*ts_cache)) {
+		BUG();
+	} else {
 		ts_cache = (void *)_timestamp;
 	}