[commit] r5552 - in trunk/src: mainboard/intel/d945gclf mainboard/kontron/986lcd-m mainboard/roda/rk886ex northbridge/intel/i945

[repository service]

Author: stepan
Date: Fri May 14 21:09:20 2010
New Revision: 5552
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5552

Log:
i945:
* fix some potential compiler issues with newer gccs
* add some more comments
* make 32bit accesses for feature test functions
* make some objects drivers because they contain a pci_driver struct.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/mainboard/intel/d945gclf/Makefile.inc
   trunk/src/mainboard/kontron/986lcd-m/Makefile.inc
   trunk/src/mainboard/kontron/986lcd-m/cmos.layout
   trunk/src/mainboard/kontron/986lcd-m/fadt.c
   trunk/src/mainboard/kontron/986lcd-m/romstage.c
   trunk/src/mainboard/roda/rk886ex/Makefile.inc
   trunk/src/mainboard/roda/rk886ex/cmos.layout
   trunk/src/mainboard/roda/rk886ex/romstage.c
   trunk/src/northbridge/intel/i945/early_init.c
   trunk/src/northbridge/intel/i945/i945.h
   trunk/src/northbridge/intel/i945/raminit.c
   trunk/src/northbridge/intel/i945/udelay.c

Modified: trunk/src/mainboard/intel/d945gclf/Makefile.inc
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/Makefile.inc	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/intel/d945gclf/Makefile.inc	Fri May 14 21:09:20 2010	(r5552)
@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

-obj-y += rtl8168.o
+driver-y += rtl8168.o

smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o

Modified: trunk/src/mainboard/kontron/986lcd-m/Makefile.inc
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Makefile.inc	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/kontron/986lcd-m/Makefile.inc	Fri May 14 21:09:20 2010	(r5552)
@@ -17,6 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

-obj-y += rtl8168.o
+driver-y += rtl8168.o

smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o

Modified: trunk/src/mainboard/kontron/986lcd-m/cmos.layout
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/cmos.layout	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/kontron/986lcd-m/cmos.layout	Fri May 14 21:09:20 2010	(r5552)
@@ -89,7 +89,8 @@

# coreboot config options: bootloader
 416        512       s       0        boot_devices
-#928         40       r       0        unused
+928          8       h       0        boot_default
+#936         12       r       0        unused

# coreboot config options: mainboard specific options
 948          2       e       8        cpufan_cruise_control

Modified: trunk/src/mainboard/kontron/986lcd-m/fadt.c
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/fadt.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/kontron/986lcd-m/fadt.c	Fri May 14 21:09:20 2010	(r5552)
@@ -89,16 +89,17 @@

fadt->flags = ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED |
    		ACPI_FADT_C2_MP_SUPPORTED | ACPI_FADT_SLEEP_BUTTON |
+			ACPI_FADT_RESET_REGISTER |
    		ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

- 	fadt->reset_reg.space_id = 0;
- 	fadt->reset_reg.bit_width = 0;
+ 	fadt->reset_reg.space_id = 1;
+ 	fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.resv = 0;
- 	fadt->reset_reg.addrl = 0x0;
- 	fadt->reset_reg.addrh = 0x0;
+ 	fadt->reset_reg.addrl = 0xcf9;
+ 	fadt->reset_reg.addrh = 0;

- 	fadt->reset_value = 0;
+ 	fadt->reset_value = 6;
    fadt->x_firmware_ctl_l = (unsigned long)facs;
    fadt->x_firmware_ctl_h = 0;
    fadt->x_dsdt_l = (unsigned long)dsdt;

Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/romstage.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/kontron/986lcd-m/romstage.c	Fri May 14 21:09:20 2010	(r5552)
@@ -367,6 +367,13 @@
    }

ich7_enable_lpc();
+
+	/* Force PCIRST# */
+	pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR);
+	udelay(200);
+	pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, 0);
+	udelay(200);
+
    early_superio_config_w83627thg();

/* Set up the console */
@@ -383,8 +390,9 @@
    report_bist_failure(bist);

if (MCHBAR16(SSKPD) == 0xCAFE) {
-		printk(BIOS_DEBUG, "soft reset detected.\n");
-		boot_mode = 1;
+		printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n");
+		outb(0x6, 0xcf9);
+		while (1) asm("hlt");
    }

