Change in coreboot[master]: mrc_cache: Move mrc_cache_stash_data to end of file

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44195 )

Change subject: mrc_cache: Move mrc_cache_stash_data to end of file
......................................................................

mrc_cache: Move mrc_cache_stash_data to end of file

We need to pull update_mrc_cache into mrc_cache_stash_data, so moving
to end of the file to make sure update_mrc_cache is defined before.

BUG=b:150502246
BRANCH=None
TEST=Testing on a nami (x86) device:
     reboot from ec console.  Make sure memory training happens.
     reboot from ec console.  Make sure that we don't do training again.

Signed-off-by: Shelley Chen 
Change-Id: I9e14fec96e9dabceafc2f6f5663fc6f1023f0395
---
M src/drivers/mrc_cache/mrc_cache.c
1 file changed, 35 insertions(+), 35 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/44195/1

diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index 1b1ad63..0e42120 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -109,41 +109,6 @@
    return NULL;
 }

-int mrc_cache_stash_data(int type, uint32_t version, const void *data,
-			size_t size)
-{
-	const struct cache_region *cr;
-	size_t cbmem_size;
-	struct mrc_metadata *md;
-
-	cr = lookup_region_type(type);
-	if (cr == NULL) {
-		printk(BIOS_ERR, "MRC: failed to add to cbmem for type %d.\n",
-			type);
-		return -1;
-	}
-
-	cbmem_size = sizeof(*md) + size;
-
-	md = cbmem_add(cr->cbmem_id, cbmem_size);
-
-	if (md == NULL) {
-		printk(BIOS_ERR, "MRC: failed to add '%s' to cbmem.\n",
-			cr->name);
-		return -1;
-	}
-
-	memset(md, 0, sizeof(*md));
-	md->signature = MRC_DATA_SIGNATURE;
-	md->data_size = size;
-	md->version = version;
-	md->data_checksum = compute_ip_checksum(data, size);
-	md->header_checksum = compute_ip_checksum(md, sizeof(*md));
-	memcpy(&md[1], data, size);
-
-	return 0;
-}
-
 static const struct cache_region *lookup_region(struct region *r, int type)
 {
    const struct cache_region *cr;
@@ -596,6 +561,41 @@
    protect_mrc_region();
 }

