298 changes: 154 additions & 144 deletions spd.c
View file
Expand Up @@ -4,17 +4,24 @@
* http://www.canardpc.com - http://www.memtest.org
*/

#include "spd.h"

#ifndef SPD_DISABLED

#include "stdint.h"
#include "test.h"
#include "io.h"
#include "pci.h"
#include "msr.h"
#include "spd.h"
#include "screen_buffer.h"
#include "jedec_id.h"

#define NULL 0

#define AMD_INDEX_IO_PORT 0xCD6
#define AMD_DATA_IO_PORT 0xCD7
#define AMD_SMBUS_BASE_REG 0x2C

#define SMBHSTSTS smbusbase
#define SMBHSTCNT smbusbase + 2
#define SMBHSTCMD smbusbase + 3
Expand All @@ -28,6 +35,18 @@ unsigned short smbusbase;
unsigned char spd_raw[256];
char s[] = {'/', 0, '-', 0, '\\', 0, '|', 0};

static char* convert_hex_to_char(unsigned hex_org) {
static char buf[2] = " ";
if (hex_org >= 0x20 && hex_org < 0x80) {
buf[0] = hex_org;
} else {
//buf[0] = '\0';
buf[0] = ' ';
}

return buf;
}

static void ich5_get_smb(void)
{
unsigned long x;
Expand All @@ -36,6 +55,23 @@ static void ich5_get_smb(void)
if (result == 0) smbusbase = (unsigned short) x & 0xFFFE;
}

static void sb800_get_smb(void)
{
int lbyte, hbyte;

__outb(AMD_SMBUS_BASE_REG + 1, AMD_INDEX_IO_PORT);
lbyte = __inb(AMD_DATA_IO_PORT);
__outb(AMD_SMBUS_BASE_REG, AMD_INDEX_IO_PORT);
hbyte = __inb(AMD_DATA_IO_PORT);

smbusbase = lbyte;
smbusbase <<= 8;
smbusbase += hbyte;
smbusbase &= 0xFFE0;

if (smbusbase == 0xFFE0) { smbusbase = 0; }
}

static void piix4_get_smb(void)
{
unsigned long x;
Expand All @@ -53,24 +89,7 @@ static void piix4_get_smb(void)
}
}

void sb800_get_smb(void)
{
int lbyte, hbyte;

__outb(AMD_SMBUS_BASE_REG + 1, AMD_INDEX_IO_PORT);
lbyte = __inb(AMD_DATA_IO_PORT);
__outb(AMD_SMBUS_BASE_REG, AMD_INDEX_IO_PORT);
hbyte = __inb(AMD_DATA_IO_PORT);

smbusbase = lbyte;
smbusbase <<= 8;
smbusbase += hbyte;
smbusbase &= 0xFFE0;

if (smbusbase == 0xFFE0) { smbusbase = 0; }
}

unsigned char ich5_smb_read_byte(unsigned char adr, unsigned char cmd)
static unsigned char ich5_smb_read_byte(unsigned char adr, unsigned char cmd)
{
int l1, h1, l2, h2;
uint64_t t;
Expand Down Expand Up @@ -184,7 +203,7 @@ static struct pci_smbus_controller smbcontrollers[] = {
};


int find_smb_controller(void)
static int find_smb_controller(void)
{
int i = 0;
unsigned long valuev, valued;
Expand All @@ -208,10 +227,121 @@ int find_smb_controller(void)
}


static int get_ddr3_module_size(int sdram_capacity, int prim_bus_width, int sdram_width, int ranks)
{
int module_size;

switch(sdram_capacity)
{
case 0:
module_size = 256;
break;
case 1:
module_size = 512;
break;
default:
case 2:
module_size = 1024;
break;
case 3:
module_size = 2048;
break;
case 4:
module_size = 4096;
break;
case 5:
module_size = 8192;
break;
case 6:
module_size = 16384;
break;
}

module_size /= 8;

switch(prim_bus_width)
{
case 0:
module_size *= 8;
break;
case 1:
module_size *= 16;
break;
case 2:
module_size *= 32;
break;
case 3:
module_size *= 64;
break;
}

switch(sdram_width)
{
case 0:
module_size /= 4;
break;
case 1:
module_size /= 8;
break;
case 2:
module_size /= 16;
break;
case 3:
module_size /= 32;
break;

}

module_size *= (ranks + 1);

return module_size;
}

static int get_ddr2_module_size(int rank_density_byte, int rank_num_byte)
{
int module_size;

switch(rank_density_byte)
{
case 1:
module_size = 1024;
break;
case 2:
module_size = 2048;
break;
case 4:
module_size = 4096;
break;
case 8:
module_size = 8192;
break;
case 16:
module_size = 16384;
break;
case 32:
module_size = 128;
break;
case 64:
module_size = 256;
break;
default:
case 128:
module_size = 512;
break;
}

module_size *= (rank_num_byte & 7) + 1;

return module_size;

}

#endif

void get_spd_spec(void)
{
int index;
#ifndef SPD_DISABLED
int index;
int h, i, j, z;
int k = 0;
int module_size;
Expand Down Expand Up @@ -385,11 +515,13 @@ void get_spd_spec(void)
k++;
}
}
#endif
}


