From 77c01e1f2f16bc24a45e68b0c413e510dc19a756 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 7 Sep 2017 11:28:53 -0500 Subject: drivers/intel/fsp1_1: Adjust check for FSP header revision With FSP 1.1, all FSP blobs are forward-compatible with newer FSP 1.1 header files, so adjust the header revision check to ensure that the FSP blob isn't newer than the header, rather than an exact version match. This resolves a version mismatch issue with Braswell ChromeOS devices, which ship with FSP blobs newer than the publicly-released blob (1.1.2.0), but older than the current Braswell FSP 1.1 header (1.1.7.0). TEST: build/boot google/cyan and edgar boards, observe no adverse effects from using current FSP header (1.1.7.0) with the factory- shipped FSP blobs (1.1.4.0/1.1.4.2). Change-Id: I8934675a2deed260886a83fa34512904c40af8e1 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/21369 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/drivers/intel/fsp1_1/fsp_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index 34d6e4881d..0116ac2746 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/src/drivers/intel/fsp1_1/fsp_util.c @@ -79,7 +79,7 @@ FSP_INFO_HEADER *find_fsp(uintptr_t fsp_base_address) return (FSP_INFO_HEADER *)ERROR_FSP_SIG_MISMATCH; /* Verify the FSP Revision */ - if (fsp_ptr.fih->ImageRevision != FSP_IMAGE_REV) + if (fsp_ptr.fih->ImageRevision > FSP_IMAGE_REV) return (FSP_INFO_HEADER *)ERROR_FSP_REV_MISMATCH; return fsp_ptr.fih; -- cgit v1.2.3