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: Add names for region 5, 9, 10, 11, 12, 15

Browse Source 
Add Region 9 for Intel Meteor Lake; update missing regions.

* Include Region 9 as officially required for Intel Meteor Lake platform.
* Incorporate missing region names from https://github.com/coreboot/coreboot/blob/main/util/ifdtool/ifdtool.c for completeness.

Region 5: Device Expansion (DE or DevExp)
Region 9: Device Expansion 2 (DE2 or DevExp2)
Region 10: Innovation Engine (IE)
Region 11: 10 GbE 0
Region 12: 10 GbE 1
Region 15: PTT

BUG=b:319773700
TEST=Run `flashrom -VV` on MTL and see all the regions are printed out

Change-Id: I3b164ce4ae84bfd523fcd8be416c5d13183ed632
Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/81356
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
roccochen@chromium.com 2024-03-19 08:19:45 +08:00 committed by Anastasia Klimchuk
parent e5ed0c6340
commit 85f14efe06
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ich_descriptors.c
View File

@ -439,7 +439,7 @@ static void pprint_freg(const struct ich_desc_region *reg, uint32_t i)
{ {
static const char *const region_names[] = { static const char *const region_names[] = {
"Descr.", "BIOS", "ME", "GbE", "Platf.", "DevExp", "BIOS2", "unknown", "Descr.", "BIOS", "ME", "GbE", "Platf.", "DevExp", "BIOS2", "unknown",
"EC/BMC", "unknown", "IE", "10GbE", "unknown", "unknown", "unknown", "unknown" "EC/BMC", "unknown", "IE", "10GbE0", "10GbE1", "unknown", "unknown", "PTT"
}; };
if (i >= ARRAY_SIZE(region_names)) { if (i >= ARRAY_SIZE(region_names)) {
msg_pdbg2("%s: region index too high.\n", __func__); msg_pdbg2("%s: region index too high.\n", __func__);
@ -518,24 +518,24 @@ void prettyprint_ich_descriptor_master(const enum ich_chipset cs, const struct i
} }
size_t num_regions; size_t num_regions;
msg_pdbg2(" FD BIOS ME GbE Pltf Reg5 Reg6 Reg7 EC Reg9"); msg_pdbg2(" FD BIOS ME GbE Pltf DE BIOS2 Reg7 EC DE2 ");
if (cs == CHIPSET_100_SERIES_SUNRISE_POINT) { if (cs == CHIPSET_100_SERIES_SUNRISE_POINT) {
num_regions = 10; num_regions = 10;
msg_pdbg2("\n"); msg_pdbg2("\n");
} else { } else {
num_regions = 16; num_regions = 16;
msg_pdbg2(" RegA RegB RegC RegD RegE RegF\n"); msg_pdbg2(" IE 10GbE0 10GbE1 RegD RegE PTT \n");
} }
for (i = 0; i < nm; i++) { for (i = 0; i < nm; i++) {
const unsigned int ext_region_start = 12; const unsigned int ext_region_start = 12;
size_t j; size_t j;
msg_pdbg2("%-4s", master_names[i]); msg_pdbg2("%-4s", master_names[i]);
for (j = 0; j < (size_t)min(num_regions, ext_region_start); j++) for (j = 0; j < (size_t)min(num_regions, ext_region_start); j++)
msg_pdbg2(" %c%c ", msg_pdbg2(" %c%c ",
desc->master.mstr[i].read & (1 << j) ? 'r' : ' ', desc->master.mstr[i].read & (1 << j) ? 'r' : ' ',
desc->master.mstr[i].write & (1 << j) ? 'w' : ' '); desc->master.mstr[i].write & (1 << j) ? 'w' : ' ');
for (j = ext_region_start; j < num_regions; j++) for (j = ext_region_start; j < num_regions; j++)
msg_pdbg2(" %c%c ", msg_pdbg2(" %c%c ",
desc->master.mstr[i].ext_read & (1 << (j - ext_region_start)) ? 'r' : ' ', desc->master.mstr[i].ext_read & (1 << (j - ext_region_start)) ? 'r' : ' ',
desc->master.mstr[i].ext_write & (1 << (j - ext_region_start)) ? 'w' : ' '); desc->master.mstr[i].ext_write & (1 << (j - ext_region_start)) ? 'w' : ' ');
msg_pdbg2("\n"); msg_pdbg2("\n");

3
ichspi.c
View File

@ -1840,7 +1840,8 @@ static enum ich_access_protection ich9_handle_frap(struct fd_region *fd_regions,
static const char *const region_names[] = { static const char *const region_names[] = {
"Flash Descriptor", "BIOS", "Management Engine", "Flash Descriptor", "BIOS", "Management Engine",
"Gigabit Ethernet", "Platform Data", "Device Expansion", "Gigabit Ethernet", "Platform Data", "Device Expansion",
"BIOS2", "unknown", "EC/BMC", "BIOS2", "unknown", "EC/BMC", "Device Expansion 2",
"Innovation Engine", "10GbE0", "10GbE1", "unknown", "unknown", "PTT",
}; };
const char *const region_name = i < ARRAY_SIZE(region_names) ? region_names[i] : "unknown"; const char *const region_name = i < ARRAY_SIZE(region_names) ? region_names[i] : "unknown";

6
util/ich_descriptors_tool/ich_descriptors_tool.c
View File

@ -38,9 +38,9 @@
static const char *const region_names[] = { static const char *const region_names[] = {
"Descriptor", "BIOS", "ME", "GbE", "Platform", "Descriptor", "BIOS", "ME", "GbE", "Platform",
"Region5", "BIOS2", "Region7", "EC/BMC", "Region9", "DevExp", "BIOS2", "Region7", "EC/BMC", "DevExp2",
"IE", "10GbE", "Region12", "Region13", "Region14", "IE", "10GbE0", "10GbE1", "Region13", "Region14",
"Region15" "PTT"
}; };
static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len, static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len,