mirror of
https://github.com/memtest86plus/memtest86plus.git
synced 2025-02-25 18:55:23 -06:00
New code base for SMBUS / SPD access (#2) - WIP
This commit is contained in:
Sam DEMEULEMEESTER
Sam Demeulemeester
parent
de55c0428c
commit
f9690813ca
2648
system/jedec_id.h
2648
system/jedec_id.h
File diff suppressed because it is too large
Load Diff
630
system/smbus.c
630
system/smbus.c
@ -9,98 +9,374 @@
|
|||||||
#include "pci.h"
|
#include "pci.h"
|
||||||
#include "unistd.h"
|
#include "unistd.h"
|
||||||
|
|
||||||
|
#include "smbus.h"
|
||||||
#include "jedec_id.h"
|
#include "jedec_id.h"
|
||||||
|
|
||||||
#define LINE_SPD 12
|
#define LINE_SPD 13
|
||||||
#define MAX_SPD_SLOT 8
|
#define MAX_SPD_SLOT 8
|
||||||
|
|
||||||
#define SMBHSTSTS smbusbase
|
|
||||||
#define SMBHSTCNT smbusbase + 2
|
|
||||||
#define SMBHSTCMD smbusbase + 3
|
|
||||||
#define SMBHSTADD smbusbase + 4
|
|
||||||
#define SMBHSTDAT smbusbase + 5
|
|
||||||
|
|
||||||
int smbdev, smbfun;
|
int smbdev, smbfun;
|
||||||
unsigned short smbusbase;
|
unsigned short smbusbase;
|
||||||
|
|
||||||
unsigned char spd_raw[256];
|
static bool isPage1 = false;
|
||||||
|
|
||||||
static void ich5_get_smb(void)
|
static spd_info parse_spd_ddr3(uint8_t smb_idx, uint8_t slot_idx);
|
||||||
{
|
static spd_info parse_spd_ddr4(uint8_t smb_idx, uint8_t slot_idx);
|
||||||
unsigned long x;
|
static void print_spdi(spd_info spdi, uint8_t lidx);
|
||||||
|
|
||||||
x = pci_config_read16(0, smbdev, smbfun, 0x20);
|
static int find_smb_controller(void);
|
||||||
smbusbase = (unsigned short) x & 0xFFFE;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned char ich5_smb_read_byte(unsigned char adr, unsigned char cmd)
|
static uint8_t ich5_process(void);
|
||||||
{
|
static void ich5_get_smb(uint8_t idx);
|
||||||
uint32_t t = 0;
|
static uint8_t ich5_read_spd_byte(uint8_t adr, uint16_t cmd);
|
||||||
|
|
||||||
__outb(0x1f, SMBHSTSTS); // reset SMBus Controller
|
static const struct pci_smbus_controller smbcontrollers[] = {
|
||||||
__outb(0xff, SMBHSTDAT);
|
{0x8086, 0x24C3, "82801DB (ICH4)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR | HAS_DDR2},
|
||||||
while(__inb(SMBHSTSTS) & 0x01); // wait until ready
|
{0x8086, 0x24D3, "82801E (ICH5)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR | HAS_DDR2},
|
||||||
__outb(cmd, SMBHSTCMD);
|
{0x8086, 0x25A4, "6300ESB ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR | HAS_DDR2},
|
||||||
__outb((adr << 1) | 0x01, SMBHSTADD);
|
{0x8086, 0x266A, "82801F (ICH6)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR | HAS_DDR2},
|
||||||
__outb(0x48, SMBHSTCNT);
|
{0x8086, 0x269B, "6310ESB/6320ESB", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2},
|
||||||
|
{0x8086, 0x27DA, "82801G (ICH7)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2},
|
||||||
while (!(__inb(SMBHSTSTS) & 0x02)) { // wait til command finished
|
{0x8086, 0x283E, "82801H (ICH8)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2},
|
||||||
usleep(1);
|
{0x8086, 0x2930, "82801I (ICH9)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2},
|
||||||
t++;
|
{0x8086, 0x5032, "EP80579 (Tolapai)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2},
|
||||||
if (t > 10000) break; // break after 10ms
|
{0x8086, 0x3A30, "ICH10 ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2 | HAS_DDR3},
|
||||||
}
|
{0x8086, 0x3A60, "ICH10 ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2 | HAS_DDR3},
|
||||||
return __inb(SMBHSTDAT);
|
{0x8086, 0x3B30, "5/3400 Series (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR2 | HAS_DDR3},
|
||||||
}
|
{0x8086, 0x1C22, "6 Series (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
|
{0x8086, 0x1D22, "Patsburg (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
static int ich5_read_spd(int dimmadr)
|
{0x8086, 0x1D70, "Patsburg (PCH) IDF", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
{
|
{0x8086, 0x1D71, "Patsburg (PCH) IDF", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
int x;
|
{0x8086, 0x1D72, "Patsburg (PCH) IDF", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
spd_raw[0] = ich5_smb_read_byte(0x50 + dimmadr, 0);
|
{0x8086, 0x2330, "DH89xxCC (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
if (spd_raw[0] == 0xff) return -1; // no spd here
|
{0x8086, 0x1E22, "Panther Point (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
for (x = 1; x < 256; x++) {
|
{0x8086, 0x8C22, "Lynx Point (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
spd_raw[x] = ich5_smb_read_byte(0x50 + dimmadr, (unsigned char) x);
|
{0x8086, 0x9C22, "Lynx Point-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
}
|
{0x8086, 0x1F3C, "Avoton (SOC) ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
return 0;
|
{0x8086, 0x8D22, "Wellsburg (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
}
|
{0x8086, 0x8D7D, "Wellsburg (PCH) MS", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
|
{0x8086, 0x8D7E, "Wellsburg (PCH) MS", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
struct pci_smbus_controller {
|
{0x8086, 0x8D7F, "Wellsburg (PCH) MS", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
unsigned vendor;
|
{0x8086, 0x23B0, "Coleto Creek (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
unsigned device;
|
{0x8086, 0x8CA2, "Wildcat Point (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
char *name;
|
{0x8086, 0x9CA2, "Wildcat Point-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
void (*get_adr)(void);
|
{0x8086, 0x0F12, "BayTrail (SOC)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
int (*read_spd)(int dimmadr);
|
{0x8086, 0x2292, "Braswell (SOC)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3},
|
||||||
};
|
{0x8086, 0xA123, "Sunrise Point-H (PCH) ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3 | HAS_DDR4},
|
||||||
|
{0x8086, 0x9D23, "Sunrise Point-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR3 | HAS_DDR4},
|
||||||
static struct pci_smbus_controller smbcontrollers[] =
|
{0x8086, 0x19DF, "Denverton (SOC) ", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{
|
{0x8086, 0x1BC9, "Emmitsburg (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4 | HAS_DDR5},
|
||||||
// Intel SMBUS (DUMMY)
|
{0x8086, 0xA1A3, "Lewisburg (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x9C22, "Intel HSW-ULT", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0xA223, "Lewisburg Super (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x8C22, "Intel HSW", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0xA2A3, "Kaby Lake (PCH-H)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x1E22, "Intel Z77", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x31D4, "Gemini Lake (SOC)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x1C22, "Intel P67", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0xA323, "Cannon Lake-H (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x3B30, "Intel P55", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x9DA3, "Cannon Lake-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x3A60, "Intel ICH10B", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x18DF, "Cedar Fork (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x3A30, "Intel ICH10R", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x34A3, "Ice Lake-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x2930, "Intel ICH9", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x38A3, "Ice Lake-N (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x283E, "Intel ICH8", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x02A3, "Comet Lake (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x27DA, "Intel ICH7", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x06A3, "Comet Lake-H (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x266A, "Intel ICH6", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x4B23, "Elkhart Lake (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x24D3, "Intel ICH5", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0xA0A3, "Tiger Lake-LP (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x24C3, "Intel ICH4", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x43A3, "Tiger Lake-H (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0x34A3, "Intel ICL", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x4DA3, "Jasper Lake (SOC)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0xA323, "Intel CNL", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0xA3A3, "Comet Lake-V (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4},
|
||||||
{0x8086, 0xA2A3, "Intel CNL", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x7AA3, "Alder Lake-S (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4 | HAS_DDR5},
|
||||||
{0x8086, 0x9DA3, "Intel CNL", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x51A3, "Alder Lake-P (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4 | HAS_DDR5},
|
||||||
{0x8086, 0x9CA2, "Intel BDW", ich5_get_smb, ich5_read_spd},
|
{0x8086, 0x54A3, "Alder Lake-M (PCH)", ich5_get_smb, ich5_read_spd_byte, HAS_DDR4 | HAS_DDR5},
|
||||||
{0x8086, 0x25A4, "Intel 6300ESB", ich5_get_smb, ich5_read_spd},
|
|
||||||
{0x8086, 0x269B, "Intel ESB2", ich5_get_smb, ich5_read_spd},
|
|
||||||
{0x8086, 0x5032, "Intel EP80579", ich5_get_smb, ich5_read_spd},
|
|
||||||
|
|
||||||
// AMD SMBUS
|
// AMD SMBUS
|
||||||
{0, 0, "", NULL, NULL}
|
{0, 0, "", NULL, NULL, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
int find_smb_controller(void)
|
|
||||||
|
void print_smbus_startup_info(void) {
|
||||||
|
|
||||||
|
int8_t index;
|
||||||
|
uint8_t spdidx = 0, spd_line_idx = 0;
|
||||||
|
|
||||||
|
spd_info curspd;
|
||||||
|
|
||||||
|
index = find_smb_controller();
|
||||||
|
|
||||||
|
if (index == -1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
smbcontrollers[index].get_adr(index);
|
||||||
|
|
||||||
|
for (spdidx = 0; spdidx < MAX_SPD_SLOT; spdidx++) {
|
||||||
|
|
||||||
|
if (get_spd(index, spdidx, 0) != 0xFF) {
|
||||||
|
|
||||||
|
switch(get_spd(index, spdidx, 2))
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
continue;
|
||||||
|
case 0x0C: // DDR4
|
||||||
|
curspd = parse_spd_ddr4(index, spdidx);
|
||||||
|
break;
|
||||||
|
case 0x0B: // DDR3
|
||||||
|
curspd = parse_spd_ddr3(index, spdidx);
|
||||||
|
break;
|
||||||
|
case 0x08: // DDR2
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(curspd.isValid) {
|
||||||
|
|
||||||
|
if(spd_line_idx == 0) {
|
||||||
|
prints(LINE_SPD-2, 0, "Memory SPD Informations");
|
||||||
|
prints(LINE_SPD-1, 0, "-----------------------");
|
||||||
|
}
|
||||||
|
|
||||||
|
print_spdi(curspd, spd_line_idx);
|
||||||
|
spd_line_idx++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void print_spdi(spd_info spdi, uint8_t lidx)
|
||||||
|
{
|
||||||
|
uint8_t curcol;
|
||||||
|
uint16_t i;
|
||||||
|
|
||||||
|
// Print Slot Index, Module Size, type & Max frequency (Jedec or XMP)
|
||||||
|
curcol = printf(LINE_SPD+lidx, 0, " - Slot %i : %kB %s-%i",
|
||||||
|
spdi.slot_num,
|
||||||
|
spdi.module_size,
|
||||||
|
spdi.type,
|
||||||
|
spdi.freq);
|
||||||
|
|
||||||
|
// Print ECC status
|
||||||
|
if(spdi.hasECC) {
|
||||||
|
curcol = prints(LINE_SPD+lidx, curcol, " ECC");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print Manufacturer from JEDEC106
|
||||||
|
for (i = 0; i < JEP106_CNT ; i++) {
|
||||||
|
|
||||||
|
if (spdi.jedec_code == jep106[i].jedec_code) {
|
||||||
|
curcol = printf(LINE_SPD+lidx, curcol, " - %s ", jep106[i].name);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If not present in JEDEC106, display raw JEDEC ID
|
||||||
|
if(i == JEP106_CNT) {
|
||||||
|
curcol = printf(LINE_SPD+lidx, curcol, " - Unknown (0x%x) ", spdi.jedec_code);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print SKU
|
||||||
|
for(i = 0; i < spdi.sku_len; i++) {
|
||||||
|
printc(LINE_SPD+lidx, curcol++, spdi.sku[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print Manufacturing date (only if valid)
|
||||||
|
if(curcol <= 72 && spdi.fab_year > 1 && spdi.fab_year < 30 && spdi.fab_week < 55) {
|
||||||
|
curcol = printf(LINE_SPD+lidx, curcol, " (W%i'%i)", spdi.fab_week, spdi.fab_year);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Print XMP Status
|
||||||
|
if(spdi.XMP > 0) {
|
||||||
|
curcol = prints(LINE_SPD+lidx, curcol, " *XMP*");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static spd_info parse_spd_ddr4(uint8_t smb_idx, uint8_t slot_idx)
|
||||||
|
{
|
||||||
|
|
||||||
|
spd_info spdi;
|
||||||
|
|
||||||
|
uint8_t tck, bcd;
|
||||||
|
int8_t j;
|
||||||
|
|
||||||
|
spdi.type = "DDR4";
|
||||||
|
spdi.slot_num = slot_idx;
|
||||||
|
spdi.sku_len = 0;
|
||||||
|
|
||||||
|
// Compute module size with shifts
|
||||||
|
spdi.module_size = 1 << (
|
||||||
|
((get_spd(smb_idx, slot_idx, 4) & 0xF) + 15) +
|
||||||
|
((get_spd(smb_idx, slot_idx, 13) & 0x7) + 3) -
|
||||||
|
((get_spd(smb_idx, slot_idx, 12) & 0x7) + 2) +
|
||||||
|
((get_spd(smb_idx, slot_idx, 12) >> 3) & 0x7) +
|
||||||
|
((get_spd(smb_idx, slot_idx, 6) >> 4) & 0x7)
|
||||||
|
);
|
||||||
|
|
||||||
|
spdi.hasECC = (((get_spd(smb_idx, slot_idx, 13) >> 3) & 1) == 1);
|
||||||
|
|
||||||
|
tck = get_spd(smb_idx, slot_idx, 18);
|
||||||
|
|
||||||
|
if(get_spd(smb_idx, slot_idx, 384) == 0x0C && get_spd(smb_idx, slot_idx, 385) == 0x4A) {
|
||||||
|
// Max XMP
|
||||||
|
uint8_t tck_mtb = get_spd(smb_idx, slot_idx, 396);
|
||||||
|
int8_t tck_ftb = get_spd(smb_idx, slot_idx, 431);
|
||||||
|
|
||||||
|
float tckavg = 1.0f / ((tck_mtb * 0.125f) + (tck_ftb * 0.001f)) * 2.0f * 1000.0f;
|
||||||
|
|
||||||
|
spdi.freq = (tckavg+50)/100;
|
||||||
|
spdi.freq *= 100;
|
||||||
|
|
||||||
|
spdi.XMP = 2;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Max JEDEC
|
||||||
|
spdi.XMP = 0;
|
||||||
|
|
||||||
|
switch(tck) {
|
||||||
|
default:
|
||||||
|
spdi.freq = 0;
|
||||||
|
break;
|
||||||
|
case 10:
|
||||||
|
spdi.freq = 1600;
|
||||||
|
break;
|
||||||
|
case 9:
|
||||||
|
spdi.freq = 1866;
|
||||||
|
break;
|
||||||
|
case 8:
|
||||||
|
spdi.freq = 2133;
|
||||||
|
break;
|
||||||
|
case 7:
|
||||||
|
spdi.freq = 2400;
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
spdi.freq = 2666;
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
spdi.freq = 3200;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Module manufacturer
|
||||||
|
spdi.jedec_code= (get_spd(smb_idx, slot_idx, 320) & 0x1F) << 8;
|
||||||
|
spdi.jedec_code |= get_spd(smb_idx, slot_idx, 321) & 0x7F;
|
||||||
|
|
||||||
|
// Module SKU
|
||||||
|
uint8_t sku_byte;
|
||||||
|
for (j = 0; j <= 20; j++) {
|
||||||
|
sku_byte = get_spd(smb_idx, slot_idx, 329+j);
|
||||||
|
|
||||||
|
if(sku_byte <= 0x20 && j > 1 && spdi.sku[j-1] <= 0x20) {
|
||||||
|
spdi.sku_len--;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
spdi.sku[j] = sku_byte;
|
||||||
|
spdi.sku_len++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Week & Date (BCD to Int)
|
||||||
|
bcd = get_spd(smb_idx, slot_idx, 323);
|
||||||
|
spdi.fab_year = bcd - 6 * (bcd >> 4);
|
||||||
|
|
||||||
|
bcd = get_spd(smb_idx, slot_idx, 324);
|
||||||
|
spdi.fab_week = bcd - 6 * (bcd >> 4);
|
||||||
|
|
||||||
|
spdi.isValid = true;
|
||||||
|
|
||||||
|
return spdi;
|
||||||
|
}
|
||||||
|
|
||||||
|
static spd_info parse_spd_ddr3(uint8_t smb_idx, uint8_t slot_idx)
|
||||||
|
{
|
||||||
|
|
||||||
|
spd_info spdi;
|
||||||
|
|
||||||
|
uint8_t tck, bcd;
|
||||||
|
int8_t j;
|
||||||
|
|
||||||
|
spdi.type = "DDR3";
|
||||||
|
spdi.slot_num = slot_idx;
|
||||||
|
spdi.sku_len = 0;
|
||||||
|
spdi.XMP = 0;
|
||||||
|
|
||||||
|
// Compute module size with shifts
|
||||||
|
spdi.module_size = 1 << (
|
||||||
|
((get_spd(smb_idx, slot_idx, 4) & 0xF) + 15) +
|
||||||
|
((get_spd(smb_idx, slot_idx, 8) & 0x7) + 3) -
|
||||||
|
((get_spd(smb_idx, slot_idx, 7) & 0x7) + 2) +
|
||||||
|
((get_spd(smb_idx, slot_idx, 7) >> 3) & 0x7)
|
||||||
|
);
|
||||||
|
|
||||||
|
spdi.hasECC = (((get_spd(smb_idx, slot_idx, 8) >> 3) & 1) == 1);
|
||||||
|
|
||||||
|
tck = get_spd(smb_idx, slot_idx, 12);
|
||||||
|
|
||||||
|
if(get_spd(smb_idx, slot_idx, 176) == 0x0C && get_spd(smb_idx, slot_idx, 177) == 0x4A) {
|
||||||
|
tck = get_spd(smb_idx, slot_idx, 186);
|
||||||
|
spdi.XMP = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Module jedec speed
|
||||||
|
switch(tck) {
|
||||||
|
default:
|
||||||
|
spdi.freq = 0;
|
||||||
|
break;
|
||||||
|
case 20:
|
||||||
|
spdi.freq = 800;
|
||||||
|
break;
|
||||||
|
case 15:
|
||||||
|
spdi.freq = 1066;
|
||||||
|
break;
|
||||||
|
case 12:
|
||||||
|
spdi.freq = 1333;
|
||||||
|
break;
|
||||||
|
case 10:
|
||||||
|
spdi.freq = 1600;
|
||||||
|
break;
|
||||||
|
case 9:
|
||||||
|
spdi.freq = 1866;
|
||||||
|
break;
|
||||||
|
case 8:
|
||||||
|
spdi.freq = 2133;
|
||||||
|
break;
|
||||||
|
case 7:
|
||||||
|
spdi.freq = 2400;
|
||||||
|
break;
|
||||||
|
case 6:
|
||||||
|
spdi.freq = 2666;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Module manufacturer
|
||||||
|
spdi.jedec_code= (get_spd(smb_idx, slot_idx, 117) & 0x1F) << 8;
|
||||||
|
spdi.jedec_code |= get_spd(smb_idx, slot_idx, 118) & 0x7F;
|
||||||
|
|
||||||
|
// Module SKU
|
||||||
|
uint8_t sku_byte;
|
||||||
|
for (j = 0; j <= 20; j++) {
|
||||||
|
sku_byte = get_spd(smb_idx, slot_idx, 128+j);
|
||||||
|
|
||||||
|
if(sku_byte <= 0x20 && j > 0 && spdi.sku[j-1] <= 0x20) {
|
||||||
|
spdi.sku_len--;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
spdi.sku[j] = sku_byte;
|
||||||
|
spdi.sku_len++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bcd = get_spd(smb_idx, slot_idx, 120);
|
||||||
|
spdi.fab_year = bcd - 6 * (bcd >> 4);
|
||||||
|
|
||||||
|
bcd = get_spd(smb_idx, slot_idx, 121);
|
||||||
|
spdi.fab_week = bcd - 6 * (bcd >> 4);
|
||||||
|
|
||||||
|
spdi.isValid = true;
|
||||||
|
|
||||||
|
return spdi;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --------------------------
|
||||||
|
// Smbus Controller Functions
|
||||||
|
// --------------------------
|
||||||
|
|
||||||
|
static int find_smb_controller(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
unsigned long valuev, valued;
|
unsigned long valuev, valued;
|
||||||
@ -108,10 +384,10 @@ int find_smb_controller(void)
|
|||||||
for (smbdev = 0; smbdev < 32; smbdev++) {
|
for (smbdev = 0; smbdev < 32; smbdev++) {
|
||||||
for (smbfun = 0; smbfun < 8; smbfun++) {
|
for (smbfun = 0; smbfun < 8; smbfun++) {
|
||||||
valuev = pci_config_read16(0, smbdev, smbfun, 0);
|
valuev = pci_config_read16(0, smbdev, smbfun, 0);
|
||||||
if (valuev != 0xFFFF) { // if there is something look what's it..
|
if (valuev != 0xFFFF) {
|
||||||
for (i = 0; smbcontrollers[i].vendor > 0; i++) { // check if this is a known smbus controller
|
for (i = 0; smbcontrollers[i].vendor > 0; i++) {
|
||||||
if (valuev == smbcontrollers[i].vendor) {
|
if (valuev == smbcontrollers[i].vendor) {
|
||||||
valued = pci_config_read16(0, smbdev, smbfun, 2); // read the device id
|
valued = pci_config_read16(0, smbdev, smbfun, 2);
|
||||||
if (valued == smbcontrollers[i].device) {
|
if (valued == smbcontrollers[i].device) {
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
@ -124,143 +400,109 @@ int find_smb_controller(void)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void parse_spd_ddr4(uint8_t idx)
|
// ------------------
|
||||||
|
// i801 / ICH5 Access
|
||||||
|
// ------------------
|
||||||
|
|
||||||
|
static void ich5_get_smb(uint8_t idx)
|
||||||
{
|
{
|
||||||
//prints(LINE_SPD+idx, 0, "DDR4");
|
unsigned long x;
|
||||||
|
|
||||||
|
x = pci_config_read16(0, smbdev, smbfun, 0x20);
|
||||||
|
smbusbase = (unsigned short) x & 0xFFF0;
|
||||||
|
|
||||||
|
// Enable I2C Bus
|
||||||
|
uint8_t temp = pci_config_read8(0, smbdev, smbfun, 0x40);
|
||||||
|
if((temp & 4) == 0) {
|
||||||
|
pci_config_write8(0, smbdev, smbfun, 0x40, temp | 0x04);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset SMBUS Controller
|
||||||
|
__outb(__inb(SMBHSTSTS) & 0x1F, SMBHSTSTS);
|
||||||
|
usleep(1000);
|
||||||
|
|
||||||
|
// Reset DDR4 Page because BIOS might pass control with Page1 set
|
||||||
|
if(smbcontrollers[idx].cap & HAS_DDR4) {
|
||||||
|
__outb((0x36 << 1) | 0x00, SMBHSTADD);
|
||||||
|
__outb(SMBHSTCNT_BYTE_DATA, SMBHSTCNT);
|
||||||
|
|
||||||
|
ich5_process();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void parse_spd_ddr3(uint8_t idx)
|
static uint8_t ich5_read_spd_byte(uint8_t smbus_adr, uint16_t spd_adr)
|
||||||
{
|
{
|
||||||
uint8_t curcol = 0;
|
|
||||||
uint32_t module_size;
|
|
||||||
uint8_t tck;
|
|
||||||
|
|
||||||
uint8_t i,h;
|
smbus_adr += 0x50;
|
||||||
|
|
||||||
if(spd_raw[2] == 0x0B){
|
// Switch page if needed (DDR4)
|
||||||
|
if (spd_adr > 0xFF && !isPage1) {
|
||||||
|
|
||||||
// First print slot#, module capacity
|
__outb((0x37 << 1) | 0x00, SMBHSTADD);
|
||||||
curcol = prints(LINE_SPD+idx, curcol, " - Slot :");
|
__outb(SMBHSTCNT_BYTE_DATA, SMBHSTCNT);
|
||||||
printu(LINE_SPD+idx, curcol-3, idx+1, 1, false, false);
|
|
||||||
|
|
||||||
// module_size = 1 << (sdram_capacity + 15) << (prim_bus_width + 3) >> (sdram_width + 2) << ranks;
|
ich5_process(); // return should 0x42 or 0x44
|
||||||
module_size = 1 << ((spd_raw[4] & 0xF) + 15) << ((spd_raw[8] & 0x7) + 3) >> ((spd_raw[7] & 0x7) + 2) << (spd_raw[7] >> 3);
|
|
||||||
curcol = printf(LINE_SPD+idx, curcol+1, "%kB", module_size) + 1;
|
|
||||||
|
|
||||||
// If XMP is supported, check Tck in XMP reg
|
isPage1 = true;
|
||||||
if(spd_raw[176] == 0x0C && spd_raw[177] == 0x4A && spd_raw[12])
|
|
||||||
{
|
|
||||||
tck = spd_raw[186];
|
|
||||||
} else {
|
|
||||||
tck = spd_raw[12];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Then module jedec speed
|
} else if (spd_adr <= 0xFF && isPage1) {
|
||||||
switch(tck)
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-????");
|
|
||||||
break;
|
|
||||||
case 20:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-800");
|
|
||||||
break;
|
|
||||||
case 15:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-1066");
|
|
||||||
break;
|
|
||||||
case 12:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-1333");
|
|
||||||
break;
|
|
||||||
case 10:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-1600");
|
|
||||||
break;
|
|
||||||
case 9:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-1866");
|
|
||||||
break;
|
|
||||||
case 8:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-2133");
|
|
||||||
break;
|
|
||||||
case 7:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-2400");
|
|
||||||
break;
|
|
||||||
case 6:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-2533");
|
|
||||||
break;
|
|
||||||
case 5:
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, "DDR3-2666");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if((spd_raw[8] >> 3) == 1) { curcol = prints(LINE_SPD+idx, curcol+1, "ECC"); }
|
__outb((0x36 << 1) | 0x00, SMBHSTADD);
|
||||||
|
__outb(SMBHSTCNT_BYTE_DATA, SMBHSTCNT);
|
||||||
|
|
||||||
// Then print module infos (manufacturer & part number)
|
ich5_process();
|
||||||
spd_raw[117] &= 0x0F; // Parity odd or even
|
|
||||||
for (i = 0; jep106[i].cont_code < 9; i++) {
|
|
||||||
if (spd_raw[117] == jep106[i].cont_code && spd_raw[118] == jep106[i].hex_byte) {
|
|
||||||
// We are here if a Jedec manufacturer is detected
|
|
||||||
curcol = prints(LINE_SPD+idx, curcol, " - ");
|
|
||||||
prints(LINE_SPD+idx, curcol, jep106[i].name);
|
|
||||||
|
|
||||||
// Display module serial number
|
isPage1 = false;
|
||||||
for (h = 128; h < 146; h++) {
|
}
|
||||||
curcol = printc(LINE_SPD+idx, curcol, spd_raw[h]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Detect Week and Year of Manufacturing (Think to upgrade after 2030 !!!)
|
if (spd_adr > 0xFF) {
|
||||||
if(curcol <= 72 && spd_raw[120] > 1 && spd_raw[120] < 30 && spd_raw[121] < 55)
|
spd_adr -= 0x100;
|
||||||
{
|
}
|
||||||
curcol = prints(LINE_SPD+idx, curcol+1, "(W");
|
|
||||||
curcol = printi(LINE_SPD+idx, curcol, spd_raw[121], 2, false, false);
|
|
||||||
curcol = printc(LINE_SPD+idx, curcol, '\'');
|
|
||||||
curcol = printi(LINE_SPD+idx, curcol, spd_raw[120], 2, false, false);
|
|
||||||
curcol = printc(LINE_SPD+idx, curcol, ')');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Detect XMP Memory
|
__outb((smbus_adr << 1) | 0x01, SMBHSTADD);
|
||||||
if(spd_raw[176] == 0x0C && spd_raw[177] == 0x4A)
|
__outb(spd_adr, SMBHSTCMD);
|
||||||
{
|
__outb(SMBHSTCNT_BYTE_DATA, SMBHSTCNT);
|
||||||
prints(LINE_SPD+idx, curcol+1, "*XMP*");
|
|
||||||
}
|
if (ich5_process() == 0) {
|
||||||
}
|
return __inb(SMBHSTDAT0);
|
||||||
}
|
} else {
|
||||||
|
return 0xFF;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void print_smbus_startup_info(void) {
|
static uint8_t ich5_process(void)
|
||||||
|
{
|
||||||
|
uint8_t status;
|
||||||
|
uint16_t timeout = 0;
|
||||||
|
|
||||||
int8_t index;
|
status = __inb(SMBHSTSTS) & 0x1F;
|
||||||
uint8_t spdidx = 0, spd_line_idx = 0;
|
|
||||||
|
|
||||||
index = find_smb_controller();
|
if (status != 0x00) {
|
||||||
|
__outb(status, SMBHSTSTS);
|
||||||
if (index == -1)
|
usleep(500);
|
||||||
{
|
if ((status = (0x1F & __inb(SMBHSTSTS))) != 0x00) {
|
||||||
return;
|
return 1;
|
||||||
}
|
|
||||||
|
|
||||||
smbcontrollers[index].get_adr();
|
|
||||||
|
|
||||||
for (spdidx = 0; spdidx < MAX_SPD_SLOT; spdidx++) {
|
|
||||||
if (smbcontrollers[index].read_spd(spdidx) == 0) {
|
|
||||||
switch(spd_raw[2])
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
continue;
|
|
||||||
case 0x0C: // DDR4
|
|
||||||
parse_spd_ddr4(spd_line_idx++);
|
|
||||||
break;
|
|
||||||
case 0x0B: // DDR3
|
|
||||||
parse_spd_ddr3(spd_line_idx++);
|
|
||||||
break;
|
|
||||||
case 0x08: // DDR2
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(spdidx) {
|
__outb(__inb(SMBHSTCNT) | SMBHSTCNT_START, SMBHSTCNT);
|
||||||
prints(LINE_SPD-2, 0, "Memory SPD Informations");
|
|
||||||
prints(LINE_SPD-1, 0, "--------------------------");
|
do {
|
||||||
|
usleep(500);
|
||||||
|
status = __inb(SMBHSTSTS);
|
||||||
|
} while ((status & 0x01) && (timeout++ < 100));
|
||||||
|
|
||||||
|
if (timeout >= 100) {
|
||||||
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (status & 0x1C) {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((__inb(SMBHSTSTS) & 0x1F) != 0x00) {
|
||||||
|
__outb(inb(SMBHSTSTS), SMBHSTSTS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1,7 +1,8 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0
|
#ifndef _SMBUS_H_
|
||||||
#ifndef SMBUS_H
|
#define _SMBUS_H_
|
||||||
#define SMBUS_H
|
|
||||||
/**
|
/**
|
||||||
|
* SPDX-License-Identifier: GPL-2.0
|
||||||
|
*
|
||||||
* \file
|
* \file
|
||||||
*
|
*
|
||||||
* Provides functions for reading SPD via SMBUS
|
* Provides functions for reading SPD via SMBUS
|
||||||
@ -9,6 +10,69 @@
|
|||||||
* Copyright (C) 2004-2022 Samuel Demeulemeester.
|
* Copyright (C) 2004-2022 Samuel Demeulemeester.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* i801 Hosts Addresses */
|
||||||
|
#define SMBHSTSTS smbusbase
|
||||||
|
#define SMBHSTCNT smbusbase + 2
|
||||||
|
#define SMBHSTCMD smbusbase + 3
|
||||||
|
#define SMBHSTADD smbusbase + 4
|
||||||
|
#define SMBHSTDAT0 smbusbase + 5
|
||||||
|
#define SMBHSTDAT1 smbusbase + 6
|
||||||
|
#define SMBBLKDAT smbusbase + 7
|
||||||
|
#define SMBPEC smbusbase + 8
|
||||||
|
#define SMBAUXSTS smbusbase + 12
|
||||||
|
#define SMBAUXCTL smbusbase + 12
|
||||||
|
|
||||||
|
/* i801 Hosts Status register bits */
|
||||||
|
#define SMBHSTSTS_BYTE_DONE 0x80
|
||||||
|
#define SMBHSTSTS_INUSE_STS 0x40
|
||||||
|
#define SMBHSTSTS_SMBALERT_STS 0x20
|
||||||
|
#define SMBHSTSTS_FAILED 0x10
|
||||||
|
#define SMBHSTSTS_BUS_ERR 0x08
|
||||||
|
#define SMBHSTSTS_DEV_ERR 0x04
|
||||||
|
#define SMBHSTSTS_INTR 0x02
|
||||||
|
#define SMBHSTSTS_HOST_BUSY 0x01
|
||||||
|
|
||||||
|
#define SMBHSTCNT_QUICK 0x00
|
||||||
|
#define SMBHSTCNT_BYTE 0x04
|
||||||
|
#define SMBHSTCNT_BYTE_DATA 0x08
|
||||||
|
#define SMBHSTCNT_WORD_DATA 0x0C
|
||||||
|
#define SMBHSTCNT_START 0x40
|
||||||
|
|
||||||
|
/* Platform Capabilities */
|
||||||
|
#define HAS_SDR (1 << 1)
|
||||||
|
#define HAS_DDR (1 << 2)
|
||||||
|
#define HAS_DDR2 (1 << 3)
|
||||||
|
#define HAS_DDR3 (1 << 4)
|
||||||
|
#define HAS_DDR4 (1 << 5)
|
||||||
|
#define HAS_DDR5 (1 << 6)
|
||||||
|
|
||||||
|
struct pci_smbus_controller{
|
||||||
|
unsigned vendor;
|
||||||
|
unsigned device;
|
||||||
|
char *name;
|
||||||
|
void (*get_adr)(uint8_t idx);
|
||||||
|
uint8_t (*read_spd_byte)(uint8_t dimmadr, uint16_t bytenum);
|
||||||
|
uint8_t cap;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct spd_infos {
|
||||||
|
bool isValid;
|
||||||
|
uint32_t module_size;
|
||||||
|
uint8_t slot_num;
|
||||||
|
char *type;
|
||||||
|
uint16_t jedec_code;
|
||||||
|
char sku[32];
|
||||||
|
uint8_t sku_len;
|
||||||
|
uint16_t freq;
|
||||||
|
uint8_t XMP;
|
||||||
|
bool hasECC;
|
||||||
|
uint8_t fab_year;
|
||||||
|
uint8_t fab_week;
|
||||||
|
} spd_info;
|
||||||
|
|
||||||
|
#define get_spd(smb_idx, slot_idx, spd_adr) \
|
||||||
|
smbcontrollers[smb_idx].read_spd_byte(slot_idx, spd_adr)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Print SMBUS Info
|
* Print SMBUS Info
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user