Attention is currently required from: Hsuan Ting Chen.
Hello Hsuan Ting Chen,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/flashrom/+/81356?usp=email
to review the following change.
Change subject: ich: Add names for region 5, 9, 10, 11, 12, 13, 15 ......................................................................
ich: Add names for region 5, 9, 10, 11, 12, 13, 15
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=none
Change-Id: I3b164ce4ae84bfd523fcd8be416c5d13183ed632 Signed-off-by: roccochen@chromium.com roccochen@chromium.org --- M ich_descriptors.c M ichspi.c M util/ich_descriptors_tool/ich_descriptors_tool.c 3 files changed, 9 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/56/81356/1
diff --git a/ich_descriptors.c b/ich_descriptors.c index 7bdca61..d1b1d9e 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -518,24 +518,24 @@ }
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) { num_regions = 10; msg_pdbg2("\n"); } else { 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++) { const unsigned int ext_region_start = 12; size_t j; msg_pdbg2("%-4s", master_names[i]); 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].write & (1 << j) ? 'w' : ' '); 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_write & (1 << (j - ext_region_start)) ? 'w' : ' '); msg_pdbg2("\n"); diff --git a/ichspi.c b/ichspi.c index 36a7b3b..bee5ec9 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1840,7 +1840,8 @@ static const char *const region_names[] = { "Flash Descriptor", "BIOS", "Management Engine", "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";
diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c index a5a59ad..844d8e9 100644 --- a/util/ich_descriptors_tool/ich_descriptors_tool.c +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -38,9 +38,9 @@
static const char *const region_names[] = { "Descriptor", "BIOS", "ME", "GbE", "Platform", - "Region5", "BIOS2", "Region7", "EC/BMC", "Region9", - "IE", "10GbE", "Region12", "Region13", "Region14", - "Region15" + "DevExp", "BIOS2", "Region7", "EC/BMC", "DevExp2", + "IE", "10GbE0", "10GbE1", "Region13", "Region14", + "PTT" };
static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len,