sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various 440BX and Tyan S1846 related minor changes and fixes (trivial):

Browse Source 
- Only check the RAM from 0 - 640 KB and 768 KB - 1 MB now. That's
   available on all boards, regardless of what DIMMs you use.
   Tested on the Tyan S1846, works fine.

 - Properly set the PAM registers to allow the region from 768 KB - 1 MB
   to be used as normal RAM (required for the above).

 - Document all of this properly. Add/improve other documentation, too.

 - Simplify and document code in northbridge.c.

 - Cosmetics and coding style.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2701 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann
2007-05-27 23:31:31 +00:00
parent 4cb85533dd
commit f5a6fd253c
5 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/tyan/s1846/Options.lb
View File

@@ -60,7 +60,6 @@ default HAVE_HARD_RESET=0
## ##
default HAVE_PIRQ_TABLE=0 default HAVE_PIRQ_TABLE=0
default IRQ_SLOT_COUNT=4 default IRQ_SLOT_COUNT=4
#object irq_tables.o
## ##
## Build code to export a CMOS option table ## Build code to export a CMOS option table

30
src/mainboard/tyan/s1846/auto.c
View File

@@ -31,7 +31,7 @@
#include "ram/ramtest.c" #include "ram/ramtest.c"
#include "southbridge/intel/i82371eb/i82371eb_early_smbus.c" #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
#include "northbridge/intel/i440bx/raminit.h" #include "northbridge/intel/i440bx/raminit.h"
#include "mainboard/bitworks/ims/debug.c" // FIXME #include "mainboard/bitworks/ims/debug.c" // FIXME
#include "pc80/udelay_io.c" #include "pc80/udelay_io.c"
#include "lib/delay.c" #include "lib/delay.c"
#include "superio/nsc/pc87309/pc87309_early_serial.c" #include "superio/nsc/pc87309/pc87309_early_serial.c"
@@ -51,9 +51,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
static void enable_mainboard_devices(void) static void enable_mainboard_devices(void)
{ {
device_t dev; device_t dev = pci_locate_device(PCI_ID(0x8086, 0x7110), 0);
dev = pci_locate_device(PCI_ID(0x8086, 0x7110), 0);
if (dev == PCI_DEV_INVALID) { if (dev == PCI_DEV_INVALID) {
die("Southbridge not found!\n"); die("Southbridge not found!\n");
@@ -66,13 +64,8 @@ static void main(unsigned long bist)
{ {
static const struct mem_controller memctrl[] = { static const struct mem_controller memctrl[] = {
{ {
.d0 = PCI_DEV(0, 0, 0), .d0 = PCI_DEV(0, 0, 0),
.channel0 = { .channel0 = {0x50, 0x51, 0x52, 0x53},
(0xa << 3) | 0,
(0xa << 3) | 1,
(0xa << 3) | 2,
(0xa << 3) | 3,
},
}, },
}; };
@@ -98,17 +91,22 @@ static void main(unsigned long bist)
/* Check whether RAM is working. /* Check whether RAM is working.
* *
* Do _not_ check the area from 640 KB - 1 MB, as that's not really * Do _not_ check the area from 640 KB - 768 KB, as that's not really
* RAM, but rather reserved for various other things: * RAM, but rather reserved for the 'Video Buffer Area'.
*
* Other stuff in the range from 640 KB - 1 MB:
* *
* - 640 KB - 768 KB: Video Buffer Area * - 640 KB - 768 KB: Video Buffer Area
* - 768 KB - 896 KB: Expansion Area * - 768 KB - 896 KB: Expansion Area
* - 896 KB - 960 KB: Extended System BIOS Area * - 896 KB - 960 KB: Extended System BIOS Area
* - 960 KB - 1 MB: Memory (BIOS Area) - System BIOS Area * - 960 KB - 1 MB: Memory (BIOS Area) - System BIOS Area
* *
* Trying to check these areas will fail. * Trying to check these areas will usually fail, too. However, you
* probably can set the PAM registers of the northbridge to map
* those areas to RAM (read/write). In that case you can use the
* range from 768 KB - 1 MB as normal RAM, and thus check it here.
*/ */
/* TODO: This is currently hardcoded to check 64 MB. */
ram_check(0x00000000, 0x0009ffff); /* 0 - 640 KB */ ram_check(0x00000000, 0x0009ffff); /* 0 - 640 KB */
ram_check(0x00100000, 0x007c0000); /* 1 MB - 64 MB */ ram_check(0x000c0000, 0x00100000); /* 768 KB - 1 MB */
// ram_check(0x00100000, 0x007c0000); /* 1 MB - 64 MB */
} }

41
src/northbridge/intel/i440bx/northbridge.c
View File

@@ -92,44 +92,41 @@ static uint32_t find_pci_tolm(struct bus *bus)
static void pci_domain_set_resources(device_t dev) static void pci_domain_set_resources(device_t dev)
{ {
device_t mc_dev; device_t mc_dev;
uint32_t pci_tolm; uint32_t pci_tolm;
pci_tolm = find_pci_tolm(&dev->link[0]); pci_tolm = find_pci_tolm(&dev->link[0]);
mc_dev = dev->link[0].children; mc_dev = dev->link[0].children;
if (mc_dev) { if (mc_dev) {
/* Figure out which areas are/should be occupied by RAM.
* This is all computed in kilobytes and converted to/from
* the memory controller right at the edges.
* Having different variables in different units is
* too confusing to get right. Kilobytes are good up to
* 4 Terabytes of RAM...
*/
uint16_t tolm_r; uint16_t tolm_r;
unsigned long tomk, tolmk; unsigned long tomk, tolmk;
int idx; int idx;
/* Get the value of the highest DRB. This tells the end of /* Figure out which areas are/should be occupied by RAM. The
* the physical memory. The units are ticks of 8MB * value of the highest DRB denotes the end of the physical
* i.e. 1 means 8MB. * memory (in units of 8MB).
*/ */
tomk = ((unsigned long)pci_read_config8(mc_dev, DRB7)) << 13; tomk = ((unsigned long)pci_read_config8(mc_dev, DRB7));
printk_debug("Setting RAM size to %d MB\n", tomk >> 10);
/* Convert to KB. */
tomk *= (8 * 1024);
printk_debug("Setting RAM size to %d MB\n", tomk / 1024);
/* Compute the top of low memory. */
tolmk = pci_tolm / 1024;
/* Compute the top of Low memory */
tolmk = pci_tolm >> 10;
if (tolmk >= tomk) { if (tolmk >= tomk) {
/* The PCI hole does does not overlap the memory. /* The PCI hole does does not overlap the memory. */
*/
tolmk = tomk; tolmk = tomk;
} }
/* Report the memory regions */ /* Report the memory regions. */
idx = 10; idx = 10;
ram_resource(dev, idx++, 0, 640); ram_resource(dev, idx++, 0, 640);
// ram_resource(dev, idx++, 768, tolmk - 768); ram_resource(dev, idx++, 768, tolmk - 768);
ram_resource(dev, idx++, 1024, tolmk - 1024);
} }
assign_resources(&dev->link[0]); assign_resources(&dev->link[0]);
} }
@@ -179,6 +176,6 @@ static void enable_dev(struct device *dev)
} }
struct chip_operations northbridge_intel_i440bx_ops = { struct chip_operations northbridge_intel_i440bx_ops = {
CHIP_NAME("Intel 440BX Northbridge") CHIP_NAME("Intel 82443BX (440BX) Northbridge")
.enable_dev = enable_dev, .enable_dev = enable_dev,
}; };

35
src/northbridge/intel/i440bx/raminit.c
View File

@@ -69,7 +69,7 @@ static const uint32_t refresh_rate_map[] = {
/* Table format: register, bitmask, value. */ /* Table format: register, bitmask, value. */
static const long register_values[] = { static const long register_values[] = {
/* NBXCFG - NBX Configuration Register /* NBXCFG - NBX Configuration Register
* 0x50 * 0x50 - 0x53
* *
* [31:24] SDRAM Row Without ECC * [31:24] SDRAM Row Without ECC
* 0 = ECC components are populated in this row * 0 = ECC components are populated in this row
@@ -158,6 +158,7 @@ static const long register_values[] = {
/* /*
* PAM[6:0] - Programmable Attribute Map Registers * PAM[6:0] - Programmable Attribute Map Registers
* 0x59 - 0x5f
* *
* 0x59 [3:0] Reserved * 0x59 [3:0] Reserved
* 0x59 [5:4] 0xF0000 - 0xFFFFF BIOS area * 0x59 [5:4] 0xF0000 - 0xFFFFF BIOS area
@@ -181,13 +182,13 @@ static const long register_values[] = {
* 11 = Read/Write (all access goes to DRAM) * 11 = Read/Write (all access goes to DRAM)
*/ */
// TODO // TODO
PAM0, 0x00000000, 0x00, PAM0, 0x00, 0x00,
PAM1, 0x00000000, 0x00, PAM1, 0x00, 0x00,
PAM2, 0x00000000, 0x00, PAM2, 0x00, 0x00,
PAM3, 0x00000000, 0x00, PAM3, 0x00, 0x00,
PAM4, 0x00000000, 0x00, PAM4, 0x00, 0x00,
PAM5, 0x00000000, 0x00, PAM5, 0x00, 0x00,
PAM6, 0x00000000, 0x00, PAM6, 0x00, 0x00,
/* DRB[0:7] - DRAM Row Boundary Registers /* DRB[0:7] - DRAM Row Boundary Registers
* 0x60 - 0x67 * 0x60 - 0x67
@@ -204,7 +205,7 @@ static const long register_values[] = {
* 0x66 DRB6 = Total memory in row0+1+2+3+4+5+6 (in 8 MB) * 0x66 DRB6 = Total memory in row0+1+2+3+4+5+6 (in 8 MB)
* 0x67 DRB7 = Total memory in row0+1+2+3+4+5+6+7 (in 8 MB) * 0x67 DRB7 = Total memory in row0+1+2+3+4+5+6+7 (in 8 MB)
*/ */
// TODO /* Set the DRBs to zero for now, this will be fixed later. */
DRB0, 0x00, 0x00, DRB0, 0x00, 0x00,
DRB1, 0x00, 0x00, DRB1, 0x00, 0x00,
DRB2, 0x00, 0x00, DRB2, 0x00, 0x00,
@@ -424,7 +425,7 @@ static void sdram_set_registers(const struct mem_controller *ctrl)
max = sizeof(register_values) / sizeof(register_values[0]); max = sizeof(register_values) / sizeof(register_values[0]);
/* Set registers as specified in the register_values array. */ /* Set registers as specified in the register_values[] array. */
for (i = 0; i < max; i += 3) { for (i = 0; i < max; i += 3) {
reg = pci_read_config32(ctrl->d0, register_values[i]); reg = pci_read_config32(ctrl->d0, register_values[i]);
reg &= register_values[i + 1]; reg &= register_values[i + 1];
@@ -448,7 +449,21 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl)
{ {
/* TODO: Don't hardcode the values here, get info via SPD. */ /* TODO: Don't hardcode the values here, get info via SPD. */
/* Map all legacy regions to RAM (read/write). This is required if
* you want to use the RAM area from 768 KB - 1 MB. If the PAM
* registers are not set here appropriately, the RAM in that region
* will not be accessible, thus a RAM check of it will also fail.
*/
pci_write_config8(ctrl->d0, PAM0, 0x30);
pci_write_config8(ctrl->d0, PAM1, 0x33);
pci_write_config8(ctrl->d0, PAM2, 0x33);
pci_write_config8(ctrl->d0, PAM3, 0x33);
pci_write_config8(ctrl->d0, PAM4, 0x33);
pci_write_config8(ctrl->d0, PAM5, 0x33);
pci_write_config8(ctrl->d0, PAM6, 0x33);
/* TODO: Set DRB0-DRB7. */ /* TODO: Set DRB0-DRB7. */
/* Currently this is hardcoded to one 64 MB DIMM in slot 0. */
pci_write_config8(ctrl->d0, DRB0, 0x08); pci_write_config8(ctrl->d0, DRB0, 0x08);
pci_write_config8(ctrl->d0, DRB1, 0x08); pci_write_config8(ctrl->d0, DRB1, 0x08);
pci_write_config8(ctrl->d0, DRB2, 0x08); pci_write_config8(ctrl->d0, DRB2, 0x08);

5
targets/tyan/s1846/Config.lb
View File

@@ -22,10 +22,11 @@ target s1846
mainboard tyan/s1846 mainboard tyan/s1846
option ROM_SIZE = 256 * 1024 option ROM_SIZE = 256 * 1024
# option FALLBACK_SIZE = 256 * 1024
romimage "normal" romimage "normal"
option USE_FALLBACK_IMAGE = 0 option USE_FALLBACK_IMAGE = 0
option ROM_IMAGE_SIZE=0x0e000 option ROM_IMAGE_SIZE = 56 * 1024
option LINUXBIOS_EXTRA_VERSION = ".0Normal" option LINUXBIOS_EXTRA_VERSION = ".0Normal"
payload /tmp/filo.elf payload /tmp/filo.elf
# payload /tmp/memtest # payload /tmp/memtest
@@ -33,7 +34,7 @@ end
romimage "fallback" romimage "fallback"
option USE_FALLBACK_IMAGE = 1 option USE_FALLBACK_IMAGE = 1
option ROM_IMAGE_SIZE=0x0e000 option ROM_IMAGE_SIZE = 56 * 1024
option LINUXBIOS_EXTRA_VERSION = ".0Fallback" option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
payload /tmp/filo.elf payload /tmp/filo.elf
# payload /tmp/memtest # payload /tmp/memtest