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: Revise descriptor messages

Browse Source 
Correct "firmware descriptor" to "flash descriptor". And also
move the check for peculiar descriptors and the message into an
inline function.

Change-Id: I7f15780e03d2fa17ca6d8328275cae5af13ae424
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55644
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2021-06-17 21:12:47 +02:00
parent db2a639aec
commit 1d3013bbdc
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ich_descriptors.c
View File

@ -912,6 +912,13 @@ 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)
{
if (!warn_if)
return;
msg_pwarn("Peculiar flash descriptor, assuming %s compatibility.\n", name);
}
/* /*
* Guesses a minimum chipset version based on the maximum number of * Guesses a minimum chipset version based on the maximum number of
* soft straps per generation. * soft straps per generation.
@ -930,11 +937,10 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
else if (content->FLMAP2 == 0) { else if (content->FLMAP2 == 0) {
if (content->ISL == 23) if (content->ISL == 23)
return CHIPSET_GEMINI_LAKE; return CHIPSET_GEMINI_LAKE;
else if (content->ISL != 19) warn_peculiar_desc(content->ISL != 19, "Apollo Lake");
msg_pwarn("Peculiar firmware descriptor, assuming Apollo Lake compatibility.\n");
return CHIPSET_APOLLO_LAKE; return CHIPSET_APOLLO_LAKE;
} }
msg_pwarn("Peculiar firmware descriptor, assuming Ibex Peak compatibility.\n"); warn_peculiar_desc(true, "Ibex Peak");
return CHIPSET_5_SERIES_IBEX_PEAK; return CHIPSET_5_SERIES_IBEX_PEAK;
} else if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) { } else if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) {
if (content->MSL == 0 && content->ISL <= 17) if (content->MSL == 0 && content->ISL <= 17)
@ -943,7 +949,7 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
return CHIPSET_6_SERIES_COUGAR_POINT; return CHIPSET_6_SERIES_COUGAR_POINT;
else if (content->MSL <= 1 && content->ISL <= 21) else if (content->MSL <= 1 && content->ISL <= 21)
return CHIPSET_8_SERIES_LYNX_POINT; return CHIPSET_8_SERIES_LYNX_POINT;
msg_pwarn("Peculiar firmware descriptor, assuming Wildcat Point compatibility.\n"); warn_peculiar_desc(true, "Wildcat Point");
return CHIPSET_9_SERIES_WILDCAT_POINT; return CHIPSET_9_SERIES_WILDCAT_POINT;
} else if (content->ICCRIBA < 0x34) { } else if (content->ICCRIBA < 0x34) {
if (content->NM == 6) if (content->NM == 6)
@ -956,7 +962,7 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
else else
return CHIPSET_300_SERIES_CANNON_POINT; return CHIPSET_300_SERIES_CANNON_POINT;
} else { } else {
msg_pwarn("Unknown firmware descriptor, assuming 300 series compatibility.\n"); msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n");
return CHIPSET_300_SERIES_CANNON_POINT; return CHIPSET_300_SERIES_CANNON_POINT;
} }
} }
@ -982,7 +988,7 @@ static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const c
case CHIPSET_C620_SERIES_LEWISBURG: case CHIPSET_C620_SERIES_LEWISBURG:
case CHIPSET_APOLLO_LAKE: case CHIPSET_APOLLO_LAKE:
if (component->modes.freq_read != 6) { if (component->modes.freq_read != 6) {
msg_pwarn("\nThe firmware descriptor looks like a Skylake/Sunrise Point descriptor.\n" msg_pwarn("\nThe flash descriptor looks like a Skylake/Sunrise Point descriptor.\n"
"However, the read frequency isn't set to 17MHz (the only valid value).\n" "However, the read frequency isn't set to 17MHz (the only valid value).\n"
"Please report this message, the output of `ich_descriptors_tool` for\n" "Please report this message, the output of `ich_descriptors_tool` for\n"
"your descriptor and the output of `lspci -nn` to flashrom@flashrom.org\n\n"); "your descriptor and the output of `lspci -nn` to flashrom@flashrom.org\n\n");
@ -991,7 +997,7 @@ static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const c
return guess; return guess;
default: default:
if (component->modes.freq_read == 6) { if (component->modes.freq_read == 6) {
msg_pwarn("\nThe firmware descriptor has the read frequency set to 17MHz. However,\n" msg_pwarn("\nThe flash descriptor has the read frequency set to 17MHz. However,\n"
"it doesn't look like a Skylake/Sunrise Point compatible descriptor.\n" "it doesn't look like a Skylake/Sunrise Point compatible descriptor.\n"
"Please report this message, the output of `ich_descriptors_tool` for\n" "Please report this message, the output of `ich_descriptors_tool` for\n"
"your descriptor and the output of `lspci -nn` to flashrom@flashrom.org\n\n"); "your descriptor and the output of `lspci -nn` to flashrom@flashrom.org\n\n");