spd: remove ddr_freq field from nonspd modules
Nothing uses this field, we can remove it.
BUG=chromium:990438
TEST="mosys memory spd print all" on volteer
Change-Id: Ib173b14be13937934f582439ab03c4947e4d97c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/mosys/+/2787283
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Rob Barnes <robbarnes@google.com>
Reviewed-by: Rob Barnes <robbarnes@google.com>
diff --git a/include/lib/nonspd.h b/include/lib/nonspd.h
index f2da0af..6e2b23d 100644
--- a/include/lib/nonspd.h
+++ b/include/lib/nonspd.h
@@ -62,10 +62,6 @@
/* SDRAM device width (including ECC) */
unsigned int device_width;
- /* module frequency capabilities (allow multiple entries for various
- * de-rated frequency values) */
- enum ddr_freq ddr_freq[10];
-
/* Module Manufacturer ID */
struct {
uint8_t lsb;
diff --git a/include/lib/spd.h b/include/lib/spd.h
index 106fd41..8aed8fe 100644
--- a/include/lib/spd.h
+++ b/include/lib/spd.h
@@ -90,28 +90,6 @@
{ DDR3_MODULE_TYPE_LRDIMM, "LRDIMM" },
};
-enum ddr_freq {
- DDR_FREQ_UNKNOWN = 0, /* uninitialized value */
- DDR_333,
- DDR_400,
- DDR_533,
- DDR_667,
- DDR_800,
- DDR_933,
- DDR_1067,
- DDR_1200,
- DDR_1333,
- DDR_1355,
- DDR_1466,
- DDR_1600,
- DDR_1867,
- DDR_2133,
-
- DDR_FREQ_MAX
-};
-
-extern const char *ddr_freq_prettyprint[];
-
struct spd_eeprom {
int length;
uint8_t data[SPD_MAX_LENGTH];
diff --git a/lib/spd/nonspd_modules.c b/lib/spd/nonspd_modules.c
index 10496ab..6b92b2f 100644
--- a/lib/spd/nonspd_modules.c
+++ b/lib/spd/nonspd_modules.c
@@ -42,7 +42,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x80 },
@@ -59,7 +58,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -76,7 +74,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -93,7 +90,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -110,7 +106,6 @@
.module_size_mbits = 8192,
.num_ranks = 1,
.device_width = 32,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -127,7 +122,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -143,7 +137,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 16,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -160,7 +153,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -177,7 +169,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -194,7 +185,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -210,7 +200,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_800, DDR_1200, DDR_1600 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -226,7 +215,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_800, DDR_1200, DDR_1600 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -242,7 +230,6 @@
.module_size_mbits = 65536,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_800, DDR_1200, DDR_1600 },
.module_mfg_id = { .msb = 0xad, .lsb = 0x80 },
.dram_mfg_id = { .msb = 0xad, .lsb = 0x80 },
@@ -259,7 +246,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -276,7 +262,6 @@
.num_ranks = 1,
.device_width = 16,
/* CL = 11, CWL = 8, min = 1.25ns, max <1.5ns */
- .ddr_freq = { DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
.dram_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
@@ -291,7 +276,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
.dram_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
@@ -306,7 +290,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
.dram_mfg_id = { .msb = 0x0b, .lsb = 0x03 },
@@ -321,7 +304,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -338,7 +320,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -355,7 +336,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -372,7 +352,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -389,7 +368,6 @@
.module_size_mbits = 4096,
.num_ranks = 1,
.device_width = 16,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -405,7 +383,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 16,
- .ddr_freq = { DDR_333, DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -422,7 +399,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -439,7 +415,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -456,7 +431,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -473,7 +447,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -490,7 +463,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -506,7 +478,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -523,7 +494,6 @@
.module_size_mbits = 8192,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -540,7 +510,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -556,7 +525,6 @@
.module_size_mbits = 8192,
.num_ranks = 1,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -573,7 +541,6 @@
.module_size_mbits = 2048 * 8,
.num_ranks = 1,
.device_width = 64,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -589,7 +556,6 @@
.module_size_mbits = 8192,
.num_ranks = 1,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -606,7 +572,6 @@
.module_size_mbits = 16384,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -623,7 +588,6 @@
.module_size_mbits = 4096 * 8,
.num_ranks = 2,
.device_width = 64,
- .ddr_freq = { DDR_400, DDR_533, DDR_667, DDR_800, DDR_933 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -638,7 +602,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_800, DDR_1200, DDR_1600 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -654,7 +617,6 @@
.module_size_mbits = 32768,
.num_ranks = 1,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -670,7 +632,6 @@
.module_size_mbits = 65536,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -686,7 +647,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -702,7 +662,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_800, DDR_1200, DDR_1600 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -718,7 +677,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -734,7 +692,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -750,7 +707,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_2133 },
.module_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x2c, .lsb = 0x00 },
@@ -766,7 +722,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_1355 },
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -782,7 +737,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -798,7 +752,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -814,7 +767,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -830,7 +782,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -846,7 +797,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0xce, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0xce, .lsb = 0x00 },
@@ -862,7 +812,6 @@
.module_size_mbits = 32768,
.num_ranks = 2,
.device_width = 32,
- .ddr_freq = { DDR_667, DDR_800, DDR_933, DDR_1067, DDR_1200},
.module_mfg_id = { .msb = 0x45, .lsb = 0x00 },
.dram_mfg_id = { .msb = 0x45, .lsb = 0x00 },
diff --git a/lib/spd/spd.c b/lib/spd/spd.c
index b47e931..8ca096d 100644
--- a/lib/spd/spd.c
+++ b/lib/spd/spd.c
@@ -41,24 +41,6 @@
#include "lib/math.h"
#include "lib/spd.h"
-const char *ddr_freq_prettyprint[] = {
- [DDR_FREQ_UNKNOWN] = "Unknown",
- [DDR_333] = "667",
- [DDR_400] = "800",
- [DDR_533] = "1066",
- [DDR_667] = "1333",
- [DDR_800] = "1600",
- [DDR_933] = "1866",
- [DDR_1067] = "2133",
- [DDR_1200] = "2400",
- [DDR_1333] = "2667",
- [DDR_1355] = "2710",
- [DDR_1466] = "2933",
- [DDR_1600] = "3200",
- [DDR_1867] = "3733",
- [DDR_2133] = "4267",
-};
-
/* new_spd_device() - create a new instance of spd_device
*
* @intf: platform_intf for access