void show_spd(void)
{
#ifndef SPD_DISABLED
int index;
int i, j;
int flag = 0;
Expand All @@ -416,133 +548,11 @@ void show_spd(void)
wait_keyup();
}
}
#endif
}

int get_ddr3_module_size(int sdram_capacity, int prim_bus_width, int sdram_width, int ranks)
{
int module_size;

switch(sdram_capacity)
{
case 0:
module_size = 256;
break;
case 1:
module_size = 512;
break;
default:
case 2:
module_size = 1024;
break;
case 3:
module_size = 2048;
break;
case 4:
module_size = 4096;
break;
case 5:
module_size = 8192;
break;
case 6:
module_size = 16384;
break;
}

module_size /= 8;

switch(prim_bus_width)
{
case 0:
module_size *= 8;
break;
case 1:
module_size *= 16;
break;
case 2:
module_size *= 32;
break;
case 3:
module_size *= 64;
break;
}

switch(sdram_width)
{
case 0:
module_size /= 4;
break;
case 1:
module_size /= 8;
break;
case 2:
module_size /= 16;
break;
case 3:
module_size /= 32;
break;

}

module_size *= (ranks + 1);

return module_size;
}


int get_ddr2_module_size(int rank_density_byte, int rank_num_byte)
{
int module_size;

switch(rank_density_byte)
{
case 1:
module_size = 1024;
break;
case 2:
module_size = 2048;
break;
case 4:
module_size = 4096;
break;
case 8:
module_size = 8192;
break;
case 16:
module_size = 16384;
break;
case 32:
module_size = 128;
break;
case 64:
module_size = 256;
break;
default:
case 128:
module_size = 512;
break;
}

module_size *= (rank_num_byte & 7) + 1;

return module_size;

}


struct ascii_map {
unsigned hex_code;
char *name;
};


char* convert_hex_to_char(unsigned hex_org) {
static char buf[2] = " ";
if (hex_org >= 0x20 && hex_org < 0x80) {
buf[0] = hex_org;
} else {
//buf[0] = '\0';
buf[0] = ' ';
}

return buf;
}
21 changes: 14 additions & 7 deletions spd.h
View file
Expand Up @@ -4,14 +4,21 @@
* http://www.canardpc.com - http://www.memtest.org
*/

#define AMD_INDEX_IO_PORT 0xCD6
#define AMD_DATA_IO_PORT 0xCD7
#define AMD_SMBUS_BASE_REG 0x2C
#ifndef _SPD_H_
#define _SPD_H_

//
// For platforms that do not support SPD information
// spd related functionality should be disabled
// using SPD_DISABLED macro
// TODO: maybe this should be moved to config

#define SPD_DISABLED

void get_spd_spec(void);
int get_ddr2_module_size(int rank_density_byte, int rank_num_byte);
int get_ddr3_module_size(int sdram_capacity, int prim_bus_width, int sdram_width, int ranks);
char* convert_hex_to_char(unsigned hex_org);
void sb800_get_smb(void);

void show_spd(void);

#endif


2 changes: 1 addition & 1 deletion test.h
View file
Expand Up @@ -180,7 +180,7 @@ void parity_err(ulong edi, ulong esi);
void start_config(void);
void clear_screen(void);
void paging_off(void);
void show_spd(void);
//void show_spd(void);
int map_page(unsigned long page);
void *mapping(unsigned long page_address);
void *emapping(unsigned long page_address);
Expand Down