/* Perform some early chipset initialization required

Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/Makefile.inc	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/roda/rk886ex/Makefile.inc	Fri May 14 21:09:20 2010	(r5552)
@@ -19,6 +19,6 @@

obj-y += m3885.o
 obj-y += ec.o
-obj-y += rtl8168.o
+driver-y += rtl8168.o

smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o

Modified: trunk/src/mainboard/roda/rk886ex/cmos.layout
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/cmos.layout	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/roda/rk886ex/cmos.layout	Fri May 14 21:09:20 2010	(r5552)
@@ -91,7 +91,8 @@

# coreboot config options: bootloader
 416        512       s       0        boot_devices
-#928         80       r       0        unused
+928          8       h       0        boot_default
+#936         48       r       0        unused

# coreboot config options: check sums
 984         16       h       0        check_sum

Modified: trunk/src/mainboard/roda/rk886ex/romstage.c
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/romstage.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/mainboard/roda/rk886ex/romstage.c	Fri May 14 21:09:20 2010	(r5552)
@@ -281,6 +281,10 @@
    }

ich7_enable_lpc();
+
+	/* Force PCIRST# */
+	pci_write_config16(PCI_DEV(0, 0x1e, 0), BCTRL, SBR);
+
    early_superio_config();

/* Set up the console */
@@ -297,8 +301,9 @@
    report_bist_failure(bist);

if (MCHBAR16(SSKPD) == 0xCAFE) {
-		printk(BIOS_DEBUG, "soft reset detected.\n");
-		boot_mode = 1;
+		printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n");
+		outb(0x6, 0xcf9);
+		while (1) asm("hlt");
    }

/* Perform some early chipset initialization required

Modified: trunk/src/northbridge/intel/i945/early_init.c
==============================================================================
--- trunk/src/northbridge/intel/i945/early_init.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/northbridge/intel/i945/early_init.c	Fri May 14 21:09:20 2010	(r5552)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2007-2009 coresystems GmbH
+ * Copyright (C) 2007-2010 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,7 +154,7 @@
    printk(BIOS_DEBUG, " done.\n");

printk(BIOS_DEBUG, "Disabling Watchdog reboot...");
-	RCBA32(GCS) = (RCBA32(0x3410)) | (1 << 5);	/* No reset */
+	RCBA32(GCS) = RCBA32(GCS) | (1 << 5);	/* No reset */
    outw((1 << 11), DEFAULT_PMBASE | 0x60 | 0x08);	/* halt timer */
    printk(BIOS_DEBUG, " done.\n");

@@ -344,8 +344,7 @@
 {
    u32 reg32;
    u32 timeout;
-
-	int activate_aspm = 1;
+	int activate_aspm = 1; /* hardcode ASPM for now */

printk(BIOS_DEBUG, "Setting up DMI RCRB\n");

@@ -481,10 +480,12 @@
    else
    	printk(BIOS_DEBUG, "ok\n");

+	/* Clear Error Status Bits! */
    DMIBAR32(0x1c4) = 0xffffffff;
    DMIBAR32(0x1d0) = 0xffffffff;
    DMIBAR32(0x228) = 0xffffffff;

+	/* Program Read-Only Write-Once Registers */
    DMIBAR32(0x308) = DMIBAR32(0x308);
    DMIBAR32(0x314) = DMIBAR32(0x314);
    DMIBAR32(0x324) = DMIBAR32(0x324);
@@ -500,7 +501,7 @@
    		reg32 |= (3 << 0);
    		DMIBAR32(0x224) = reg32;
    		outb(0x06, 0xcf9);
-			for (;;) ;	/* wait for reset */
+			for (;;) asm("hlt");	/* wait for reset */
    	}
    }
 }
@@ -530,11 +531,11 @@

/* First we reset the secondary bus */
    reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0x3e);
-	reg16 |= (1 << 6);
+	reg16 |= (1 << 6); /* SRESET */
    pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);
    /* Read back and clear reset bit. */
    reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0x3e);
-	reg16 &= ~(1 << 6);
+	reg16 &= ~(1 << 6); /* SRESET */
    pci_write_config16(PCI_DEV(0, 0x01, 0), 0x3e, reg16);

reg16 = pci_read_config16(PCI_DEV(0, 0x01, 0), 0xba);
@@ -625,9 +626,11 @@
    if (reg16 == 1) {
    	reg32 |= 0x32b;
    	// TODO
+		/* pcie_write_config32(PCI_DEV(0, 0x01, 0), 0x204, reg32); */
    } else if (reg16 == 16) {
    	reg32 |= 0x0f4;
    	// TODO
+		/* pcie_write_config32(PCI_DEV(0, 0x01, 0), 0x204, reg32); */
    }

