From 66a98ee9675d73dc4e5343782d42f80a09c2425e Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Sun, 13 Mar 2016 13:02:16 +0100 Subject: device/dram/ddr3: fix debug output Add missing punctuation and align output. No functionality is changed. Old logging output: Revision: 11 Type : b Key : 2 Banks : 8 Capacity: 4 Gb Supported voltages: 1.5V SDRAM width : 8 Bus extension : 0 bits Bus width : 64 Optional features : DLL-Off_mode RZQ/7 RZQ/6 Thermal features : ASR ext_temp_range Thermal sensor : no Standard SDRAM : yes DIMM Rank1 Address bits mirrored!!! DIMM Reference card B DIMM Manufacturer ID cd04 DIMM Part number F3-1866C9-8GSR XMP Profile 1 Max DIMMs per channel: 4 XMP Revision: 1.3 Requested voltage: 1500 mV New logging output: Revision : 11 Type : b Key : 2 Banks : 8 Capacity : 4 Gb Supported voltages : 1.5V SDRAM width : 8 Bus extension : 0 bits Bus width : 64 Optional features : DLL-Off_mode RZQ/7 RZQ/6 Thermal features : ASR ext_temp_range Thermal sensor : no Standard SDRAM : yes Rank1 Address bits : mirrored DIMM Reference card: B Manufacturer ID : cd04 Part number : F3-1866C9-8GSR XMP Profile : 1 Max DIMMs/channel : 4 XMP Revision : 1.3 Requested voltage : 1500 mV Change-Id: Iee4d7a7c0e1070706fb60d7316fad49813963b51 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/14083 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- src/device/dram/ddr3.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/device/dram/ddr3.c b/src/device/dram/ddr3.c index b5658efede..cb5b685d10 100644 --- a/src/device/dram/ddr3.c +++ b/src/device/dram/ddr3.c @@ -137,9 +137,9 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_CRC_ERROR; }; - printram(" Revision: %x\n", spd[1]); - printram(" Type : %x\n", spd[2]); - printram(" Key : %x\n", spd[3]); + printram(" Revision : %x\n", spd[1]); + printram(" Type : %x\n", spd[2]); + printram(" Key : %x\n", spd[3]); reg8 = spd[4]; /* Number of memory banks */ @@ -149,7 +149,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_INVALID_FIELD; } param = 1 << (val + 3); - printram(" Banks : %u\n", param); + printram(" Banks : %u\n", param); /* SDRAM capacity */ capacity_shift = reg8 & 0x0f; if (capacity_shift > 0x06) { @@ -157,9 +157,9 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_INVALID_FIELD; } if (capacity_shift < 0x02) { - printram(" Capacity: %u Mb\n", 256 << capacity_shift); + printram(" Capacity : %u Mb\n", 256 << capacity_shift); } else { - printram(" Capacity: %u Gb\n", 1 << (capacity_shift - 2)); + printram(" Capacity : %u Gb\n", 1 << (capacity_shift - 2)); } reg8 = spd[5]; @@ -180,7 +180,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) /* Module nominal voltage */ reg8 = spd[6]; - printram(" Supported voltages:"); + printram(" Supported voltages :"); if (reg8 & (1 << 2)) { dimm->flags.operable_1_25V = 1; dimm->voltage = 1250; @@ -214,7 +214,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_INVALID_FIELD; } dimm->width = (4 << val); - printram(" SDRAM width : %u\n", dimm->width); + printram(" SDRAM width : %u\n", dimm->width); /* Memory bus width */ reg8 = spd[8]; @@ -225,7 +225,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_INVALID_FIELD; } dimm->flags.is_ecc = val ? 1 : 0; - printram(" Bus extension : %u bits\n", val ? 8 : 0); + printram(" Bus extension : %u bits\n", val ? 8 : 0); /* Bus width */ val = reg8 & 0x07; if (val > 3) { @@ -233,7 +233,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) ret = SPD_STATUS_INVALID_FIELD; } bus_width = 8 << val; - printram(" Bus width : %u\n", bus_width); + printram(" Bus width : %u\n", bus_width); /* We have all the info we need to compute the dimm size */ /* Capacity is 256Mbit multiplied by the power of 2 specified in @@ -282,7 +282,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) /* SDRAM Optional Features */ reg8 = spd[30]; - printram(" Optional features :"); + printram(" Optional features :"); if (reg8 & 0x80) { dimm->flags.dll_off_mode = 1; printram(" DLL-Off_mode"); @@ -299,7 +299,7 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) /* SDRAM Thermal and Refresh Options */ reg8 = spd[31]; - printram(" Thermal features :"); + printram(" Thermal features :"); if (reg8 & 0x80) { dimm->flags.pasr = 1; printram(" PASR"); @@ -326,27 +326,28 @@ int spd_decode_ddr3(dimm_attr * dimm, spd_raw_data spd) reg8 = spd[32]; if (reg8 & 0x80) dimm->flags.therm_sensor = 1; - printram(" Thermal sensor : %s\n", + printram(" Thermal sensor : %s\n", dimm->flags.therm_sensor ? "yes" : "no"); /* SDRAM Device Type */ reg8 = spd[33]; - printram(" Standard SDRAM : %s\n", (reg8 & 0x80) ? "no" : "yes"); + printram(" Standard SDRAM : %s\n", (reg8 & 0x80) ? "no" : "yes"); if (spd[63] & 0x01) { dimm->flags.pins_mirrored = 1; - printram(" DIMM Rank1 Address bits mirrored!!!\n"); } + printram(" Rank1 Address bits : %s\n", + (spd[63] & 0x01) ? "mirrored" : "normal"); dimm->reference_card = spd[62] & 0x1f; - printram(" DIMM Reference card %c\n", 'A' + dimm->reference_card); + printram(" DIMM Reference card: %c\n", 'A' + dimm->reference_card); dimm->manufacturer_id = (spd[118] << 8) | spd[117]; - printram(" DIMM Manufacturer ID %x\n", dimm->manufacturer_id); + printram(" Manufacturer ID : %x\n", dimm->manufacturer_id); dimm->part_number[16] = 0; memcpy(dimm->part_number, &spd[128], 16); - printram(" DIMM Part number %s\n", dimm->part_number); + printram(" Part number : %s\n", dimm->part_number); return ret; } @@ -397,7 +398,8 @@ int spd_xmp_decode_ddr3(dimm_attr *dimm, dimm->dram_type = SPD_MEMORY_TYPE_UNDEFINED; return SPD_STATUS_INVALID; } - printram(" XMP Profile 1\n"); + + printram(" XMP Profile : 1\n"); xmp = &spd[185]; /* Medium Timebase = @@ -412,7 +414,7 @@ int spd_xmp_decode_ddr3(dimm_attr *dimm, dimm->dram_type = SPD_MEMORY_TYPE_UNDEFINED; return SPD_STATUS_INVALID; } - printram(" XMP Profile 2\n"); + printram(" XMP Profile : 2\n"); xmp = &spd[220]; /* Medium Timebase = @@ -422,16 +424,18 @@ int spd_xmp_decode_ddr3(dimm_attr *dimm, dimm->dimms_per_channel = ((spd[178] >> 4) & 0x3) + 1; } - printram(" Max DIMMs per channel: %u\n", + + printram(" Max DIMMs/channel : %u\n", dimm->dimms_per_channel); - printram(" XMP Revision: %u.%u\n", spd[179] >> 4, spd[179] & 0xf); + printram(" XMP Revision : %u.%u\n", spd[179] >> 4, spd[179] & 0xf); /* calculate voltage in mV */ dimm->voltage = (xmp[0] & 1) * 50; dimm->voltage += ((xmp[0] >> 1) & 0xf) * 100; dimm->voltage += ((xmp[0] >> 5) & 0x3) * 1000; - printram(" Requested voltage: %u mV\n", dimm->voltage); + + printram(" Requested voltage : %u mV\n", dimm->voltage); /* SDRAM Minimum Cycle Time (tCKmin) */ dimm->tCK = xmp[1] * mtb; -- cgit v1.2.3