summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubrata Banik <subrata.banik@intel.com>2020-08-26 16:01:42 +0530
committerPatrick Georgi <pgeorgi@google.com>2020-09-02 07:17:44 +0000
commite5d3992639eca6c8ee700b414efc5711549a31cc (patch)
treebc0c8f0e10c900c83a726eb495746a5ead908e9b
parentd16ef4d21ea7efcad97b49bc2633caa4342ecbea (diff)
downloadcoreboot-e5d3992639eca6c8ee700b414efc5711549a31cc.tar.xz
util/ifdtool: Fix eSPI frequency as per Gen 11 SPI flash guide
BUG=b:153888802 TEST=Able to list correct eSPI frequency as per TGL SPI flash guide Without this CL : Found Component Section FLCOMP 0x093030f6 Dual Output Fast Read Support: not supported Read ID/Read Status Clock Frequency: 50MHz Write/Erase Clock Frequency: 50MHz Fast Read Clock Frequency: 50MHz Fast Read Support: supported Read Clock Frequency: 20MHz With this CL : Found Component Section FLCOMP 0x093030f6 Dual Output Fast Read Support: not supported Read ID/Read Status Clock Frequency: 50MHz Write/Erase Clock Frequency: 50MHz Fast Read Clock Frequency: 50MHz Fast Read Support: supported Read eSPI/EC Bus Frequency: 60MHz Signed-off-by: Subrata Banik <subrata.banik@intel.com> Change-Id: I20840e6f931d7c1fabea0b6892e3bd19ead81168 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44820 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--util/ifdtool/ifdtool.c77
-rw-r--r--util/ifdtool/ifdtool.h17
2 files changed, 90 insertions, 4 deletions
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 9f507bb68d..e2fd0abd1b 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -509,6 +509,63 @@ static void decode_spi_frequency(unsigned int freq)
_decode_spi_frequency(freq);
}
+static void _decode_espi_frequency(unsigned int freq)
+{
+ switch (freq) {
+ case ESPI_FREQUENCY_20MHZ:
+ printf("20MHz");
+ break;
+ case ESPI_FREQUENCY_24MHZ:
+ printf("24MHz");
+ break;
+ case ESPI_FREQUENCY_30MHZ:
+ printf("30MHz");
+ break;
+ case ESPI_FREQUENCY_48MHZ:
+ printf("48MHz");
+ break;
+ case ESPI_FREQUENCY_60MHZ:
+ printf("60MHz");
+ break;
+ case ESPI_FREQUENCY_17MHZ:
+ printf("17MHz");
+ break;
+ default:
+ printf("unknown<%x>MHz", freq);
+ }
+}
+
+static void _decode_espi_frequency_500_series(unsigned int freq)
+{
+ switch (freq) {
+ case ESPI_FREQUENCY_500SERIES_20MHZ:
+ printf("20MHz");
+ break;
+ case ESPI_FREQUENCY_500SERIES_24MHZ:
+ printf("24MHz");
+ break;
+ case ESPI_FREQUENCY_500SERIES_25MHZ:
+ printf("25MHz");
+ break;
+ case ESPI_FREQUENCY_500SERIES_48MHZ:
+ printf("48MHz");
+ break;
+ case ESPI_FREQUENCY_500SERIES_60MHZ:
+ printf("60MHz");
+ break;
+ default:
+ printf("unknown<%x>MHz", freq);
+ }
+}
+
+static void decode_espi_frequency(unsigned int freq)
+{
+ if (chipset == CHIPSET_500_SERIES_TIGER_POINT)
+ _decode_espi_frequency_500_series(freq);
+ else
+ _decode_espi_frequency(freq);
+}
+
static void decode_component_density(unsigned int density)
{
switch (density) {
@@ -562,8 +619,10 @@ static int is_platform_with_100x_series_pch(void)
return 0;
}
-static void dump_fcba(const fcba_t *fcba)
+static void dump_fcba(const fcba_t *fcba, const fpsba_t *fpsba)
{
+ unsigned int freq;
+
printf("\nFound Component Section\n");
printf("FLCOMP 0x%08x\n", fcba->flcomp);
printf(" Dual Output Fast Read Support: %ssupported\n",
@@ -576,8 +635,18 @@ static void dump_fcba(const fcba_t *fcba)
decode_spi_frequency((fcba->flcomp >> 21) & 7);
printf("\n Fast Read Support: %ssupported",
(fcba->flcomp & (1 << 20))?"":"not ");
- printf("\n Read Clock Frequency: ");
- decode_spi_frequency((fcba->flcomp >> 17) & 7);
+ if (is_platform_with_100x_series_pch() &&
+ chipset != CHIPSET_100_200_SERIES_SUNRISE_POINT) {
+ printf("\n Read eSPI/EC Bus Frequency: ");
+ if (chipset == CHIPSET_500_SERIES_TIGER_POINT)
+ freq = (fpsba->pchstrp[22] & 0x38) >> 3;
+ else
+ freq = (fcba->flcomp >> 17) & 7;
+ decode_espi_frequency(freq);
+ } else {
+ printf("\n Read Clock Frequency: ");
+ decode_spi_frequency((fcba->flcomp >> 17) & 7);
+ }
switch (ifd_version) {
case IFD_VERSION_1:
@@ -868,7 +937,7 @@ static void dump_fd(char *image, int size)
if (frba && fcba && fpsba && fmba && fmsba) {
dump_frba(frba);
- dump_fcba(fcba);
+ dump_fcba(fcba, fpsba);
dump_fpsba(fdb, fpsba);
dump_fmba(fmba);
dump_fmsba(fmsba);
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index 0842924ec1..b72582358c 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.h
@@ -71,6 +71,23 @@ enum spi_frequency_500_series {
SPI_FREQUENCY_14MHZ = 6,
};
+enum espi_frequency {
+ ESPI_FREQUENCY_20MHZ = 0,
+ ESPI_FREQUENCY_24MHZ = 1,
+ ESPI_FREQUENCY_30MHZ = 2,
+ ESPI_FREQUENCY_48MHZ = 3,
+ ESPI_FREQUENCY_60MHZ = 4,
+ ESPI_FREQUENCY_17MHZ = 6,
+};
+
+enum espi_frequency_500_series {
+ ESPI_FREQUENCY_500SERIES_20MHZ = 0,
+ ESPI_FREQUENCY_500SERIES_24MHZ = 1,
+ ESPI_FREQUENCY_500SERIES_25MHZ = 2,
+ ESPI_FREQUENCY_500SERIES_48MHZ = 3,
+ ESPI_FREQUENCY_500SERIES_60MHZ = 4,
+};
+
enum component_density {
COMPONENT_DENSITY_512KB = 0,
COMPONENT_DENSITY_1MB = 1,