David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/57793 )
Change subject: ich_descriptors: Add explicit checks for all chipsets ......................................................................
ich_descriptors: Add explicit checks for all chipsets
This partially undoes changes made in CB:55651. There was a new chipset added that necessitated adding back a check for an older chipset. To keep things normalized we'll use the same pattern in all cases.
Change-Id: Ica49477492876810a6fa212768b1ab9e8c12001f Signed-off-by: David Hendricks ddaveh@amazon.com --- M ich_descriptors.c 1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/57793/1
diff --git a/ich_descriptors.c b/ich_descriptors.c index d56ade7..9b63006 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -933,15 +933,19 @@ return CHIPSET_ICH9; if (content->ISL <= 10) return CHIPSET_ICH10; + if (content->ISL <= 16) + return CHIPSET_5_SERIES_IBEX_PEAK; if (content->FLMAP2 == 0) { if (content->ISL == 19) return CHIPSET_APOLLO_LAKE; - warn_peculiar_desc(content->ISL != 23, "Gemini Lake"); + if (content->ISL == 23) + return CHIPSET_GEMINI_LAKE; + warn_peculiar_desc(true, "Gemini Lake"); return CHIPSET_GEMINI_LAKE; } if (content->ISL <= 80) return CHIPSET_C620_SERIES_LEWISBURG; - warn_peculiar_desc(content->ISL != 16, "Ibex Peak"); + warn_peculiar_desc(true, "Ibex Peak"); return CHIPSET_5_SERIES_IBEX_PEAK; } else if (upper->MDTBA == 0x00) { if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) { @@ -949,7 +953,9 @@ return CHIPSET_BAYTRAIL; if (content->MSL <= 1 && content->ISL <= 18) return CHIPSET_6_SERIES_COUGAR_POINT; - warn_peculiar_desc(content->MSL != 1 || content->ISL != 21, "Lynx Point"); + if (content->MSL <= 1 && content->ISL <= 21) + return CHIPSET_8_SERIES_LYNX_POINT; + warn_peculiar_desc(true, "Lynx Point"); return CHIPSET_8_SERIES_LYNX_POINT; } if (content->NM == 6) {