From 54d6b08f010d2dc458184a4845f8fbdaaf0da429 Mon Sep 17 00:00:00 2001 From: "arch import user (historical)" Date: Wed, 6 Jul 2005 17:17:41 +0000 Subject: Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-54 Creator: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1970 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/boot/hardwaremain.c | 1 + src/cpu/amd/sc520/Config.lb | 6 +- src/cpu/amd/sc520/raminit.c | 17 ++- src/cpu/amd/sc520/sc520.c | 191 ++++++++++++++++++++++++ src/mainboard/digitallogic/msm586seg/Config.lb | 1 - src/mainboard/digitallogic/msm586seg/Options.lb | 6 + src/mainboard/digitallogic/msm586seg/auto.c | 89 ++++++++--- targets/digitallogic/msm586seg/Config.lb | 14 +- 8 files changed, 291 insertions(+), 34 deletions(-) diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index 08f972e612..00bc559771 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -56,6 +56,7 @@ void hardwaremain(int boot_complete) console_init(); post_code(0x39); + printk_notice("LinuxBIOS-%s%s %s %s...\n", linuxbios_version, linuxbios_extra_version, linuxbios_build, (boot_complete)?"rebooting":"booting"); diff --git a/src/cpu/amd/sc520/Config.lb b/src/cpu/amd/sc520/Config.lb index b61acbc1ab..10bb9965a7 100644 --- a/src/cpu/amd/sc520/Config.lb +++ b/src/cpu/amd/sc520/Config.lb @@ -1,7 +1,3 @@ -uses CONFIG_CHIP_NAME - -if CONFIG_CHIP_NAME - config chip.h -end +config chip.h object sc520.o diff --git a/src/cpu/amd/sc520/raminit.c b/src/cpu/amd/sc520/raminit.c index aecf2b7723..273e0a47fc 100644 --- a/src/cpu/amd/sc520/raminit.c +++ b/src/cpu/amd/sc520/raminit.c @@ -214,13 +214,13 @@ setupsc520(void){ /* the 0x80 led should now be working*/ outb(0xaa, 0x80); - +#if 0 /* wtf are 680 leds ... */ par = (unsigned long *) 0xfffef0c4; *par = 0x28000680; /* well? */ outb(0x55, 0x80); - +#endif /*; set the uart baud rate clocks to the normal 1.8432 MHz.*/ cp = (unsigned char *)0xfffefcc0; @@ -232,7 +232,7 @@ setupsc520(void){ cp = (unsigned char *)0x0fffefd20; *cp = 0x01; - cp = (unsigned char *)0x0fffefd28; +x cp = (unsigned char *)0x0fffefd28; *cp = 0x0c; cp = (unsigned char *)0x0fffefd29; @@ -258,12 +258,12 @@ setupsc520(void){ outl(0xcfc, 0x2); /*set the memory access enable bit*/ OUTC(0x0fffef072, 1); /* enable req bits in SYSARBMENB */ #endif + /* set up the PAR registers as they are on the MSM586SEG */ + par = (unsigned long *) 0xfffef088; #if 0 - /* set up the PAR registers as they are on the MSM586SEG */ - par = (unsigned long *) 0xfffef088; *par++ = 0x607c00a0; /*PAR0: PCI:Base 0xa0000; size 0x1f000:*/ *par++ = 0x480400d8; /*PAR1: GP BUS MEM:CS2:Base 0xd8, size 0x4:*/ *par++ = 0x340100ea; /*PAR2: GP BUS IO:CS5:Base 0xea, size 0x1:*/ @@ -279,9 +279,12 @@ setupsc520(void){ *par++ = 0x341f03e0; /*PAR12: GP BUS IO:CS5:Base 0x3e0, size 0x1f:*/ *par++ = 0xe41c00c0; /*PAR13: SDRAM:code:cache:nowrite:Base 0xc0000, size 0x7000:*/ *par++ = 0x545c00c8; /*PAR14: GP BUS MEM:CS5:Base 0xc8, size 0x5c:*/ -// *par++ = 0x8a020200; /*PAR15: BOOTCS:code:nocache:write:Base 0x2000000, size 0x80000:*/ - +#else + par += 15; #endif + *par++ = 0x8a020200; /*PAR15: BOOTCS:code:nocache:write:Base 0x2000000, size 0x80000:*/ + + } diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c index a8e5b0baa2..7776e82cc8 100644 --- a/src/cpu/amd/sc520/sc520.c +++ b/src/cpu/amd/sc520/sc520.c @@ -1,7 +1,198 @@ +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "chip.h" +/* + * set up basic things ... PAR should NOT go here, as it might change with the mainboard. + */ +static void cpu_init(device_t dev) +{ + unsigned long *l = (unsigned long *) 0xfffef088; + int i; + for(i = 0; i < 16; i++, l++) + printk_err("Par%d: 0x%lx\n", i, *l); + + printk_spew("SC520 random fixup ...\n"); +} + + + +static struct device_operations cpu_operations = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = cpu_init, + .enable = 0, + .ops_pci = 0, +}; + +static struct pci_driver cpu_driver __pci_driver = { + .ops = &cpu_operations, + .vendor = PCI_VENDOR_ID_AMD, + .device = 0x3000 +}; + + + +#define BRIDGE_IO_MASK (IORESOURCE_IO | IORESOURCE_MEM) + +static void pci_domain_read_resources(device_t dev) +{ + struct resource *resource; + printk_spew("%s\n", __FUNCTION__); + /* Initialize the system wide io space constraints */ + resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0,0)); + resource->limit = 0xffffUL; + resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; + + /* Initialize the system wide memory resources constraints */ + resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1,0)); + resource->limit = 0xffffffffULL; + resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; +} + +static void ram_resource(device_t dev, unsigned long index, + unsigned long basek, unsigned long sizek) +{ + struct resource *resource; + printk_spew("%s sizek 0x%x\n", __FUNCTION__, sizek); + if (!sizek) { + return; + } + resource = new_resource(dev, index); + resource->base = ((resource_t)basek) << 10; + resource->size = ((resource_t)sizek) << 10; + resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE | \ + IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; +} + +static void tolm_test(void *gp, struct device *dev, struct resource *new) +{ + struct resource **best_p = gp; + struct resource *best; + best = *best_p; + if (!best || (best->base > new->base)) { + best = new; + } + *best_p = best; +} + +static uint32_t find_pci_tolm(struct bus *bus) +{ + struct resource *min; + uint32_t tolm; + printk_spew("%s\n", __FUNCTION__); + min = 0; + search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min); + tolm = 0xffffffffUL; + if (min && tolm > min->base) { + tolm = min->base; + } + printk_spew("%s returns 0x%x\n", __FUNCTION__, tolm); + return tolm; +} + +static void pci_domain_set_resources(device_t dev) +{ + device_t mc_dev; + uint32_t pci_tolm; + printk_spew("%s\n", __FUNCTION__); + pci_tolm = find_pci_tolm(&dev->link[0]); + mc_dev = dev->link[0].children; + if (mc_dev) { + unsigned long tomk, tolmk; + // unsigned char rambits; + // int i; + int idx; +#if 0 + for(rambits = 0, i = 0; i < sizeof(ramregs)/sizeof(ramregs[0]); i++) { + unsigned char reg; + reg = pci_read_config8(mc_dev, ramregs[i]); + /* these are ENDING addresses, not sizes. + * if there is memory in this slot, then reg will be > rambits. + * So we just take the max, that gives us total. + * We take the highest one to cover for once and future linuxbios + * bugs. We warn about bugs. + */ + if (reg > rambits) + rambits = reg; + if (reg < rambits) + printk_err("ERROR! register 0x%x is not set!\n", + ramregs[i]); + } + printk_debug("I would set ram size to 0x%x Kbytes\n", (rambits)*8*1024); + tomk = rambits*8*1024; +#endif + tomk = 32 * 1024; + /* Compute the top of Low memory */ + tolmk = pci_tolm >> 10; + if (tolmk >= tomk) { + /* The PCI hole does does not overlap the memory. + */ + tolmk = tomk; + } + /* Report the memory regions */ + idx = 10; + ram_resource(dev, idx++, 0, tolmk); + } + assign_resources(&dev->link[0]); +} + +static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max) +{ + printk_spew("%s\n", __FUNCTION__); + max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max); + return max; +} + +static struct device_operations pci_domain_ops = { + .read_resources = pci_domain_read_resources, + .set_resources = pci_domain_set_resources, + .enable_resources = enable_childrens_resources, + .init = 0, + .scan_bus = pci_domain_scan_bus, +}; + +static void cpu_bus_init(device_t dev) +{ + printk_spew("cpu_bus_init\n"); +} + +static void cpu_bus_noop(device_t dev) +{ +} + +static struct device_operations cpu_bus_ops = { + .read_resources = cpu_bus_noop, + .set_resources = cpu_bus_noop, + .enable_resources = cpu_bus_noop, + .init = cpu_bus_init, + .scan_bus = 0, +}; + +static void enable_dev(struct device *dev) +{ + printk_spew("%s\n", __FUNCTION__); + /* Set the operations if it is a special bus type */ + if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { + dev->ops = &pci_domain_ops; + pci_set_method(dev); + } + else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + dev->ops = &cpu_bus_ops; + } +} + struct chip_operations cpu_amd_sc520_ops = { CHIP_NAME("AMD SC520") + .enable_dev = enable_dev, }; diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index 9f5bb16f1f..04cc7f2d7b 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -4,7 +4,6 @@ ## default ROM_SIZE = 512 * 1024 default FALLBACK_SIZE = 0x10000 - if USE_FALLBACK_IMAGE default ROM_SECTION_SIZE = 64 * 1024 # FALLBACK_SIZE default ROM_SECTION_OFFSET = ( ROM_SIZE - FALLBACK_SIZE ) diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb index 91e8ef0a13..610ef9a791 100644 --- a/src/mainboard/digitallogic/msm586seg/Options.lb +++ b/src/mainboard/digitallogic/msm586seg/Options.lb @@ -5,6 +5,7 @@ uses HAVE_FALLBACK_BOOT uses HAVE_HARD_RESET uses HAVE_OPTION_TABLE uses USE_OPTION_TABLE +uses CONFIG_COMPRESS uses CONFIG_ROM_STREAM uses IRQ_SLOT_COUNT uses MAINBOARD @@ -32,8 +33,13 @@ uses CC uses HOSTCC uses OBJCOPY +uses CONFIG_CONSOLE_SERIAL8250 + + uses DEFAULT_CONSOLE_LOGLEVEL uses MAXIMUM_CONSOLE_LOGLEVEL + +default CONFIG_CONSOLE_SERIAL8250=1 default DEFAULT_CONSOLE_LOGLEVEL=9 default MAXIMUM_CONSOLE_LOGLEVEL=9 ## ROM_SIZE is the size of boot ROM that this board will use. diff --git a/src/mainboard/digitallogic/msm586seg/auto.c b/src/mainboard/digitallogic/msm586seg/auto.c index 7aba46e797..b9f490a4f8 100644 --- a/src/mainboard/digitallogic/msm586seg/auto.c +++ b/src/mainboard/digitallogic/msm586seg/auto.c @@ -10,11 +10,14 @@ #include "pc80/serial.c" #include "arch/i386/lib/console.c" #include "ram/ramtest.c" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" //#include "lib/delay.c" #include "cpu/amd/sc520/raminit.c" +typedef void (*lj)(void); + + + struct mem_controller { int i; }; @@ -45,6 +48,23 @@ static inline int spd_read_byte(unsigned device, unsigned address) //#include "sdram/generic_sdram.c" +static inline void dumpmem(void){ + int i, j; + unsigned char *l; + unsigned char c; + + for(i = 0x4000; i < 0x5000; i += 16) { + print_err_hex32(i); print_err(":"); + for(j = 0; j < 16; j++) { + l = (unsigned char *)i + j; + c = *l; + print_err_hex8(c); + print_err(" "); + } + print_err("\r\n"); + } +} + static void main(unsigned long bist) { volatile int i; @@ -61,6 +81,8 @@ static void main(unsigned long bist) print_err("HI THERE!\r\n"); // sizemem(); staticmem(); + print_err("c60 is "); print_err_hex16(*(unsigned short *)0xfffefc60); + print_err("\n"); // while(1) print_err("STATIC MEM DONE\r\n"); @@ -69,36 +91,67 @@ static void main(unsigned long bist) #if 0 - else { - /* clear memory 1meg */ + + /* clear memory 1meg */ __asm__ volatile( - "1: \n\t" - "movl %0, %%fs:(%1)\n\t" - "addl $4,%1\n\t" - "subl $4,%2\n\t" - "jnz 1b\n\t" - : - : "a" (0), "D" (0), "c" (1024*1024) - ); + "1: \n\t" + "movl %0, %%fs:(%1)\n\t" + "addl $4,%1\n\t" + "subl $4,%2\n\t" + "jnz 1b\n\t" + : + : "a" (0), "D" (0), "c" (1024*1024) + ); + - } #endif - + #if 0 dump_pci_devices(); #endif #if 0 dump_pci_device(PCI_DEV(0, 0, 0)); #endif - + #if 0 print_err("RAM CHECK!\r\n"); // Check 16MB of memory @ 0 ram_check(0x00000000, 0x01000000); #endif -#if 1 - print_err("RAM CHECK!\r\n"); - // Check 1MB of memory @ 0 - ram_check(0x00000000, 0x0100000); +#if 0 + print_err("RAM CHECK for 32 MB!\r\n"); + // Check 32MB of memory @ 0 + ram_check(0x00000000, 0x02000000); +#endif +#if 0 + { + volatile unsigned char *src = (unsigned char *) 0x2000000 + 0x70000; + volatile unsigned char *dst = (unsigned char *) 0x4000; + for(i = 0; i < 0x10000; i++) { + /* + print_err("Set dst "); print_err_hex32((unsigned long) dst); + print_err(" to "); print_err_hex32(*src); print_err("\r\n"); + */ + *dst = *src; + //print_err(" dst is now "); print_err_hex32(*dst); print_err("\r\n"); + dst++, src++; + outb((unsigned char)i, 0x80); + } + } + dumpmem(); + outb(0, 0x80); + print_err("loop forever\r\n"); + outb(0xdd, 0x80); + __asm__ volatile( + "movl %0, %%edi\n\t" + "jmp *%%edi\n\t" + : + : "a" (0x4000) + ); + + print_err("FUCK\r\n"); + + while(1); #endif } + diff --git a/targets/digitallogic/msm586seg/Config.lb b/targets/digitallogic/msm586seg/Config.lb index 507dc39d67..076250599f 100644 --- a/targets/digitallogic/msm586seg/Config.lb +++ b/targets/digitallogic/msm586seg/Config.lb @@ -1,10 +1,12 @@ target msm586seg mainboard digitallogic/msm586seg -option ROM_SIZE=512*1024 + option DEFAULT_CONSOLE_LOGLEVEL=10 option MAXIMUM_CONSOLE_LOGLEVEL=10 +option CONFIG_COMPRESS=1 + #romimage "normal" # option USE_FALLBACK_IMAGE=0 # option ROM_IMAGE_SIZE=0x10000 @@ -13,10 +15,16 @@ option MAXIMUM_CONSOLE_LOGLEVEL=10 #end romimage "fallback" +# option FALLBACK_SIZE = 512 * 1024 +# option ROM_SIZE=512*1024 +# option ROM_SECTION_SIZE=512*1024 option USE_FALLBACK_IMAGE=1 - option ROM_IMAGE_SIZE=32 * 1024 # 0x10000 + option ROM_IMAGE_SIZE=32 * 1024 # 0x8000 +# option ROM_IMAGE_SIZE=64 * 1024 # 0x10000 +# option ROM_IMAGE_SIZE=512 * 1024 # 0x10000 option LINUXBIOS_EXTRA_VERSION=".0Fallback" - payload /etc/hosts + payload ../../filo.elf +# payload ../../eepro100--ide_disk.zelf end buildrom ./linuxbios.rom ROM_SIZE "fallback" -- cgit v1.2.3