- Moved hlt() to it's own header.
[coreboot.git] / src / mainboard / amd / solo / auto.c
index 895d97ea143fdbebcd1aa24f1a451e9e900cbad2..3a80e4c1bdd7087f0b9dca99dbfc4d16da0d5922 100644 (file)
@@ -1,17 +1,16 @@
 #define ASSEMBLY 1
-#define MAXIMUM_CONSOLE_LOGLEVEL 9
-#define DEFAULT_CONSOLE_LOGLEVEL 9
-
 #include <stdint.h>
 #include <device/pci_def.h>
-#include <cpu/p6/apic.h>
 #include <arch/io.h>
 #include <device/pnp.h>
 #include <arch/romcc_io.h>
+#include <arch/smp/lapic.h>
+#include "option_table.h"
+#include "pc80/mc146818rtc_early.c"
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
-#include "northbridge/amd/amdk8/early_ht.c"
+#include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/amd8111_early_smbus.c"
 #include "northbridge/amd/amdk8/raminit.h"
 #include "cpu/k8/apic_timer.c"
 #include "cpu/p6/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "debug.c"
+#include "northbridge/amd/amdk8/cpu_rev.c"
+#include "superio/NSC/pc87360/pc87360_early_serial.c"
+
+#define SIO_BASE 0x2e
+
+static void hard_reset(void)
+{
+       set_bios_reset();
+
+       /* enable cf9 */
+       pci_write_config8(PCI_DEV(0, 0x05, 3), 0x41, 0xf1);
+       /* reset */
+       outb(0x0e, 0x0cf9);
+}
+
+static void soft_reset(void)
+{
+       set_bios_reset();
+       pci_write_config8(PCI_DEV(0, 0x05, 0), 0x47, 1);
+}
 
 static void memreset_setup(void)
 {
+       if (is_cpu_pre_c0()) {
+               /* Set the memreset low */
+               outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 28);
+               /* Ensure the BIOS has control of the memory lines */
+               outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 29);
+       }
+       else {
+               /* Ensure the CPU has controll of the memory lines */
+               outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 29);
+       }
 }
 
 static void memreset(int controllers, const struct mem_controller *ctrl)
 {
+       if (is_cpu_pre_c0()) {
+               udelay(800);
+               /* Set memreset_high */
+               outb((0<<7)|(0<<6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 28);
+               udelay(90);
+       }
 }
 
 static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
@@ -36,62 +71,23 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
        return 0x00010101; /* default row entry */
 }
 
-static inline int spd_read_byte(unsigned device, unsigned address)
+static inline void activate_spd_rom(const struct mem_controller *ctrl)
 {
-       return smbus_read_byte(device, address);
+       /* nothing to do */
 }
 
-/* no specific code here. this should go away completely */
-static void coherent_ht_mainboard(unsigned cpus)
+static inline int spd_read_byte(unsigned device, unsigned address)
 {
+       return smbus_read_byte(device, address);
 }
 
-#include "northbridge/amd/amdk8/cpu_ldtstop.c"
-#include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
 #include "sdram/generic_sdram.c"
 
-static void enable_lapic(void)
-{
-
-       msr_t msr;
-       msr = rdmsr(0x1b);
-       msr.hi &= 0xffffff00;
-       msr.lo &= 0x000007ff;
-       msr.lo |= APIC_DEFAULT_BASE | (1 << 11);
-       wrmsr(0x1b, msr);
-}
-
-static void stop_this_cpu(void)
-{
-       unsigned apicid;
-       apicid = apic_read(APIC_ID) >> 24;
-
-       /* Send an APIC INIT to myself */
-       apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
-       apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT);
-       /* Wait for the ipi send to finish */
-       apic_wait_icr_idle();
-
-       /* Deassert the APIC INIT */
-       apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
-       apic_write(APIC_ICR,  APIC_INT_LEVELTRIG | APIC_DM_INIT);
-       /* Wait for the ipi send to finish */
-       apic_wait_icr_idle();
-
-       /* If I haven't halted spin forever */
-       for(;;) {
-               hlt();
-       }
-}
-
 static void main(void)
 {
-       /*
-        * GPIO28 of 8111 will control H0_MEMRESET_L
-        */
        static const struct mem_controller cpu[] = {
                {
                        .node_id = 0,
@@ -99,42 +95,72 @@ static void main(void)
                        .f1 = PCI_DEV(0, 0x18, 1),
                        .f2 = PCI_DEV(0, 0x18, 2),
                        .f3 = PCI_DEV(0, 0x18, 3),
-                       .channel0 = { (0xa<<3), (0xa<<3)|1, 0, 0 },
+                       .channel0 = { (0xa<<3)|0, (0xa<<3)|1, 0, 0 },
                        .channel1 = { 0, 0, 0, 0 },
                }
        };
-
+       int needs_reset;
+       enable_lapic();
+       init_timer();
        if (cpu_init_detected()) {
                asm("jmp __cpu_reset");
        }
-
        enable_lapic();
        init_timer();
-
+       distinguish_cpu_resets();
        if (!boot_cpu()) {
-               notify_bsp_ap_is_stopped();
+               print_err("This LinuxBIOS image is built for UP only.\n");
                stop_this_cpu();
        }
-
+       pc87360_enable_serial(SIO_BASE, TTYS0_BASE);
        uart_init();
        console_init();
        setup_default_resource_map();
-       setup_coherent_ht_domain();
-       enumerate_ht_chain(0);
-       distinguish_cpu_resets(0);
-       
+       needs_reset = setup_coherent_ht_domain();
+       needs_reset = ht_setup_chain(PCI_DEV(0, 0x18, 0), 0x80);
+       if (needs_reset) {
+               print_info("ht reset -");
+               soft_reset();
+       }
+#if 0
+       print_pci_devices();
+#endif
        enable_smbus();
-
+#if 0
+       dump_spd_registers(&cpu[0]);
+#endif
        memreset_setup();
-       sdram_initialize(1, cpu);
+       sdram_initialize(sizeof(cpu)/sizeof(cpu[0]), cpu);
+
+#if 0
+       dump_pci_devices();
+#endif
+#if 0
+       dump_pci_device(PCI_DEV(0, 0x18, 2));
+#endif
 
+       /* Check all of memory */
+#if 0
        msr_t msr;
        msr = rdmsr(TOP_MEM);
        print_debug("TOP_MEM: ");
        print_debug_hex32(msr.hi);
        print_debug_hex32(msr.lo);
        print_debug("\r\n");
-
+#endif
+#if 0
        ram_check(0x00000000, msr.lo);
-       
+#endif
+#if 0
+       static const struct {
+               unsigned long lo, hi;
+       } check_addrs[] = {
+               /* Check 16MB of memory @ 0*/
+               { 0x00000000, 0x01000000 },
+       };
+       int i;
+       for(i = 0; i < sizeof(check_addrs)/sizeof(check_addrs[0]); i++) {
+               ram_check(check_addrs[i].lo, check_addrs[i].hi);
+       }
+#endif
 }