David Hendricks has uploaded this change for review.

View Change

ich_descriptors: Increase ISL ranges that can be checked

This patch does the following:
- Checks for Ibex Peak more explicitly, as ifdtool currently does.
- Add check for EBG/LBG, which has a much larger ISL/PSL value than
other chipsets currently listed.
- Unconditionally print the "peculiar flash descriptor" warning if none
of the chipsets are detected explicitly, since checking `!= 16` is
redundant with the above checks.

Change-Id: I2b6301c6cd08f6822340d61a3454b31fddc3be52
Signed-off-by: David Hendricks <ddaveh@amazon.com>
---
M ich_descriptors.c
1 file changed, 10 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/57633/1
diff --git a/ich_descriptors.c b/ich_descriptors.c
index aba7528..7589510 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -933,13 +933,22 @@
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");
return CHIPSET_GEMINI_LAKE;
}
- warn_peculiar_desc(content->ISL != 16, "Ibex Peak");
+ /* Emmitsburg has 80, Lewisburg on Purley and Whitley have 139 */
+ if (content->ISL <= 139)
+ return CHIPSET_C620_SERIES_LEWISBURG;
+ /*
+ * Ibex Peak is historically used as the default when other
+ * chipsets are not identified.
+ */
+ warn_peculiar_desc(true, "Ibex Peak");
return CHIPSET_5_SERIES_IBEX_PEAK;
} else if (upper->MDTBA == 0x00) {
if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) {

To view, visit change 57633. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I2b6301c6cd08f6822340d61a3454b31fddc3be52
Gerrit-Change-Number: 57633
Gerrit-PatchSet: 1
Gerrit-Owner: David Hendricks
Gerrit-MessageType: newchange