[coreboot-gerrit] Change in vboot[master]: auxfw_sync: Fix issue of system halt when AUX FW sync is disabled

[Maulik V Vaghela (Code Review)]

Hello Maulik V Vaghela,

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

https://review.coreboot.org/c/vboot/+/36861

to review the following change.

Change subject: auxfw_sync: Fix issue of system halt when AUX FW sync is disabled
......................................................................

auxfw_sync: Fix issue of system halt when AUX FW sync is disabled

When AUX FW sync is disabled via GBB flag, it still calls auxfw_finalize
in depthchare and since EC_SYNC is also disabled in depthcharge it halts
the system.

Ideally we should not call depthcharge in case AUX fw sync is disabled via
GBB flag

Change-Id: I90ca9f977f42f6c72fc56b477503a8232e033a05
Signed-off-by: Maulik V Vaghela 
---
M firmware/2lib/2auxfw_sync.c
1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/firmware/2lib/2auxfw_sync.c b/firmware/2lib/2auxfw_sync.c
index 7c6c2ba..c6e459c 100644
--- a/firmware/2lib/2auxfw_sync.c
+++ b/firmware/2lib/2auxfw_sync.c
@@ -113,6 +113,15 @@
    return vb2ex_auxfw_check(severity);
 }

+static vb2_error_t vb2api_auxfw_finalize(struct vb2_context *ctx)
+{
+	if (!auxfw_sync_allowed(ctx)) {
+		return VB2_SUCCESS;
+	}
+
+	return vb2ex_auxfw_finalize(ctx);
+}
+
 vb2_error_t vb2api_auxfw_sync(struct vb2_context *ctx)
 {
    enum vb2_auxfw_update_severity fw_update = VB_AUX_FW_NO_UPDATE;
@@ -143,5 +152,5 @@
    	return VBERROR_EC_REBOOT_TO_RO_REQUIRED;
    }

-	return vb2ex_auxfw_finalize(ctx);
+	return vb2api_auxfw_finalize(ctx);
 }