+int mrc_cache_stash_data(int type, uint32_t version, const void *data,
+			size_t size)
+{
+	const struct cache_region *cr;
+	size_t cbmem_size;
+	struct mrc_metadata *md;
+
+	cr = lookup_region_type(type);
+	if (cr == NULL) {
+		printk(BIOS_ERR, "MRC: failed to add to cbmem for type %d.\n",
+			type);
+		return -1;
+	}
+
+	cbmem_size = sizeof(*md) + size;
+
+	md = cbmem_add(cr->cbmem_id, cbmem_size);
+
+	if (md == NULL) {
+		printk(BIOS_ERR, "MRC: failed to add '%s' to cbmem.\n",
+			cr->name);
+		return -1;
+	}
+
+	memset(md, 0, sizeof(*md));
+	md->signature = MRC_DATA_SIGNATURE;
+	md->data_size = size;
+	md->version = version;
+	md->data_checksum = compute_ip_checksum(data, size);
+	md->header_checksum = compute_ip_checksum(md, sizeof(*md));
+	memcpy(&md[1], data, size);
+
+	return 0;
+}
+
 /*
  * Ensures MRC training data is stored into SPI after PCI enumeration is done.
  * Some implementations may require this to be later than others.

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44195 )

Change subject: mrc_cache: Move mrc_cache_stash_data to end of file
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44195 )

Change subject: mrc_cache: Move mrc_cache_stash_data to end of file
......................................................................

Patch Set 1: Code-Review+2

[Shelley Chen (Code Review)]

Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44195 )

Change subject: mrc_cache: Move mrc_cache_stash_data to end of file
......................................................................

mrc_cache: Move mrc_cache_stash_data to end of file

We need to pull update_mrc_cache into mrc_cache_stash_data, so moving
to end of the file to make sure update_mrc_cache is defined before.

BUG=b:150502246
BRANCH=None
TEST=Testing on a nami (x86) device:
     reboot from ec console.  Make sure memory training happens.
     reboot from ec console.  Make sure that we don't do training again.

Signed-off-by: Shelley Chen 
Change-Id: I9e14fec96e9dabceafc2f6f5663fc6f1023f0395
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44195
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
Reviewed-by: Furquan Shaikh 
---
M src/drivers/mrc_cache/mrc_cache.c
1 file changed, 35 insertions(+), 35 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Julius Werner: Looks good to me, approved

diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index 1b1ad63..0e42120 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -109,41 +109,6 @@
    return NULL;
 }

-int mrc_cache_stash_data(int type, uint32_t version, const void *data,
-			size_t size)
-{
-	const struct cache_region *cr;
-	size_t cbmem_size;
-	struct mrc_metadata *md;
-
-	cr = lookup_region_type(type);
-	if (cr == NULL) {
-		printk(BIOS_ERR, "MRC: failed to add to cbmem for type %d.\n",
-			type);
-		return -1;
-	}
-
-	cbmem_size = sizeof(*md) + size;
-
-	md = cbmem_add(cr->cbmem_id, cbmem_size);
-
-	if (md == NULL) {
-		printk(BIOS_ERR, "MRC: failed to add '%s' to cbmem.\n",
-			cr->name);
-		return -1;
-	}
-
-	memset(md, 0, sizeof(*md));
-	md->signature = MRC_DATA_SIGNATURE;
-	md->data_size = size;
-	md->version = version;
-	md->data_checksum = compute_ip_checksum(data, size);
-	md->header_checksum = compute_ip_checksum(md, sizeof(*md));
-	memcpy(&md[1], data, size);
-
-	return 0;
-}
-
 static const struct cache_region *lookup_region(struct region *r, int type)
 {
    const struct cache_region *cr;
@@ -596,6 +561,41 @@
    protect_mrc_region();
 }

+int mrc_cache_stash_data(int type, uint32_t version, const void *data,
+			size_t size)
+{
+	const struct cache_region *cr;
+	size_t cbmem_size;
+	struct mrc_metadata *md;
+
+	cr = lookup_region_type(type);
+	if (cr == NULL) {
+		printk(BIOS_ERR, "MRC: failed to add to cbmem for type %d.\n",
+			type);
+		return -1;
+	}
+
+	cbmem_size = sizeof(*md) + size;
+
+	md = cbmem_add(cr->cbmem_id, cbmem_size);
+
+	if (md == NULL) {
+		printk(BIOS_ERR, "MRC: failed to add '%s' to cbmem.\n",
+			cr->name);
+		return -1;
+	}
+
+	memset(md, 0, sizeof(*md));
+	md->signature = MRC_DATA_SIGNATURE;
+	md->data_size = size;
+	md->version = version;
+	md->data_checksum = compute_ip_checksum(data, size);
+	md->header_checksum = compute_ip_checksum(md, sizeof(*md));
+	memcpy(&md[1], data, size);
+
+	return 0;
+}
+
 /*
  * Ensures MRC training data is stored into SPI after PCI enumeration is done.
  * Some implementations may require this to be later than others.

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44195 )

Change subject: mrc_cache: Move mrc_cache_stash_data to end of file
......................................................................

Patch Set 4:

Automatic boot test returned (PASS/FAIL/TOTAL): 6/1/7
"QEMU x86 q35/ich9" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/16562
"QEMU x86 q35/ich9" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16561
"QEMU x86 i440fx/piix4" (x86_64) using payload SeaBIOS : FAIL : https://lava.9esec.io/r/16560
"QEMU x86 i440fx/piix4" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16559
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/16558
"HP Compaq 8200 Elite SFF PC" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/16564
"HP Compaq 8200 Elite SFF PC" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16563

Please note: This test is under development and might not be accurate at all!