[flashrom-gerrit] Change in flashrom[master]: allow 0x34 as ICCRIBA for CHIPSET_C620_SERIES_LEWISBURG

[Jonathan Zhang (Code Review)]

Jonathan Zhang has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/44621 )

Change subject: allow 0x34 as ICCRIBA for CHIPSET_C620_SERIES_LEWISBURG
......................................................................

allow 0x34 as ICCRIBA for CHIPSET_C620_SERIES_LEWISBURG

Intel C621A Lewisburg PCH belongs to C620 series, it has 0x34 as ICCRIBA.

Fix guess_ich_chipset_from_content() accordingly.

Print error status info for read_ich_descriptors_from_dump().

Change-Id: I363aaccfb90e0a127c0f0bb0072e9e85c210b669
Signed-off-by: Jonathan Zhang 
---
M ich_descriptors.c
1 file changed, 5 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/44621/1

diff --git a/ich_descriptors.c b/ich_descriptors.c
index 120d3fe..cd8e13a 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -932,7 +932,7 @@
    		return CHIPSET_8_SERIES_LYNX_POINT;
    	msg_pwarn("Peculiar firmware descriptor, assuming Wildcat Point compatibility.\n");
    	return CHIPSET_9_SERIES_WILDCAT_POINT;
-	} else if (content->ICCRIBA < 0x34) {
+	} else if (content->ICCRIBA <= 0x34) {
    	if (content->NM == 6)
    		return CHIPSET_C620_SERIES_LEWISBURG;
    	else
@@ -1243,8 +1243,11 @@

struct ich_descriptors desc;
    enum ich_chipset cs = CHIPSET_ICH_UNKNOWN;
-	if (read_ich_descriptors_from_dump(dump, len, &cs, &desc))
+	int ret = read_ich_descriptors_from_dump(dump, len, &cs, &desc);
+	if (ret) {
+		msg_cerr("__FUNC__, __LINE__ Failed with value %d.\n", ret);
    	return 1;
+	}

memset(layout, 0x00, sizeof(*layout));