From 0b4f49c792c21a9a806cc57a5563da4947abc0be Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Fri, 29 Jul 2022 17:19:48 -0600 Subject: [PATCH] util/spd_tools/spd_gen/lp5: Remove maxSpeed for Sabrina Firmware component that does memory training already limits the memory controller to train at 5500 Mbps for all memory parts in Sabrina. Hence removing this interim SPD change to limit the speed. BUG=b:238074863 TEST=Build and boot to OS in Skyrim. Signed-off-by: Karthikeyan Ramasubramanian Change-Id: I2bc82c7407a97aac282708c3e0bd56ae99a8fc31 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66290 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- .../set-1/parts_spd_manifest.generated.txt | 8 ++--- spd/lp5/set-1/spd-1.hex | 4 +-- spd/lp5/set-1/spd-2.hex | 4 +-- spd/lp5/set-1/spd-3.hex | 4 +-- spd/lp5/set-1/spd-4.hex | 4 +-- spd/lp5/set-1/spd-5.hex | 6 ++-- spd/lp5/set-1/spd-6.hex | 32 +++++++++++++++++++ spd/lp5/set-1/spd-8.hex | 32 +++++++++++++++++++ util/spd_tools/src/spd_gen/lp5.go | 12 ------- 9 files changed, 79 insertions(+), 27 deletions(-) create mode 100644 spd/lp5/set-1/spd-6.hex create mode 100644 spd/lp5/set-1/spd-8.hex diff --git a/spd/lp5/set-1/parts_spd_manifest.generated.txt b/spd/lp5/set-1/parts_spd_manifest.generated.txt index 55878167a6..91c247a780 100644 --- a/spd/lp5/set-1/parts_spd_manifest.generated.txt +++ b/spd/lp5/set-1/parts_spd_manifest.generated.txt @@ -7,9 +7,9 @@ H9JCNNNCP3MLYR-N6E,spd-2.hex K3LKBKB0BM-MGCP,spd-3.hex H9JCNNNBK3MLYR-N6E,spd-1.hex MT62F2G32D8DR-031 WT:B,spd-4.hex -K3LKLKL0EM-MGCN,spd-1.hex +K3LKLKL0EM-MGCN,spd-5.hex H58G56AK6BX069,spd-3.hex MT62F1G32D4DS-031 WT:B,spd-2.hex -K3LKCKC0BM-MGCP,spd-5.hex -MT62F1G32D2DS-026 WT:B,spd-3.hex -MT62F2G32D4DS-026 WT:B,spd-5.hex +K3LKCKC0BM-MGCP,spd-6.hex +MT62F1G32D2DS-026 WT:B,spd-7.hex +MT62F2G32D4DS-026 WT:B,spd-8.hex diff --git a/spd/lp5/set-1/spd-1.hex b/spd/lp5/set-1/spd-1.hex index 1bb8da178f..ccc9107aab 100644 --- a/spd/lp5/set-1/spd-1.hex +++ b/spd/lp5/set-1/spd-1.hex @@ -1,11 +1,11 @@ 23 11 13 0E 85 19 95 18 00 40 00 00 02 02 00 00 -00 00 03 00 00 00 00 00 2C 00 90 A8 90 90 06 C0 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 90 06 C0 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 C9 00 F4 00 00 +00 00 00 00 00 00 00 00 00 00 00 B9 00 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-2.hex b/spd/lp5/set-1/spd-2.hex index 12300a029e..69a5fb54f2 100644 --- a/spd/lp5/set-1/spd-2.hex +++ b/spd/lp5/set-1/spd-2.hex @@ -1,11 +1,11 @@ 23 11 13 0E 85 19 B5 18 00 40 00 00 0A 02 00 00 -00 00 03 00 00 00 00 00 2C 00 90 A8 90 90 06 C0 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 90 06 C0 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 C9 00 F4 00 00 +00 00 00 00 00 00 00 00 00 00 00 B9 00 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-3.hex b/spd/lp5/set-1/spd-3.hex index a8cf28940a..8090f06fdc 100644 --- a/spd/lp5/set-1/spd-3.hex +++ b/spd/lp5/set-1/spd-3.hex @@ -1,11 +1,11 @@ 23 11 13 0E 86 21 95 18 00 40 00 00 02 02 00 00 -00 00 03 00 00 00 00 00 2C 00 90 A8 90 C0 08 60 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 C0 08 60 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 C9 00 F4 00 00 +00 00 00 00 00 00 00 00 00 00 00 B9 00 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-4.hex b/spd/lp5/set-1/spd-4.hex index 01a5734bd4..7255eece70 100644 --- a/spd/lp5/set-1/spd-4.hex +++ b/spd/lp5/set-1/spd-4.hex @@ -1,11 +1,11 @@ 23 11 13 0E 85 21 F9 18 00 40 00 00 09 02 00 00 -00 00 03 00 00 00 00 00 2C 00 90 A8 90 90 06 C0 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 90 06 C0 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 C9 00 F4 00 00 +00 00 00 00 00 00 00 00 00 00 00 B9 00 C1 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-5.hex b/spd/lp5/set-1/spd-5.hex index 2cd3e1dedd..1bb8da178f 100644 --- a/spd/lp5/set-1/spd-5.hex +++ b/spd/lp5/set-1/spd-5.hex @@ -1,6 +1,6 @@ -23 11 13 0E 86 21 B5 18 00 40 00 00 0A 02 00 00 -00 00 03 00 00 00 00 00 2C 00 90 A8 90 C0 08 60 -04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +23 11 13 0E 85 19 95 18 00 40 00 00 02 02 00 00 +00 00 03 00 00 00 00 00 2C 00 90 A8 90 90 06 C0 +03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-6.hex b/spd/lp5/set-1/spd-6.hex new file mode 100644 index 0000000000..da2001a858 --- /dev/null +++ b/spd/lp5/set-1/spd-6.hex @@ -0,0 +1,32 @@ +23 11 13 0E 86 21 B5 18 00 40 00 00 0A 02 00 00 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 C0 08 60 +04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 B9 00 C1 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20 +20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/spd/lp5/set-1/spd-8.hex b/spd/lp5/set-1/spd-8.hex new file mode 100644 index 0000000000..e08c69559d --- /dev/null +++ b/spd/lp5/set-1/spd-8.hex @@ -0,0 +1,32 @@ +23 11 13 0E 86 21 B5 18 00 40 00 00 0A 02 00 00 +00 00 03 00 00 00 00 00 2B 00 90 A8 90 C0 08 60 +04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 C9 00 93 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 20 20 20 20 20 20 20 +20 20 20 20 20 20 20 20 20 20 20 20 20 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 diff --git a/util/spd_tools/src/spd_gen/lp5.go b/util/spd_tools/src/spd_gen/lp5.go index 64fb53fbe2..09387c740b 100644 --- a/util/spd_tools/src/spd_gen/lp5.go +++ b/util/spd_tools/src/spd_gen/lp5.go @@ -70,7 +70,6 @@ type LP5Set struct { otherOptionalFeatures byte busWidthEncoding byte speedToTCKMinPs map[int]int - maxSpeedMbps int } /* ------------------------------------------------------------------------------------------ */ @@ -235,8 +234,6 @@ var LP5SetInfo = map[int]LP5Set{ * Set to 0x02. */ busWidthEncoding: 0x02, - /* Sabrina supports max speed of 5500 MT/s */ - maxSpeedMbps: 5500, }, } @@ -640,14 +637,6 @@ func LP5EncodeTRFCPBMinLsb(memAttribs *LP5MemAttributes) byte { return byte(convNsToMtb(memAttribs.TRFCPBNs) & 0xff) } -func LP5UpdateSpeedMbps(memAttribs *LP5MemAttributes) { - f, ok := LP5SetInfo[LP5CurrSet] - - if ok && f.maxSpeedMbps != 0 && memAttribs.SpeedMbps > f.maxSpeedMbps { - memAttribs.SpeedMbps = f.maxSpeedMbps - } -} - func LP5UpdateTCKMin(memAttribs *LP5MemAttributes) { if memAttribs.TCKMinPs == 0 { memAttribs.TCKMinPs = LP5GetTCKMinPs(memAttribs) @@ -695,7 +684,6 @@ func LP5UpdateTRPPB(memAttribs *LP5MemAttributes) { } func lp5UpdateMemoryAttributes(memAttribs *LP5MemAttributes) { - LP5UpdateSpeedMbps(memAttribs) LP5UpdateTCKMin(memAttribs) LP5UpdateTAAMin(memAttribs) LP5UpdateTRFCAB(memAttribs)