reg32 = (pci_read_config32(PCI_DEV(0xa, 0, 0), 0x8) >> 8);
@@ -745,8 +748,8 @@
    if (i945_silicon_revision() <= 2 ) {
    	/* Set voltage specific parameters */
    	reg32 = pcie_read_config32(PCI_DEV(0, 0x01, 0), 0xe80);
-		reg32 &= (0xf << 4);
-		if ((MCHBAR32(0xe08) & (1 << 20)) == 0) {
+		reg32 &= (0xf << 4);	/* Default case 1.05V */
+		if ((MCHBAR32(0xe08) & (1 << 20)) == 0) {	/* 1.50V */
    		reg32 |= (7 << 4);
    	}
    	pcie_write_config32(PCI_DEV(0, 0x01, 0), 0xe80, reg32);
@@ -843,7 +846,12 @@
 {
    RCBA32(CG) |= (1 << 0);

+	/* Initialize slot power limit for root ports */
    pci_write_config32(PCI_DEV(0, 0x1c, 0), 0x54, 0x00000060);
+#if 0
+	pci_write_config32(PCI_DEV(0, 0x1c, 4), 0x54, 0x00480ce0);
+	pci_write_config32(PCI_DEV(0, 0x1c, 5), 0x54, 0x00500ce0);
+#endif

pci_write_config32(PCI_DEV(0, 0x1c, 0), 0xd8, 0x00110000);
 }
@@ -852,11 +860,11 @@
 {
    /* Print some chipset specific information */
    switch (pci_read_config32(PCI_DEV(0, 0x00, 0), 0)) {
-	case 0x27708086:
+	case 0x27708086: /* 82945G/GZ/GC/P/PL */
    	i945_detect_chipset();
    	break;
-	case 0x27a08086:
-	case 0x27ac8086:
+	case 0x27a08086: /* 945GME/GSE */
+	case 0x27ac8086: /* 945GM/PM/GMS/GU/GT, 943/940GML */
    	i945m_detect_chipset();
    	break;
    }

Modified: trunk/src/northbridge/intel/i945/i945.h
==============================================================================
--- trunk/src/northbridge/intel/i945/i945.h	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/northbridge/intel/i945/i945.h	Fri May 14 21:09:20 2010	(r5552)
@@ -331,5 +331,7 @@

#define DMIDRCCFG	0xeb4	/* 32bit */

+static inline void barrier(void) { asm("" ::: "memory"); }
+
 #endif
 #endif

Modified: trunk/src/northbridge/intel/i945/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/i945/raminit.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/northbridge/intel/i945/raminit.c	Fri May 14 21:09:20 2010	(r5552)
@@ -132,7 +132,7 @@
    return MAXIMUM_SUPPORTED_FREQUENCY;
 #endif

-	reg32 = pci_read_config32(PCI_DEV(0, 0x00, 0), 0xe4);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x00, 0), 0xe4); /* CAPID0 + 4 */
    reg32 &= (7 << 0);

switch (reg32) {
@@ -156,7 +156,7 @@
 {
    u32 reg32;

-	reg32 = pci_read_config8(PCI_DEV(0, 0x00,0), 0xe4);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x00,0), 0xe4); /* CAPID0 + 4 */
    reg32 >>= 25;
    reg32 &= 1;

@@ -172,7 +172,7 @@
 {
    u32 reg32;

-	reg32 = pci_read_config8(PCI_DEV(0, 0x00,0), 0xe4);
+	reg32 = pci_read_config32(PCI_DEV(0, 0x00,0), 0xe4); /* CAPID0 + 4 */
    reg32 >>= 24;
    reg32 &= 1;

@@ -205,7 +205,7 @@
 {
    u8 reg8;

-	reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5);
+	reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5); /* CAPID0 + 5 */
    reg8 &= (1 << 0);

return (reg8 != 0);
@@ -228,7 +228,7 @@
    return (reg8);
 }

-static void sdram_detect_errors(void)
+static void sdram_detect_errors(struct sys_info *sysinfo)
 {
    u8 reg8;
    u8 do_reset = 0;
@@ -269,6 +269,29 @@
    reg8 |= (1<<7);
    pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);

