GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i855: Remove useless memctrl indirection. 

This needlessly complicates the code and increases register pressure on romcc
chipsets. We did the same conversion on i440BX, i830, and others.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coreboot.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6112 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2010-11-22 12:59:36 +00:00
parent abc0c85516
commit 6e9ab97106
5 changed files with 54 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainboard/digitallogic/adl855pc/romstage.c
View File

@ -5,6 +5,7 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <stdlib.h> #include <stdlib.h>
#include <lib.h>
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <console/console.h> #include <console/console.h>
@ -26,17 +27,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/raminit.c"
#include "northbridge/intel/i855/reset_test.c" #include "northbridge/intel/i855/reset_test.c"
#include "lib/generic_sdram.c"
void main(unsigned long bist) void main(unsigned long bist)
{ {
static const struct mem_controller memctrl[] = {
{
.d0 = PCI_DEV(0, 0, 1),
.channel0 = { DIMM0, 0 },
},
};
if (bist == 0) { if (bist == 0) {
#if 0 #if 0
enable_lapic(); enable_lapic();
@ -58,10 +51,12 @@ void main(unsigned long bist)
if (!bios_reset_detected()) { if (!bios_reset_detected()) {
enable_smbus(); enable_smbus();
#if 0 #if 0
dump_spd_registers(&memctrl[0]); dump_spd_registers();
dump_smbus_registers(); dump_smbus_registers();
#endif #endif
sdram_initialize(ARRAY_SIZE(memctrl), memctrl); sdram_set_registers();
sdram_set_spd_registers();
sdram_enable();
} }
#if 0 #if 0

15
src/mainboard/lanner/em8510/romstage.c
View File

@ -27,6 +27,7 @@
#include <arch/romcc_io.h> #include <arch/romcc_io.h>
#include <arch/hlt.h> #include <arch/hlt.h>
#include <stdlib.h> #include <stdlib.h>
#include <lib.h>
#include <spd.h> #include <spd.h>
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -48,17 +49,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/raminit.c"
#include "northbridge/intel/i855/reset_test.c" #include "northbridge/intel/i855/reset_test.c"
#include "lib/generic_sdram.c"
void main(unsigned long bist) void main(unsigned long bist)
{ {
static const struct mem_controller memctrl[] = {
{
.d0 = PCI_DEV(0, 0, 1),
.channel0 = { DIMM0, 0 },
},
};
if (bist == 0) { if (bist == 0) {
#if 0 #if 0
enable_lapic(); enable_lapic();
@ -80,10 +73,12 @@ void main(unsigned long bist)
if (!bios_reset_detected()) { if (!bios_reset_detected()) {
enable_smbus(); enable_smbus();
#if 1 #if 1
dump_spd_registers(&memctrl[0]); dump_spd_registers();
dump_smbus_registers(); dump_smbus_registers();
#endif #endif
sdram_initialize(ARRAY_SIZE(memctrl), memctrl); sdram_set_registers();
sdram_set_spd_registers();
sdram_enable();
} }
#if 0 #if 0

6
src/northbridge/intel/i855/debug.c
View File

@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <spd.h>
static void print_debug_pci_dev(unsigned dev) static void print_debug_pci_dev(unsigned dev)
{ {
print_debug("PCI: "); print_debug("PCI: ");
@ -84,13 +86,13 @@ static inline void dump_pci_devices(void)
} }
} }
static inline void dump_spd_registers(const struct mem_controller *ctrl) static inline void dump_spd_registers(void)
{ {
int i; int i;
print_debug("\n"); print_debug("\n");
for(i = 0; i < 2; i++) { for(i = 0; i < 2; i++) {
unsigned device; unsigned device;
device = ctrl->channel0[i]; device = DIMM0 + i;
if (device) { if (device) {
int j; int j;
print_debug("dimm: "); print_debug("dimm: ");

81
src/northbridge/intel/i855/raminit.c
View File

@ -127,7 +127,7 @@ static void die_on_spd_error(int spd_return_value)
* @param dimm_socket_address SMBus address of DIMM socket to interrogate. * @param dimm_socket_address SMBus address of DIMM socket to interrogate.
* @return log2(page size) for each side of the DIMM. * @return log2(page size) for each side of the DIMM.
*/ */
static struct dimm_size sdram_spd_get_page_size(uint16_t dimm_socket_address) static struct dimm_size sdram_spd_get_page_size(u8 dimm_socket_address)
{ {
uint16_t module_data_width; uint16_t module_data_width;
int value; int value;
@ -187,7 +187,7 @@ static struct dimm_size sdram_spd_get_page_size(uint16_t dimm_socket_address)
* @param dimm_socket_address SMBus address of DIMM socket to interrogate. * @param dimm_socket_address SMBus address of DIMM socket to interrogate.
* @return Width in bits of each DIMM side's DRAMs. * @return Width in bits of each DIMM side's DRAMs.
*/ */
static struct dimm_size sdram_spd_get_width(uint16_t dimm_socket_address) static struct dimm_size sdram_spd_get_width(u8 dimm_socket_address)
{ {
int value; int value;
struct dimm_size width; struct dimm_size width;
@ -274,17 +274,15 @@ static struct dimm_size spd_get_dimm_size(unsigned dimm)
/** /**
* Scan for compatible DIMMs. * Scan for compatible DIMMs.
* *
* @param ctrl PCI addresses of memory controller functions, and SMBus
* addresses of DIMM slots on the mainboard.
* @return A bitmask indicating which sockets contain a compatible DIMM. * @return A bitmask indicating which sockets contain a compatible DIMM.
*/ */
static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl) static uint8_t spd_get_supported_dimms(void)
{ {
int i; int i;
uint8_t dimm_mask = 0; uint8_t dimm_mask = 0;
for (i = 0; i < DIMM_SOCKETS; i++) { for (i = 0; i < DIMM_SOCKETS; i++) {
uint16_t dimm = ctrl->channel0[i]; u8 dimm = DIMM0 + i;
#ifdef VALIDATE_DIMM_COMPATIBILITY #ifdef VALIDATE_DIMM_COMPATIBILITY
struct dimm_size page_size; struct dimm_size page_size;
@ -404,7 +402,7 @@ static void do_ram_command(uint8_t command, uint16_t jedec_mode_bits)
} }
} }
static void set_initialize_complete(const struct mem_controller *ctrl) static void set_initialize_complete(void)
{ {
uint32_t drc_reg; uint32_t drc_reg;
@ -413,7 +411,7 @@ static void set_initialize_complete(const struct mem_controller *ctrl)
pci_write_config32(NORTHBRIDGE_MMC, DRC, drc_reg); pci_write_config32(NORTHBRIDGE_MMC, DRC, drc_reg);
} }
static void sdram_enable(int controllers, const struct mem_controller *ctrl) static void sdram_enable(void)
{ {
int i; int i;
@ -470,7 +468,7 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
delay(); delay();
print_debug("Ram enable 9\n"); print_debug("Ram enable 9\n");
set_initialize_complete(ctrl); set_initialize_complete();
delay(); delay();
delay(); delay();
@ -495,11 +493,8 @@ DIMM-independant configuration functions:
/** /**
* Set only what I need until it works, then make it figure things out on boot * Set only what I need until it works, then make it figure things out on boot
* assumes only one DIMM is populated. * assumes only one DIMM is populated.
*
* @param ctrl PCI addresses of memory controller functions, and SMBus
* addresses of DIMM slots on the mainboard.
*/ */
static void sdram_set_registers(const struct mem_controller *ctrl) static void sdram_set_registers(void)
{ {
/* /*
print_debug("Before configuration:\n"); print_debug("Before configuration:\n");
@ -507,13 +502,13 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
*/ */
} }
static void spd_set_row_attributes(const struct mem_controller *ctrl, uint8_t dimm_mask) static void spd_set_row_attributes(uint8_t dimm_mask)
{ {
int i; int i;
uint16_t row_attributes = 0; uint16_t row_attributes = 0;
for (i = 0; i < DIMM_SOCKETS; i++) { for (i = 0; i < DIMM_SOCKETS; i++) {
uint16_t dimm = ctrl->channel0[i]; u8 dimm = DIMM0 + i;
struct dimm_size page_size; struct dimm_size page_size;
struct dimm_size sdram_width; struct dimm_size sdram_width;
@ -544,7 +539,7 @@ static void spd_set_row_attributes(const struct mem_controller *ctrl, uint8_t di
pci_write_config16(NORTHBRIDGE_MMC, DRA, row_attributes); pci_write_config16(NORTHBRIDGE_MMC, DRA, row_attributes);
} }
static void spd_set_dram_controller_mode(const struct mem_controller *ctrl, uint8_t dimm_mask) static void spd_set_dram_controller_mode(uint8_t dimm_mask)
{ {
int i; int i;
@ -558,7 +553,7 @@ static void spd_set_dram_controller_mode(const struct mem_controller *ctrl, uint
controller_mode |= (2 << 10); // FIXME: Undocumented, really needed????? controller_mode |= (2 << 10); // FIXME: Undocumented, really needed?????
for (i = 0; i < DIMM_SOCKETS; i++) { for (i = 0; i < DIMM_SOCKETS; i++) {
uint16_t dimm = ctrl->channel0[i]; u8 dimm = DIMM0 + i;
uint32_t dimm_refresh_mode; uint32_t dimm_refresh_mode;
int value; int value;
u8 tRCD, tRP; u8 tRCD, tRP;
@ -610,7 +605,7 @@ static void spd_set_dram_controller_mode(const struct mem_controller *ctrl, uint
pci_write_config32(NORTHBRIDGE_MMC, DRC, controller_mode); pci_write_config32(NORTHBRIDGE_MMC, DRC, controller_mode);
} }
static void spd_set_dram_timing(const struct mem_controller *ctrl, uint8_t dimm_mask) static void spd_set_dram_timing(uint8_t dimm_mask)
{ {
int i; int i;
u32 dram_timing; u32 dram_timing;
@ -623,7 +618,7 @@ static void spd_set_dram_timing(const struct mem_controller *ctrl, uint8_t dimm_
uint8_t slowest_active_to_precharge_delay = 0; uint8_t slowest_active_to_precharge_delay = 0;
for (i = 0; i < DIMM_SOCKETS; i++) { for (i = 0; i < DIMM_SOCKETS; i++) {
uint16_t dimm = ctrl->channel0[i]; u8 dimm = DIMM0 + i;
int value; int value;
uint32_t current_cas_latency; uint32_t current_cas_latency;
uint32_t dimm_compatible_cas_latencies; uint32_t dimm_compatible_cas_latencies;
@ -788,14 +783,14 @@ static void spd_set_dram_timing(const struct mem_controller *ctrl, uint8_t dimm_
pci_write_config32(NORTHBRIDGE_MMC, DRT, dram_timing); pci_write_config32(NORTHBRIDGE_MMC, DRT, dram_timing);
} }
static void spd_set_dram_size(const struct mem_controller *ctrl, uint8_t dimm_mask) static void spd_set_dram_size(uint8_t dimm_mask)
{ {
int i; int i;
int total_dram = 0; int total_dram = 0;
uint32_t drb_reg = 0; uint32_t drb_reg = 0;
for (i = 0; i < DIMM_SOCKETS; i++) { for (i = 0; i < DIMM_SOCKETS; i++) {
uint16_t dimm = ctrl->channel0[i]; u8 dimm = DIMM0 + i;
struct dimm_size sz; struct dimm_size sz;
if (!(dimm_mask & (1 << i))) { if (!(dimm_mask & (1 << i))) {
@ -818,7 +813,7 @@ static void spd_set_dram_size(const struct mem_controller *ctrl, uint8_t dimm_ma
} }
static void spd_set_dram_pwr_management(const struct mem_controller *ctrl) static void spd_set_dram_pwr_management(void)
{ {
uint32_t pwrmg_reg; uint32_t pwrmg_reg;
@ -826,7 +821,7 @@ static void spd_set_dram_pwr_management(const struct mem_controller *ctrl)
pci_write_config32(NORTHBRIDGE_MMC, PWRMG, pwrmg_reg); pci_write_config32(NORTHBRIDGE_MMC, PWRMG, pwrmg_reg);
} }
static void spd_set_dram_throttle_control(const struct mem_controller *ctrl) static void spd_set_dram_throttle_control(void)
{ {
uint32_t dtc_reg = 0; uint32_t dtc_reg = 0;
@ -874,28 +869,28 @@ static void spd_set_dram_throttle_control(const struct mem_controller *ctrl)
pci_write_config32(NORTHBRIDGE_MMC, DTC, dtc_reg); pci_write_config32(NORTHBRIDGE_MMC, DTC, dtc_reg);
} }
static void spd_update(const struct mem_controller *ctrl, u8 reg, u32 new_value) static void spd_update(u8 reg, u32 new_value)
{ {
#if CONFIG_DEBUG_RAM_SETUP #if CONFIG_DEBUG_RAM_SETUP
u32 value1 = pci_read_config32(ctrl->d0, reg); u32 value1 = pci_read_config32(NORTHBRIDGE_MMC, reg);
#endif #endif
pci_write_config32(ctrl->d0, reg, new_value); pci_write_config32(NORTHBRIDGE_MMC, reg, new_value);
#if CONFIG_DEBUG_RAM_SETUP #if CONFIG_DEBUG_RAM_SETUP
u32 value2 = pci_read_config32(ctrl->d0, reg); u32 value2 = pci_read_config32(NORTHBRIDGE_MMC, reg);
PRINTK_DEBUG("update reg %02x, old: %08x, new: %08x, read back: %08x\n", reg, value1, new_value, value2); PRINTK_DEBUG("update reg %02x, old: %08x, new: %08x, read back: %08x\n", reg, value1, new_value, value2);
#endif #endif
} }
/* if ram still doesn't work do this function */ /* if ram still doesn't work do this function */
static void spd_set_undocumented_registers(const struct mem_controller *ctrl) static void spd_set_undocumented_registers(void)
{ {
spd_update(ctrl, 0x74, 0x00000001); spd_update(0x74, 0x00000001);
spd_update(ctrl, 0x78, 0x001fe974); spd_update(0x78, 0x001fe974);
spd_update(ctrl, 0x80, 0x00af0039); spd_update(0x80, 0x00af0039);
spd_update(ctrl, 0x84, 0x0000033c); spd_update(0x84, 0x0000033c);
spd_update(ctrl, 0x88, 0x00000010); spd_update(0x88, 0x00000010);
spd_update(ctrl, 0xc0, 0x00000003); spd_update(0xc0, 0x00000003);
} }
static void northbridge_set_registers(void) static void northbridge_set_registers(void)
@ -961,26 +956,26 @@ static void northbridge_set_registers(void)
printk(BIOS_DEBUG, "Initial Northbridge registers have been set.\n"); printk(BIOS_DEBUG, "Initial Northbridge registers have been set.\n");
} }
static void sdram_set_spd_registers(const struct mem_controller *ctrl) static void sdram_set_spd_registers(void)
{ {
uint8_t dimm_mask; uint8_t dimm_mask;
PRINTK_DEBUG("Reading SPD data...\n"); PRINTK_DEBUG("Reading SPD data...\n");
dimm_mask = spd_get_supported_dimms(ctrl); dimm_mask = spd_get_supported_dimms();
if (dimm_mask == 0) { if (dimm_mask == 0) {
print_debug("No usable memory for this controller\n"); print_debug("No usable memory for this controller\n");
} else { } else {
PRINTK_DEBUG("DIMM MASK: %02x\n", dimm_mask); PRINTK_DEBUG("DIMM MASK: %02x\n", dimm_mask);
spd_set_row_attributes(ctrl, dimm_mask); spd_set_row_attributes(dimm_mask);
spd_set_dram_controller_mode(ctrl, dimm_mask); spd_set_dram_controller_mode(dimm_mask);
spd_set_dram_timing(ctrl, dimm_mask); spd_set_dram_timing(dimm_mask);
spd_set_dram_size(ctrl, dimm_mask); spd_set_dram_size(dimm_mask);
spd_set_dram_pwr_management(ctrl); spd_set_dram_pwr_management();
spd_set_dram_throttle_control(ctrl); spd_set_dram_throttle_control();
spd_set_undocumented_registers(ctrl); spd_set_undocumented_registers();
} }
/* Setup Initial Northbridge Registers */ /* Setup Initial Northbridge Registers */

9
src/northbridge/intel/i855/raminit.h
View File

@ -21,18 +21,13 @@
#ifndef NORTHBRIDGE_INTEL_I855_RAMINIT_H #ifndef NORTHBRIDGE_INTEL_I855_RAMINIT_H
#define NORTHBRIDGE_INTEL_I855_RAMINIT_H #define NORTHBRIDGE_INTEL_I855_RAMINIT_H
/* i855 Northbridge PCI device */ /* i855 Northbridge PCI devices */
#define NORTHBRIDGE PCI_DEV(0, 0, 0) #define NORTHBRIDGE PCI_DEV(0, 0, 0)
#define NORTHBRIDGE_MMC PCI_DEV(0, 0, 1) #define NORTHBRIDGE_MMC PCI_DEV(0, 0, 1)
/* The i855 supports max. 2 dual-sided SO-DIMMs. */ /* The i855 supports max. 2 dual-sided SO-DIMMs. */
#define DIMM_SOCKETS 2 #define DIMM_SOCKETS 2
struct mem_controller { void sdram_initialize(void);
device_t d0;
uint16_t channel0[DIMM_SOCKETS];
};
void sdram_initialize(int controllers, const struct mem_controller *ctrl);
#endif /* NORTHBRIDGE_INTEL_I855_RAMINIT_H */ #endif /* NORTHBRIDGE_INTEL_I855_RAMINIT_H */