openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

ich_descriptors: Add explicit checks for all chipsets

Browse Source 
This partially undoes changes made in commit cd9b7b427
(ich_descriptors: Normalize chipset detection) to re-add explicit
matching of each chipset with one or more strap length values.

Since ranges are checked explicitly, the `warn_if` parameter to
warn_peculiar_desc() is no longer necessary and is removed.

Change-Id: Ica49477492876810a6fa212768b1ab9e8c12001f
Signed-off-by: David Hendricks <ddaveh@amazon.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/57793
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
David Hendricks 2021-09-20 21:56:40 -07:00 committed by Nico Huber
parent 86867eaa19
commit 106f097ef6
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ich_descriptors.c
View File

@ -912,10 +912,8 @@ void prettyprint_ich_descriptor_upper_map(const struct ich_desc_upper_map *umap)
msg_pdbg2("\n"); msg_pdbg2("\n");
} }
static inline void warn_peculiar_desc(const bool warn_if, const char *const name) static inline void warn_peculiar_desc(const char *const name)
{ {
if (!warn_if)
return;
msg_pwarn("Peculiar flash descriptor, assuming %s compatibility.\n", name); msg_pwarn("Peculiar flash descriptor, assuming %s compatibility.\n", name);
} }
@ -933,15 +931,19 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
return CHIPSET_ICH9; return CHIPSET_ICH9;
if (content->ISL <= 10) if (content->ISL <= 10)
return CHIPSET_ICH10; return CHIPSET_ICH10;
if (content->ISL <= 16)
return CHIPSET_5_SERIES_IBEX_PEAK;
if (content->FLMAP2 == 0) { if (content->FLMAP2 == 0) {
if (content->ISL == 19) if (content->ISL == 19)
return CHIPSET_APOLLO_LAKE; return CHIPSET_APOLLO_LAKE;
warn_peculiar_desc(content->ISL != 23, "Gemini Lake"); if (content->ISL == 23)
return CHIPSET_GEMINI_LAKE;
warn_peculiar_desc("Gemini Lake");
return CHIPSET_GEMINI_LAKE; return CHIPSET_GEMINI_LAKE;
} }
if (content->ISL <= 80) if (content->ISL <= 80)
return CHIPSET_C620_SERIES_LEWISBURG; return CHIPSET_C620_SERIES_LEWISBURG;
warn_peculiar_desc(content->ISL != 16, "Ibex Peak"); warn_peculiar_desc("Ibex Peak");
return CHIPSET_5_SERIES_IBEX_PEAK; return CHIPSET_5_SERIES_IBEX_PEAK;
} else if (upper->MDTBA == 0x00) { } else if (upper->MDTBA == 0x00) {
if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) { if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) {
@ -949,18 +951,25 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
return CHIPSET_BAYTRAIL; return CHIPSET_BAYTRAIL;
if (content->MSL <= 1 && content->ISL <= 18) if (content->MSL <= 1 && content->ISL <= 18)
return CHIPSET_6_SERIES_COUGAR_POINT; 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("Lynx Point");
return CHIPSET_8_SERIES_LYNX_POINT; return CHIPSET_8_SERIES_LYNX_POINT;
} }
if (content->NM == 6) { if (content->NM == 6) {
warn_peculiar_desc(content->ICCRIBA > 0x34, "C620 series"); if (content->ICCRIBA <= 0x34)
return CHIPSET_C620_SERIES_LEWISBURG;
warn_peculiar_desc("C620 series");
return CHIPSET_C620_SERIES_LEWISBURG; return CHIPSET_C620_SERIES_LEWISBURG;
} }
warn_peculiar_desc(content->ICCRIBA != 0x31, "100 series"); if (content->ICCRIBA == 0x31)
return CHIPSET_100_SERIES_SUNRISE_POINT;
warn_peculiar_desc("100 series");
return CHIPSET_100_SERIES_SUNRISE_POINT; return CHIPSET_100_SERIES_SUNRISE_POINT;
} else { } else {
if (content->ICCRIBA != 0x34) if (content->ICCRIBA == 0x34)
msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n"); return CHIPSET_300_SERIES_CANNON_POINT;
msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n");
return CHIPSET_300_SERIES_CANNON_POINT; return CHIPSET_300_SERIES_CANNON_POINT;
} }
} }