diff options
| -rw-r--r-- | spd/lp5/memory_parts.json | 6 | ||||
| -rw-r--r-- | spd/lp5/platforms_manifest.generated.txt | 2 | ||||
| -rw-r--r-- | spd/lp5/set-1/spd-7.hex | 2 | ||||
| -rw-r--r-- | spd/lp5/set-1/spd-8.hex | 2 | ||||
| -rw-r--r-- | util/spd_tools/README.md | 9 | ||||
| -rw-r--r-- | util/spd_tools/src/spd_gen/lp5.go | 28 |
6 files changed, 39 insertions, 10 deletions
diff --git a/spd/lp5/memory_parts.json b/spd/lp5/memory_parts.json index 66f32710aee5..e371d8666972 100644 --- a/spd/lp5/memory_parts.json +++ b/spd/lp5/memory_parts.json @@ -107,7 +107,8 @@ "diesPerPackage": 2, "bitWidthPerChannel": 16, "ranksPerChannel": 1, - "speedMbps": 7500 + "speedMbps": 7500, + "lp5x": true } }, { @@ -117,7 +118,8 @@ "diesPerPackage": 4, "bitWidthPerChannel": 16, "ranksPerChannel": 2, - "speedMbps": 7500 + "speedMbps": 7500, + "lp5x": true } } ] diff --git a/spd/lp5/platforms_manifest.generated.txt b/spd/lp5/platforms_manifest.generated.txt index b3b574e02df4..b971e66491a0 100644 --- a/spd/lp5/platforms_manifest.generated.txt +++ b/spd/lp5/platforms_manifest.generated.txt @@ -3,4 +3,4 @@ MTL,set-0 ADL,set-0 -SBR,set-1 +MDN,set-1 diff --git a/spd/lp5/set-1/spd-7.hex b/spd/lp5/set-1/spd-7.hex index a38dbbd4e96e..8b18d495d6da 100644 --- a/spd/lp5/set-1/spd-7.hex +++ b/spd/lp5/set-1/spd-7.hex @@ -1,4 +1,4 @@ -23 11 13 0E 86 21 95 18 00 40 00 00 02 02 00 00 +23 11 15 0E 86 21 95 18 00 40 00 00 02 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 diff --git a/spd/lp5/set-1/spd-8.hex b/spd/lp5/set-1/spd-8.hex index e08c69559d1a..0602fefe62be 100644 --- a/spd/lp5/set-1/spd-8.hex +++ b/spd/lp5/set-1/spd-8.hex @@ -1,4 +1,4 @@ -23 11 13 0E 86 21 B5 18 00 40 00 00 0A 02 00 00 +23 11 15 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 diff --git a/util/spd_tools/README.md b/util/spd_tools/README.md index 6f09f562ebdf..54a38e6bc71b 100644 --- a/util/spd_tools/README.md +++ b/util/spd_tools/README.md @@ -8,9 +8,9 @@ The memory technologies currently supported are: * LPDDR4x - based on the JESD209-4C spec and Intel recommendations (docs #616599, #610202, #634730). * DDR4 - based on the JESD79-4C and Jedec 4.1.2.L-5 R29 v103 specs. -* LPDDR5 - based on the LPDDR5 spec JESD209-5B, the SPD spec SPD4.1.2.M-2 (the - LPDDR3/4 spec is used since JEDEC has not released an SPD spec for LPDDR5), - and Intel recommendations in advisory #616599. +* LPDDR5/5X - based on the LPDDR5 spec JESD209-5B, the SPD spec SPD4.1.2.M-2 + (the LPDDR3/4 spec is used since JEDEC has not released an SPD spec for + LPDDR5), and Intel recommendations in advisory #616599. There are two tools provided to assist with generating SPDs and Makefiles to integrate into the coreboot build. These tools can also be used to allocate DRAM @@ -317,6 +317,9 @@ string like "9 10 11 12 14". #### Optional +* `lp5x`: If this is an LP5X part. SPD format is identical for LP5/5X aside + from the memory type byte. + * `trfcabNs`: Minimum Refresh Recovery Delay Time (tRFCab) for all banks in nanoseconds. As per JESD209-5B, this is dependent on the density per die. Default values used: diff --git a/util/spd_tools/src/spd_gen/lp5.go b/util/spd_tools/src/spd_gen/lp5.go index 2adaafd74fa5..e4655cee73d3 100644 --- a/util/spd_tools/src/spd_gen/lp5.go +++ b/util/spd_tools/src/spd_gen/lp5.go @@ -25,6 +25,8 @@ type LP5MemAttributes struct { * All the following parameters are optional and required only if the part requires * special parameters as per the datasheet. */ + LP5X bool + /* Timing parameters */ TRFCABNs int TRFCPBNs int @@ -70,6 +72,7 @@ type LP5Set struct { otherOptionalFeatures byte busWidthEncoding byte speedToTCKMinPs map[int]int + lp5xOverrideType byte } /* ------------------------------------------------------------------------------------------ */ @@ -128,8 +131,10 @@ const ( /* * As per advisory #616599, ADL MRC expects LPDDR5 memory type = 0x13. + * From JEDEC spec, LPDDR5X memory type = 0x15. */ - LP5SPDValueMemoryType = 0x13 + LP5SPDValueMemoryType = 0x13 + LP5XSPDValueMemoryType = 0x15 /* * From JEDEC spec: @@ -209,6 +214,12 @@ var LP5SetInfo = map[int]LP5Set{ 6400 : 1250, /* 1 / (6400 / 2 / 4) */ 5500 : 1455, /* 1 / (5500 / 2 / 4) */ }, + + /* + * Intel FSP code doesn't distinguish between LP5/5X, existing + * SPDs have been using 0x13 for both types. + */ + lp5xOverrideType: LP5SPDValueMemoryType, }, 1: { SPDRevision: LP5SPDValueRevision1_1, @@ -234,6 +245,8 @@ var LP5SetInfo = map[int]LP5Set{ * Set to 0x02. */ busWidthEncoding: 0x02, + + lp5xOverrideType: LP5XSPDValueMemoryType, }, } @@ -386,7 +399,7 @@ var LP5SpeedMbpsToSPDEncoding = map[int]LP5SpeedParams{ var LP5SPDAttribTable = map[int]LP5SPDAttribTableEntry{ LP5SPDIndexSize: {constVal: LP5SPDValueSize}, LP5SPDIndexRevision: {getVal: LP5EncodeSPDRevision}, - LP5SPDIndexMemoryType: {constVal: LP5SPDValueMemoryType}, + LP5SPDIndexMemoryType: {getVal: LP5EncodeMemoryType}, LP5SPDIndexModuleType: {constVal: LP5SPDValueModuleType}, LP5SPDIndexDensityBanks: {getVal: LP5EncodeDensityBanks}, LP5SPDIndexAddressing: {getVal: LP5EncodeSdramAddressing}, @@ -459,6 +472,17 @@ func LP5GetBankGroups(memAttribs *LP5MemAttributes) int { return LP5BankArchToSPDEncoding[LP5GetBankArch(memAttribs)].BankGroups } +func LP5EncodeMemoryType(memAttribs *LP5MemAttributes) byte { + var b byte = LP5SPDValueMemoryType + + if memAttribs.LP5X { + if f, ok := LP5SetInfo[LP5CurrSet]; ok { + b = f.lp5xOverrideType + } + } + return b +} + func LP5EncodeDensityBanks(memAttribs *LP5MemAttributes) byte { var b byte |