+	/* clear self refresh if not wake-up from suspend */
+	if (sysinfo->boot_path != 2) {
+		MCHBAR8(0xf14) |= 3;
+	} else {
+		/* Validate self refresh config */
+		if (((sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED) ||
+		     (sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED)) &&
+		    !(MCHBAR8(0xf14) & (1<<0))) {
+			do_reset = 1;
+		}
+		if (((sysinfo->dimm[2] != SYSINFO_DIMM_NOT_POPULATED) ||
+		     (sysinfo->dimm[3] != SYSINFO_DIMM_NOT_POPULATED)) &&
+		    !(MCHBAR8(0xf14) & (1<<1))) {
+			do_reset = 1;
+		}
+	}
+
+	if (do_reset) {
+		printk(BIOS_DEBUG, "Reset required.\n");
+		outb(0x00, 0xcf9);
+		outb(0x0e, 0xcf9);
+		for (;;) asm("hlt"); /* Wait for reset! */
+	}
 }

/**
@@ -1311,7 +1334,7 @@
    reg32 |= (1 << 6) | (1 << 4);
    MCHBAR32(DRTST) = reg32;

-	asm volatile ("nop; nop;");
+	asm volatile ("nop; nop;" ::: "memory");

reg32 = MCHBAR32(DRTST);

@@ -1890,6 +1913,7 @@
    	printk(BIOS_DEBUG, "Single Channel 0 only.\n");
    }

+	/* Now disable channel XORing */
    reg32 |= (1 << 10);

MCHBAR32(DCC) = reg32;
@@ -1960,7 +1984,7 @@
    	if (voltage == VOLTAGE_1_05)
    		freq = CRCLK_250MHz;
    	else
-			freq = CRCLK_400MHz;
+			freq = CRCLK_400MHz; /* 1.5V requires 400MHz */
    	break;
    case GFX_FREQUENCY_CAP_250MHZ: freq = CRCLK_250MHz; break;
    case GFX_FREQUENCY_CAP_200MHZ: freq = CRCLK_200MHz; break;
@@ -2096,7 +2120,7 @@
    clkcfg |= (1 << 10);
    MCHBAR32(CLKCFG) = clkcfg;

-	__asm__ __volatile__ (
+	asm volatile (
    	"	movl $0x100, %%ecx\n"
    	"delay_update:\n"
    	"	nop\n"
@@ -2106,7 +2130,7 @@
    	"	loop delay_update\n"
    	: /* No outputs */
    	: /* No inputs */
-		: "%ecx"
+		: "%ecx", "memory"
    	);

clkcfg &= ~(1 << 10);
@@ -2136,7 +2160,7 @@

0x08040120, 0x00000000,	/* DDR400 FSB533 */
    	0x00100401, 0x00000000, /* DDR533 FSB533 */
-		0xffffffff, 0xffffffff, /*  nonexistant  */
+		0x00010402, 0x00000000, /* DDR667 FSB533 - fake values */

0x04020120, 0x00000010,	/* DDR400 FSB667 */
    	0x10040280, 0x00000040, /* DDR533 FSB667 */
@@ -2615,6 +2639,7 @@
     * 0x30/0x32.
     */

+	/* TODO This is not implemented yet. Volunteers? */
 }

static void sdram_save_receive_enable(void)
@@ -3007,8 +3032,6 @@
    struct sys_info sysinfo;
    u8 reg8, cas_mask;

-	sdram_detect_errors();
-
    printk(BIOS_DEBUG, "Setting up RAM controller.\n");

memset(&sysinfo, 0, sizeof(sysinfo));
@@ -3018,6 +3041,9 @@
    /* Look at the type of DIMMs and verify all DIMMs are x8 or x16 width */
    sdram_get_dram_configuration(&sysinfo);

+	/* If error, do cold boot */
+	sdram_detect_errors(&sysinfo);
+
    /* Check whether we have stacked DIMMs */
    sdram_verify_package_type(&sysinfo);

Modified: trunk/src/northbridge/intel/i945/udelay.c
==============================================================================
--- trunk/src/northbridge/intel/i945/udelay.c	Fri May 14 19:15:57 2010	(r5551)
+++ trunk/src/northbridge/intel/i945/udelay.c	Fri May 14 21:09:20 2010	(r5552)
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

+#include <delay.h>
 #include <cpu/x86/tsc.h>
 #include <cpu/x86/msr.h>

@@ -24,7 +25,7 @@
  * Intel Core(tm) cpus always run the TSC at the maximum possible CPU clock
  */

-static void udelay(u32 us)
+void udelay(u32 us)
 {
    u32 dword;
    tsc_t tsc, tsc1, tscd;