[coreboot-gerrit] Change in ...coreboot[master]: vendorcode/google: load sar config from CBFS first then VPD

[Marco Chen (Code Review)]

Hello Marco Chen,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/33661

to review the following change.

Change subject: vendorcode/google: load sar config from CBFS first then VPD
......................................................................

vendorcode/google: load sar config from CBFS first then VPD

SAR config provisioned in RO VPD can be done in the factory only. Once
it is wrong, we can override the SAR config by updating FW RW which can
carry new SAR config in CBFS. As a result, we should check CBFS first
then VPD.

Change-Id: I5aa6235fb7a6d0b2ed52893a42f7bd57806af6c1
Signed-off-by: Marco Chen 
---
M src/vendorcode/google/chromeos/sar.c
1 file changed, 23 insertions(+), 22 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/33661/1

diff --git a/src/vendorcode/google/chromeos/sar.c b/src/vendorcode/google/chromeos/sar.c
index bbcb211..a5a2c3b 100644
--- a/src/vendorcode/google/chromeos/sar.c
+++ b/src/vendorcode/google/chromeos/sar.c
@@ -82,36 +82,37 @@
    				 sizeof(struct wifi_sar_delta_table);
    }

-	/* Try to read the SAR limit entry from VPD */
-	if (!vpd_gets(wifi_sar_limit_key, wifi_sar_limit_str,
-							 buffer_size, VPD_ANY)) {
-		printk(BIOS_ERR, "Error: Could not locate '%s' in VPD.\n",
-				wifi_sar_limit_key);
-
-		if (!CONFIG(WIFI_SAR_CBFS))
-			return -1;
-
+	if (CONFIG(WIFI_SAR_CBFS)) {
    	printk(BIOS_DEBUG, "Checking CBFS for default SAR values\n");

sar_cbfs_len = load_sar_file_from_cbfs(
    				(void *) wifi_sar_limit_str,
    					sar_expected_len);

-		if (sar_cbfs_len != sar_expected_len) {
-			printk(BIOS_ERR, "%s has bad len in CBFS\n",
-					WIFI_SAR_CBFS_FILENAME);
-			return -1;
-		}
-	} else {
-		/* VPD key "wifi_sar" found. strlen is checked with addition of
-		 * 1 as we have created buffer size 1 char larger for the reason
-		 * mentioned at start of this function itself */
-		if (strlen(wifi_sar_limit_str) + 1 != sar_expected_len) {
-			printk(BIOS_ERR, "WIFI SAR key has bad len in VPD\n");
-			return -1;
-		}
+		if (sar_cbfs_len == sar_expected_len)
+		    goto done;
+
+		printk(BIOS_ERR, "%s has bad len in CBFS\n",
+				WIFI_SAR_CBFS_FILENAME);
    }

+	/* Try to read the SAR limit entry from VPD */
+	if (!vpd_gets(wifi_sar_limit_key, wifi_sar_limit_str,
+							 buffer_size, VPD_ANY)) {
+		printk(BIOS_ERR, "Error: Could not locate '%s' in VPD.\n",
+				wifi_sar_limit_key);
+		return -1;
+	}
+
+	/* VPD key "wifi_sar" found. strlen is checked with addition of
+	 * 1 as we have created buffer size 1 char larger for the reason
+	 * mentioned at start of this function itself */
+	if (strlen(wifi_sar_limit_str) + 1 != sar_expected_len) {
+		printk(BIOS_ERR, "WIFI SAR key has bad len in VPD\n");
+		return -1;
+	}
+
+done:
    /* Decode the heximal encoded string to binary values */
    if (hexstrtobin(wifi_sar_limit_str, bin_buffer, bin_buff_adjusted_size)
    		< bin_buff_adjusted_size) {