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 detection for chipsets w/ ICCRIBA

Browse Source 
Detection based on ICCRIBA and FMSBA became a little messy lately.
However, there's a new static difference: Since 300 series (Cannon
Point), there is an MDTBA field in FLUMAP1 that has always been 0
(reserved) before. Taking this into account, we can relax the checks
on ICCRIBA.

Change-Id: I587ad1abe390843d4a9e74431b6fc4b63f8ba512
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55647
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:05:00 +02:00
parent 6814e2c282
commit 339993b2b2
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ich_descriptors.c
View File

@ -921,9 +921,10 @@ static inline void warn_peculiar_desc(const bool warn_if, const char *const 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 and presence of the MIP base (MDTBA).
*/ */
static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_content *const content) static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_content *const content,
const struct ich_desc_upper_map *const upper)
{ {
if (content->ICCRIBA == 0x00) { if (content->ICCRIBA == 0x00) {
if (content->MSL == 0 && content->ISL <= 2) if (content->MSL == 0 && content->ISL <= 2)
@ -942,25 +943,26 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
} }
warn_peculiar_desc(true, "Ibex Peak"); 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 (upper->MDTBA == 0x00) {
if (content->MSL == 0 && content->ISL <= 17) if (content->ICCRIBA < 0x31 && content->FMSBA < 0x30) {
return CHIPSET_BAYTRAIL; if (content->MSL == 0 && content->ISL <= 17)
if (content->MSL <= 1 && content->ISL <= 18) return CHIPSET_BAYTRAIL;
return CHIPSET_6_SERIES_COUGAR_POINT; if (content->MSL <= 1 && content->ISL <= 18)
if (content->MSL <= 1 && content->ISL <= 21) return CHIPSET_6_SERIES_COUGAR_POINT;
return CHIPSET_8_SERIES_LYNX_POINT; if (content->MSL <= 1 && content->ISL <= 21)
warn_peculiar_desc(true, "Wildcat Point"); return CHIPSET_8_SERIES_LYNX_POINT;
return CHIPSET_9_SERIES_WILDCAT_POINT; warn_peculiar_desc(true, "Wildcat Point");
} else if (content->ICCRIBA < 0x34) { return CHIPSET_9_SERIES_WILDCAT_POINT;
if (content->NM == 6) }
if (content->NM == 6) {
warn_peculiar_desc(content->ICCRIBA > 0x34, "C620 series");
return CHIPSET_C620_SERIES_LEWISBURG; return CHIPSET_C620_SERIES_LEWISBURG;
}
warn_peculiar_desc(content->ICCRIBA != 0x31, "100 series");
return CHIPSET_100_SERIES_SUNRISE_POINT; return CHIPSET_100_SERIES_SUNRISE_POINT;
} else if (content->ICCRIBA == 0x34) {
if (content->NM == 6)
return CHIPSET_C620_SERIES_LEWISBURG;
return CHIPSET_300_SERIES_CANNON_POINT;
} else { } else {
msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n"); if (content->ICCRIBA != 0x34)
msg_pwarn("Unknown flash descriptor, assuming 300 series compatibility.\n");
return CHIPSET_300_SERIES_CANNON_POINT; return CHIPSET_300_SERIES_CANNON_POINT;
} }
} }
@ -972,9 +974,10 @@ static enum ich_chipset guess_ich_chipset_from_content(const struct ich_desc_con
* tinction because of the dropped number of regions field (NR). * tinction because of the dropped number of regions field (NR).
*/ */
static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const content, static enum ich_chipset guess_ich_chipset(const struct ich_desc_content *const content,
const struct ich_desc_component *const component) const struct ich_desc_component *const component,
const struct ich_desc_upper_map *const upper)
{ {
const enum ich_chipset guess = guess_ich_chipset_from_content(content); const enum ich_chipset guess = guess_ich_chipset_from_content(content, upper);
switch (guess) { switch (guess) {
case CHIPSET_300_SERIES_CANNON_POINT: case CHIPSET_300_SERIES_CANNON_POINT:
@ -1055,7 +1058,7 @@ int read_ich_descriptors_from_dump(const uint32_t *const dump, const size_t len,
} }
if (*cs == CHIPSET_ICH_UNKNOWN) { if (*cs == CHIPSET_ICH_UNKNOWN) {
*cs = guess_ich_chipset(&desc->content, &desc->component); *cs = guess_ich_chipset(&desc->content, &desc->component, &desc->upper);
prettyprint_ich_chipset(*cs); prettyprint_ich_chipset(*cs);
} }

3
ich_descriptors.h
View File

@ -521,7 +521,8 @@ struct ich_desc_upper_map {
struct { struct {
uint32_t VTBA :8, /* ME VSCC Table Base Address */ uint32_t VTBA :8, /* ME VSCC Table Base Address */
VTL :8, /* ME VSCC Table Length */ VTL :8, /* ME VSCC Table Length */
:16; :8,
MDTBA :8; /* MIP Descr. Table Base Addr. (new since Cannon Point/300) */
}; };
}; };
struct { struct {