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

ich_descriptors: Don't base chipset detection on freq_read

Browse Source 
Only warn if the `freq_read` setting looks odd but don't override
our previous guess. The `freq_read` check was taken from `ifdtool`
but seems less reliable than our own detection scheme.

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

8
ich_descriptors.c
View File

@ -984,7 +984,7 @@ static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const c
case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_400_SERIES_COMET_POINT:
case CHIPSET_GEMINI_LAKE: case CHIPSET_GEMINI_LAKE:
/* `freq_read` was repurposed, so can't check on it any more. */ /* `freq_read` was repurposed, so can't check on it any more. */
return guess; break;
case CHIPSET_100_SERIES_SUNRISE_POINT: case CHIPSET_100_SERIES_SUNRISE_POINT:
case CHIPSET_C620_SERIES_LEWISBURG: case CHIPSET_C620_SERIES_LEWISBURG:
case CHIPSET_APOLLO_LAKE: case CHIPSET_APOLLO_LAKE:
@ -993,19 +993,17 @@ static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const c
"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");
return CHIPSET_9_SERIES_WILDCAT_POINT;
} }
return guess; break;
default: default:
if (component->modes.freq_read == 6) { if (component->modes.freq_read == 6) {
msg_pwarn("\nThe flash 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");
return CHIPSET_100_SERIES_SUNRISE_POINT;
} }
return guess;
} }
return guess;
} }
/* len is the length of dump in bytes */ /* len is the length of dump in bytes */