Next patch set. Index: northbridge/intel/i945/Makefile add errata.c Index: northbridge/intel/i945/stage1.c remove initram functions. Index: northbridge/intel/i945/errata.c make it build. Index: northbridge/intel/i945/pcie_config.h It's a .h not a .c Index: northbridge/intel/i945/pcie_config.c It's a .h not a .c Index: northbridge/intel/i945/raminit.c add functions for initram; add attribute for gcc issue Index: mainboard/kontron/986lcd-m/stage1.c make function global. This is mainboard-dependent hence is here. Index: mainboard/kontron/986lcd-m/mainboard.h Add defines for this mainboard. Index: southbridge/intel/i82801gx/smbus.c Remove useless, broken smbus ops that read an i2c that we never need to read in stage2. Index: southbridge/intel/i82801gx/lpc.c handle power on after power fail. Signed-off-by: Ronald G. Minnich Index: southbridge/intel/i82801gx/lpc.c =================================================================== --- southbridge/intel/i82801gx/lpc.c (revision 1026) +++ southbridge/intel/i82801gx/lpc.c (working copy) @@ -128,6 +128,9 @@ { u8 reg8; u16 reg16; +#ifndef MAINBOARD_POWER_ON_AFTER_POWER_FAIL +#define MAINBOARD_POWER_ON_AFTER_POWER_FAIL 1 +#endif int pwr_on=MAINBOARD_POWER_ON_AFTER_POWER_FAIL; int nmi_option; Index: southbridge/intel/i82801gx/smbus.c =================================================================== --- southbridge/intel/i82801gx/smbus.c (revision 1025) +++ southbridge/intel/i82801gx/smbus.c (working copy) @@ -30,21 +30,6 @@ #include #include "i82801gx.h" #include "i82801gx_smbus.h" - -int smbus_read_byte(struct bus *bus, struct device * dev, u8 address) -{ - u16 device; - struct resource *res; - - device = dev->path.u.i2c.device; - res = find_resource(bus->dev, 0x20); - - return do_smbus_read_byte(res->base, device, address); -} - -static struct smbus_bus_operations lops_smbus_bus = { - .read_byte = smbus_read_byte, -}; void i82801gx_enable(struct device * dev); /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */ @@ -59,6 +44,5 @@ .phase4_set_resources = pci_dev_set_resources, .phase5_enable_resources = pci_dev_enable_resources, .ops_pci = &pci_dev_ops_pci, - .ops_smbus_bus = &lops_smbus_bus, }; Index: mainboard/kontron/986lcd-m/mainboard.h =================================================================== --- mainboard/kontron/986lcd-m/mainboard.h (revision 1026) +++ mainboard/kontron/986lcd-m/mainboard.h (working copy) @@ -30,4 +30,4 @@ /* nowhere else to go yet */ #define TEST_SMM_FLASH_LOCKDOWN 0 -#define MAINBOARD_POWER_ON_AFTER_POWER_FAIL 1 \ No newline at end of file + Index: mainboard/kontron/986lcd-m/stage1.c =================================================================== --- mainboard/kontron/986lcd-m/stage1.c (revision 1020) +++ mainboard/kontron/986lcd-m/stage1.c (working copy) @@ -49,7 +49,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627THG_SP1) #include "northbridge/intel/i945/ich7.h" -static void setup_ich7_gpios(void) +void setup_ich7_gpios(void) { /* TODO: This is highly board specific and should be moved */ printk(BIOS_DEBUG, " GPIOS..."); Index: northbridge/intel/i945/raminit.c =================================================================== --- northbridge/intel/i945/raminit.c (revision 1023) +++ northbridge/intel/i945/raminit.c (working copy) @@ -34,6 +34,7 @@ #include #include "raminit.h" #include "i945.h" +#include "pcie_config.h" //#include "lib/memset.c" @@ -867,7 +868,8 @@ 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; - static const u32 const * const dual_channel_slew_group_lookup[] = { + static const u32 const * const dual_channel_slew_group_lookup[] + __attribute__ ((used,__section__(".rodata")))= { dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, dq2030, cmd3210, nc, ctl3215, nc, clk2030, dq2030, cmd3210, @@ -898,7 +900,8 @@ nc, nc, ctl3215, nc, clk2030, clk2030, dq2030, cmd2710 }; - static const u32 const * const single_channel_slew_group_lookup[] = { + static const u32 const * const single_channel_slew_group_lookup[] + __attribute__ ((used,__section__(".rodata")))= { dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, dq2330, cmd3210, nc, ctl3215, nc, clk2030, dq2330, cmd3210, @@ -2646,6 +2649,545 @@ MCHBAR32(SLPCTL) |= (1 << 8); } +static void i945_detect_chipset(void) +{ + u8 reg8; + + printk(BIOS_INFO, "\n"); + reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe7) & 0x70) >> 4; + switch (reg8) { + case 1: + printk(BIOS_INFO, "Mobile Intel(R) 945GM/GME Express"); + break; + case 2: + printk(BIOS_INFO, "Mobile Intel(R) 945GMS/GU Express"); + break; + case 3: + printk(BIOS_INFO, "Mobile Intel(R) 945PM Express"); + break; + case 5: + printk(BIOS_INFO, "Intel(R) 945GT Express"); + break; + case 6: + printk(BIOS_INFO, "Mobile Intel(R) 943/940GML Express"); + break; + default: + printk(BIOS_INFO, "Unknown (%02x)", reg8); /* Others reserved. */ + } + printk(BIOS_INFO, " Chipset\n"); + + printk(BIOS_DEBUG, "(G)MCH capable of up to FSB "); + reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe3) & 0xe0) >> 5; + switch (reg8) { + case 2: + printk(BIOS_DEBUG, "800 MHz"); /* According to 965 spec */ + break; + case 3: + printk(BIOS_DEBUG, "667 MHz"); + break; + case 4: + printk(BIOS_DEBUG, "533 MHz"); + break; + default: + printk(BIOS_DEBUG, "N/A MHz (%02x)", reg8); + } + printk(BIOS_DEBUG, "\n"); + + printk(BIOS_DEBUG, "(G)MCH capable of "); + reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe4) & 0x07); + switch (reg8) { + case 2: + printk(BIOS_DEBUG, "up to DDR2-667"); + break; + case 3: + printk(BIOS_DEBUG, "up to DDR2-533"); + break; + case 4: + printk(BIOS_DEBUG, "DDR2-400"); + break; + default: + printk(BIOS_INFO, "unknown max. RAM clock (%02x).", reg8); /* Others reserved. */ + } + printk(BIOS_DEBUG, "\n"); +} + +static void i945_setup_bars(void) +{ + u8 reg8; + void setup_ich7_gpios(void); + /* As of now, we don't have all the A0 workarounds implemented */ + if (i945_silicon_revision() == 0) + printk(BIOS_INFO, "Warning: i945 silicon revision A0 might not work correctly.\n"); + + /* Setting up Southbridge. In the northbridge code. */ + printk(BIOS_DEBUG, "Setting up static southbridge registers..."); + pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), RCBA, DEFAULT_RCBA | 1); + + pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1); + pci_conf1_write_config8(PCI_BDF(0, 0x1f, 0), 0x44 /* ACPI_CNTL */ , 0x80); /* Enable ACPI BAR */ + + pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1); + pci_conf1_write_config8(PCI_BDF(0, 0x1f, 0), 0x4c /* GC */ , 0x10); /* Enable GPIOs */ + setup_ich7_gpios(); + printk(BIOS_DEBUG, " done.\n"); + + printk(BIOS_DEBUG, "Disabling Watchdog reboot..."); + RCBA32(GCS) = (RCBA32(0x3410)) | (1 << 5); /* No reset */ + outw((1 << 11), DEFAULT_PMBASE | 0x60 | 0x08); /* halt timer */ + printk(BIOS_DEBUG, " done.\n"); + + printk(BIOS_DEBUG, "Setting up static northbridge registers..."); + /* Set up all hardcoded northbridge BARs */ + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), EPBAR, DEFAULT_EPBAR | 1); + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), MCHBAR, DEFAULT_MCHBAR | 1); + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), PCIEXBAR, DEFAULT_PCIEXBAR | 5); /* 64MB - busses 0-63 */ + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), DMIBAR, DEFAULT_DMIBAR | 1); + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), X60BAR, DEFAULT_X60BAR | 1); + + /* Hardware default is 8MB UMA. If someone wants to make this a + * CMOS or compile time option, send a patch. + * pci_conf1_write_config16(PCI_BDF(0, 0x00, 0), GGC, 0x30); + */ + + /* Set C0000-FFFFF to access RAM on both reads and writes */ + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM0, 0x30); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM1, 0x33); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM2, 0x33); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM3, 0x33); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM4, 0x33); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM5, 0x33); + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM6, 0x33); + + pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), TOLUD, 0x40); /* 1G XXX dynamic! */ + + pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), SKPAD, 0xcafebabe); + printk(BIOS_DEBUG, " done.\n"); + + /* Wait for MCH BAR to come up */ + printk(BIOS_DEBUG, "Waiting for MCHBAR to come up..."); + if ((pci_conf1_read_config8(PCI_BDF(0, 0x0f, 0), 0xe6) & 0x2) == 0x00) { /* Bit 49 of CAPID0 */ + do { + reg8 = *(volatile u8 *)0xfed40000; + } while (!(reg8 & 0x80)); + } + printk(BIOS_DEBUG, "ok\n"); +} + +static void i945_setup_egress_port(void) +{ + u32 reg32; + u32 timeout; + + printk(BIOS_DEBUG, "Setting up Egress Port RCRB\n"); + + /* Egress Port Virtual Channel 0 Configuration */ + + /* map only TC0 to VC0 */ + reg32 = EPBAR32(EPVC0RCTL); + reg32 &= 0xffffff01; + EPBAR32(EPVC0RCTL) = reg32; + + + reg32 = EPBAR32(EPPVCCAP1); + reg32 &= ~(7 << 0); + reg32 |= 1; + EPBAR32(EPPVCCAP1) = reg32; + + /* Egress Port Virtual Channel 1 Configuration */ + reg32 = EPBAR32(0x2c); + reg32 &= 0xffffff00; + if ((MCHBAR32(CLKCFG) & 7) == 1) + reg32 |= 0x0d; /* 533MHz */ + if ((MCHBAR32(CLKCFG) & 7) == 3) + reg32 |= 0x10; /* 667MHz */ + EPBAR32(0x2c) = reg32; + + EPBAR32(EPVC1MTS) = 0x0a0a0a0a; + + reg32 = EPBAR32(EPVC1RCAP); + reg32 &= ~(0x7f << 16); + reg32 |= (0x0a << 16); + EPBAR32(EPVC1RCAP) = reg32; + + if ((MCHBAR32(CLKCFG) & 7) == 1) { /* 533MHz */ + EPBAR32(EPVC1IST + 0) = 0x009c009c; + EPBAR32(EPVC1IST + 4) = 0x009c009c; + } + + if ((MCHBAR32(CLKCFG) & 7) == 3) { /* 667MHz */ + EPBAR32(EPVC1IST + 0) = 0x00c000c0; + EPBAR32(EPVC1IST + 4) = 0x00c000c0; + } + + /* Is internal graphics enabled? */ + if (pci_conf1_read_config8(PCI_BDF(0, 0x0, 0), 54) & ((1 << 4) | (1 << 3))) { /* DEVEN */ + MCHBAR32(MMARB1) |= (1 << 17); + } + + /* Assign Virtual Channel ID 1 to VC1 */ + reg32 = EPBAR32(EPVC1RCTL); + reg32 &= ~(7 << 24); + reg32 |= (1 << 24); + EPBAR32(EPVC1RCTL) = reg32; + + reg32 = EPBAR32(EPVC1RCTL); + reg32 &= 0xffffff01; + reg32 |= (1 << 7); + EPBAR32(EPVC1RCTL) = reg32; + + EPBAR32(PORTARB + 0x00) = 0x01000001; + EPBAR32(PORTARB + 0x04) = 0x00040000; + EPBAR32(PORTARB + 0x08) = 0x00001000; + EPBAR32(PORTARB + 0x0c) = 0x00000040; + EPBAR32(PORTARB + 0x10) = 0x01000001; + EPBAR32(PORTARB + 0x14) = 0x00040000; + EPBAR32(PORTARB + 0x18) = 0x00001000; + EPBAR32(PORTARB + 0x1c) = 0x00000040; + + EPBAR32(EPVC1RCTL) |= (1 << 16); + EPBAR32(EPVC1RCTL) |= (1 << 16); + + printk(BIOS_DEBUG, "Loading port arbitration table ..."); + /* Loop until bit 0 becomes 0 */ + timeout = 0x7fffff; + while ((EPBAR16(EPVC1RSTS) & 1) && --timeout) ; + if (!timeout) + printk(BIOS_DEBUG, "timeout!\n"); + else + printk(BIOS_DEBUG, "ok\n"); + + /* Now enable VC1 */ + EPBAR32(EPVC1RCTL) |= (1 << 31); + + printk(BIOS_DEBUG, "Wait for VC1 negotiation ..."); + /* Wait for VC1 negotiation pending */ + timeout = 0x7fff; + while ((EPBAR16(EPVC1RSTS) & (1 << 1)) && --timeout) ; + if (!timeout) + printk(BIOS_DEBUG, "timeout!\n"); + else + printk(BIOS_DEBUG, "ok\n"); + +} + +static void ich7_setup_dmi_rcrb(void) +{ + u16 reg16; + + + reg16 = RCBA16(LCTL); + reg16 &= ~(3 << 0); + reg16 |= 1; + RCBA16(LCTL) = reg16; + + RCBA32(V0CTL) = 0x80000001; + RCBA32(V1CAP) = 0x03128010; + RCBA32(ESD) = 0x00000810; + RCBA32(RP1D) = 0x01000003; + RCBA32(RP2D) = 0x02000002; + RCBA32(RP3D) = 0x03000002; + RCBA32(RP4D) = 0x04000002; + RCBA32(HDD) = 0x0f000003; + RCBA32(RP5D) = 0x05000002; + + RCBA32(RPFN) = 0x00543210; + + pci_conf1_write_config16(PCI_BDF(0, 0x1c, 0), 0x42, 0x0141); + pci_conf1_write_config16(PCI_BDF(0, 0x1c, 4), 0x42, 0x0141); + pci_conf1_write_config16(PCI_BDF(0, 0x1c, 5), 0x42, 0x0141); + + pci_conf1_write_config32(PCI_BDF(0, 0x1c, 4), 0x54, 0x00480ce0); + pci_conf1_write_config32(PCI_BDF(0, 0x1c, 5), 0x54, 0x00500ce0); +} + +static void i945_setup_dmi_rcrb(void) +{ + u32 reg32; + u32 timeout; + + printk(BIOS_DEBUG, "Setting up DMI RCRB\n"); + + /* Virtual Channel 0 Configuration */ + reg32 = DMIBAR32(DMIVC0RCTL0); + reg32 &= 0xffffff01; + DMIBAR32(DMIVC0RCTL0) = reg32; + + reg32 = DMIBAR32(DMIPVCCAP1); + reg32 &= ~(7 << 0); + reg32 |= 1; + DMIBAR32(DMIPVCCAP1) = reg32; + + reg32 = DMIBAR32(DMIVC1RCTL); + reg32 &= ~(7 << 24); + reg32 |= (1 << 24); /* NOTE: This ID must match ICH7 side */ + DMIBAR32(DMIVC1RCTL) = reg32; + + reg32 = DMIBAR32(DMIVC1RCTL); + reg32 &= 0xffffff01; + reg32 |= (1 << 7); + DMIBAR32(DMIVC1RCTL) = reg32; + + /* Now enable VC1 */ + DMIBAR32(DMIVC1RCTL) |= (1 << 31); + + printk(BIOS_DEBUG, "Wait for VC1 negotiation ..."); + /* Wait for VC1 negotiation pending */ + timeout = 0x7ffff; + while ((DMIBAR16(DMIVC1RSTS) & (1 << 1)) && --timeout) ; + if (!timeout) + printk(BIOS_DEBUG, "timeout!\n"); + else + printk(BIOS_DEBUG, "done..\n"); +#if 1 + /* Enable Active State Power Management (ASPM) L0 state */ + + reg32 = DMIBAR32(DMILCAP); + reg32 &= ~(7 << 12); + reg32 |= (2 << 12); + + reg32 &= ~(7 << 15); + + reg32 |= (2 << 15); + DMIBAR32(DMILCAP) = reg32; + + reg32 = DMIBAR32(DMICC); + reg32 &= 0x00ffffff; + reg32 &= ~(3 << 0); + reg32 |= (1 << 0); + DMIBAR32(DMICC) = reg32; + + if (0) { + DMIBAR32(DMILCTL) |= (3 << 0); + } +#endif + + /* Last but not least, some additional steps */ + reg32 = MCHBAR32(FSBSNPCTL); + reg32 &= ~(0xff << 2); + reg32 |= (0xaa << 2); + MCHBAR32(FSBSNPCTL) = reg32; + + DMIBAR32(0x2c) = 0x86000040; + + reg32 = DMIBAR32(0x204); + reg32 &= ~0x3ff; +#if 1 + reg32 |= 0x13f; /* for x4 DMI only */ +#else + reg32 |= 0x1e4; /* for x2 DMI only */ +#endif + DMIBAR32(0x204) = reg32; + + if (pci_conf1_read_config8(PCI_BDF(0, 0x0, 0), 54) & ((1 << 4) | (1 << 3))) { /* DEVEN */ + DMIBAR32(0x200) |= (1 << 21); + } else { + DMIBAR32(0x200) &= ~(1 << 21); + } + + reg32 = DMIBAR32(0x204); + reg32 &= ~((1 << 11) | (1 << 10)); + DMIBAR32(0x204) = reg32; + + reg32 = DMIBAR32(0x204); + reg32 &= ~(0xff << 12); + reg32 |= (0x0d << 12); + DMIBAR32(0x204) = reg32; + + DMIBAR32(DMICTL1) |= (3 << 24); + + reg32 = DMIBAR32(0x200); + reg32 &= ~(0x3 << 26); + reg32 |= (0x02 << 26); + DMIBAR32(0x200) = reg32; + + DMIBAR32(DMIDRCCFG) &= ~(1 << 31); + DMIBAR32(DMICTL2) |= (1 << 31); + + if (i945_silicon_revision() >= 3) { + reg32 = DMIBAR32(0xec0); + reg32 &= 0x0fffffff; + reg32 |= (2 << 28); + DMIBAR32(0xec0) = reg32; + + reg32 = DMIBAR32(0xed4); + reg32 &= 0x0fffffff; + reg32 |= (2 << 28); + DMIBAR32(0xed4) = reg32; + + reg32 = DMIBAR32(0xee8); + reg32 &= 0x0fffffff; + reg32 |= (2 << 28); + DMIBAR32(0xee8) = reg32; + + reg32 = DMIBAR32(0xefc); + reg32 &= 0x0fffffff; + reg32 |= (2 << 28); + DMIBAR32(0xefc) = reg32; + } + + /* wait for bit toggle to 0 */ + printk(BIOS_DEBUG, "Waiting for DMI hardware..."); + timeout = 0x7fffff; + while ((DMIBAR8(0x32) & (1 << 1)) && --timeout) ; + if (!timeout) + printk(BIOS_DEBUG, "timeout!\n"); + else + printk(BIOS_DEBUG, "ok\n"); + + DMIBAR32(0x1c4) = 0xffffffff; + DMIBAR32(0x1d0) = 0xffffffff; + DMIBAR32(0x228) = 0xffffffff; + + DMIBAR32(0x308) = DMIBAR32(0x308); + DMIBAR32(0x314) = DMIBAR32(0x314); + DMIBAR32(0x324) = DMIBAR32(0x324); + DMIBAR32(0x328) = DMIBAR32(0x328); + DMIBAR32(0x338) = DMIBAR32(0x334); + DMIBAR32(0x338) = DMIBAR32(0x338); + + if (i945_silicon_revision() == 1 && ((MCHBAR8(0xe08) & (1 << 5)) == 1)) { + if ((MCHBAR32(0x214) & 0xf) != 0x3) { + printk(BIOS_INFO, "DMI link requires A1 stepping workaround. Rebooting.\n"); + reg32 = MCHBAR32(MMARB1); + reg32 &= 0xfffffff8; + reg32 |= 3; + outb(0x06, 0xcf9); + for (;;) ; /* wait for reset */ + } + } +} + +static void i945_setup_pci_express_x16(void) +{ + u32 timeout; + u32 reg32; + u16 reg16; + u8 reg8; + + /* For now we just disable the x16 link */ + printk(BIOS_DEBUG, "Disabling PCI Express x16 Link\n"); + + MCHBAR16(UPMC1) |= (1 << 5) | (1 << 0); + + reg8 = pcie_read_config8(PCI_BDF(0, 0x01, 0), BCTRL1); + reg8 |= (1 << 6); + pcie_write_config8(PCI_BDF(0, 0x01, 0), BCTRL1, reg8); + + reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x224); + reg32 |= (1 << 8); + pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x224, reg32); + + reg8 = pcie_read_config8(PCI_BDF(0, 0x01, 0), BCTRL1); + reg8 &= ~(1 << 6); + pcie_write_config8(PCI_BDF(0, 0x01, 0), BCTRL1, reg8); + + printk(BIOS_DEBUG, "Wait for link to enter detect state... "); + timeout = 0x7fffff; + for (reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x214); + (reg32 & 0x000f0000) && --timeout;) ; + if (!timeout) + printk(BIOS_DEBUG, "timeout!\n"); + else + printk(BIOS_DEBUG, "ok\n"); + + /* Finally: Disable the PCI config header */ + reg16 = pci_conf1_read_config16(PCI_BDF(0, 0x00, 0), DEVEN); + reg16 &= ~DEVEN_D1F0; + pci_conf1_write_config16(PCI_BDF(0, 0x00, 0), DEVEN, reg16); +} + +static void i945_setup_root_complex_topology(void) +{ + u32 reg32; + + printk(BIOS_DEBUG, "Setting up Root Complex Topology\n"); + /* Egress Port Root Topology */ + reg32 = EPBAR32(EPESD); + reg32 &= 0xff00ffff; + reg32 |= (1 << 16); + EPBAR32(EPESD) = reg32; + + EPBAR32(EPLE1D) |= (1 << 0); + + EPBAR32(EPLE1A) = DEFAULT_PCIEXBAR + 0x4000; + + EPBAR32(EPLE2D) |= (1 << 0); + + /* DMI Port Root Topology */ + reg32 = DMIBAR32(DMILE1D); + reg32 &= 0x00ffffff; + DMIBAR32(DMILE1D) = reg32; + + reg32 = DMIBAR32(DMILE1D); + reg32 &= 0xff00ffff; + reg32 |= (2 << 16); + DMIBAR32(DMILE1D) = reg32; + + DMIBAR32(DMILE1D) |= (1 << 0); + + DMIBAR32(DMILE1A) = DEFAULT_PCIEXBAR + 0x8000; + + DMIBAR32(DMILE2D) |= (1 << 0); + + DMIBAR32(DMILE2A) = DEFAULT_PCIEXBAR + 0x5000; + + /* PCI Express x16 Port Root Topology */ + if (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), DEVEN) & DEVEN_D1F0) { + pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x158, + DEFAULT_PCIEXBAR + 0x5000); + + reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x150); + reg32 |= (1 << 0); + pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x150, reg32); + } +} + +static void ich7_setup_root_complex_topology(void) +{ + RCBA32(0x104) = 0x00000802; + RCBA32(0x110) = 0x00000001; + RCBA32(0x114) = 0x00000000; + RCBA32(0x118) = 0x00000000; +} + +static void ich7_setup_pci_express(void) +{ + RCBA32(CG) |= (1 << 0); + + pci_conf1_write_config32(PCI_BDF(0, 0x1c, 0), 0x54, 0x00000060); + + pci_conf1_write_config32(PCI_BDF(0, 0x1c, 0), 0xd8, 0x00110000); +} + +void i945_early_initialization(void) +{ + /* Print some chipset specific information */ + i945_detect_chipset(); + + /* Setup all BARs required for early PCIe and raminit */ + i945_setup_bars(); + + /* Change port80 to LPC */ + RCBA32(GCS) &= (~0x04); +} + +void i945_late_initialization(void) +{ + i945_setup_egress_port(); + + ich7_setup_root_complex_topology(); + + ich7_setup_pci_express(); + + ich7_setup_dmi_rcrb(); + + i945_setup_dmi_rcrb(); + + i945_setup_pci_express_x16(); + + i945_setup_root_complex_topology(); +} + #define BOOT_MODE_RESUME 1 #define BOOT_MODE_NORMAL 0 Index: northbridge/intel/i945/pcie_config.c =================================================================== --- northbridge/intel/i945/pcie_config.c (revision 1019) +++ northbridge/intel/i945/pcie_config.c (working copy) @@ -1,68 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2008 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 - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "i945.h" - -static inline __attribute__ ((always_inline)) -u8 pcie_read_config8(device_t dev, unsigned int where) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - return read8(addr); -} - -static inline __attribute__ ((always_inline)) -u16 pcie_read_config16(device_t dev, unsigned int where) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - return read16(addr); -} - -static inline __attribute__ ((always_inline)) -u32 pcie_read_config32(device_t dev, unsigned int where) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - return read32(addr); -} - -static inline __attribute__ ((always_inline)) -void pcie_write_config8(device_t dev, unsigned int where, u8 value) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - write8(addr, value); -} - -static inline __attribute__ ((always_inline)) -void pcie_write_config16(device_t dev, unsigned int where, u16 value) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - write16(addr, value); -} - -static inline __attribute__ ((always_inline)) -void pcie_write_config32(device_t dev, unsigned int where, u32 value) -{ - unsigned long addr; - addr = DEFAULT_PCIEXBAR | dev | where; - write32(addr, value); -} Index: northbridge/intel/i945/pcie_config.h =================================================================== --- northbridge/intel/i945/pcie_config.h (revision 1019) +++ northbridge/intel/i945/pcie_config.h (working copy) @@ -17,52 +17,52 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "i945.h" +#include static inline __attribute__ ((always_inline)) -u8 pcie_read_config8(device_t dev, unsigned int where) +u8 pcie_read_config8(u32 dev, unsigned int where) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - return read8(addr); + return readb((void *)addr); } static inline __attribute__ ((always_inline)) -u16 pcie_read_config16(device_t dev, unsigned int where) +u16 pcie_read_config16(u32 dev, unsigned int where) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - return read16(addr); + return readw((void *)addr); } static inline __attribute__ ((always_inline)) -u32 pcie_read_config32(device_t dev, unsigned int where) +u32 pcie_read_config32(u32 dev, unsigned int where) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - return read32(addr); + return readl((void *)addr); } static inline __attribute__ ((always_inline)) -void pcie_write_config8(device_t dev, unsigned int where, u8 value) +void pcie_write_config8(u32 dev, unsigned int where, u8 value) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - write8(addr, value); + writeb(value, (void *)addr); } static inline __attribute__ ((always_inline)) -void pcie_write_config16(device_t dev, unsigned int where, u16 value) +void pcie_write_config16(u32 dev, unsigned int where, u16 value) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - write16(addr, value); + writew(value, (void *)addr); } static inline __attribute__ ((always_inline)) -void pcie_write_config32(device_t dev, unsigned int where, u32 value) +void pcie_write_config32(u32 dev, unsigned int where, u32 value) { unsigned long addr; addr = DEFAULT_PCIEXBAR | dev | where; - write32(addr, value); + writel(value, (void *)addr); } Index: northbridge/intel/i945/errata.c =================================================================== --- northbridge/intel/i945/errata.c (revision 1019) +++ northbridge/intel/i945/errata.c (working copy) @@ -17,6 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "raminit.h" +#include "i945.h" +#include "pcie_config.h" + int fixup_i945_errata(void) { u32 reg32; Index: northbridge/intel/i945/stage1.c =================================================================== --- northbridge/intel/i945/stage1.c (revision 1023) +++ northbridge/intel/i945/stage1.c (working copy) @@ -33,543 +33,4 @@ #include #include "i945.h" -static void i945_detect_chipset(void) -{ - u8 reg8; - - printk(BIOS_INFO, "\n"); - reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe7) & 0x70) >> 4; - switch (reg8) { - case 1: - printk(BIOS_INFO, "Mobile Intel(R) 945GM/GME Express"); - break; - case 2: - printk(BIOS_INFO, "Mobile Intel(R) 945GMS/GU Express"); - break; - case 3: - printk(BIOS_INFO, "Mobile Intel(R) 945PM Express"); - break; - case 5: - printk(BIOS_INFO, "Intel(R) 945GT Express"); - break; - case 6: - printk(BIOS_INFO, "Mobile Intel(R) 943/940GML Express"); - break; - default: - printk(BIOS_INFO, "Unknown (%02x)", reg8); /* Others reserved. */ - } - printk(BIOS_INFO, " Chipset\n"); - - printk(BIOS_DEBUG, "(G)MCH capable of up to FSB "); - reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe3) & 0xe0) >> 5; - switch (reg8) { - case 2: - printk(BIOS_DEBUG, "800 MHz"); /* According to 965 spec */ - break; - case 3: - printk(BIOS_DEBUG, "667 MHz"); - break; - case 4: - printk(BIOS_DEBUG, "533 MHz"); - break; - default: - printk(BIOS_DEBUG, "N/A MHz (%02x)", reg8); - } - printk(BIOS_DEBUG, "\n"); - - printk(BIOS_DEBUG, "(G)MCH capable of "); - reg8 = (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), 0xe4) & 0x07); - switch (reg8) { - case 2: - printk(BIOS_DEBUG, "up to DDR2-667"); - break; - case 3: - printk(BIOS_DEBUG, "up to DDR2-533"); - break; - case 4: - printk(BIOS_DEBUG, "DDR2-400"); - break; - default: - printk(BIOS_INFO, "unknown max. RAM clock (%02x).", reg8); /* Others reserved. */ - } - printk(BIOS_DEBUG, "\n"); -} - -static void i945_setup_bars(void) -{ - u8 reg8; - - /* As of now, we don't have all the A0 workarounds implemented */ - if (i945_silicon_revision() == 0) - printk_info - ("Warning: i945 silicon revision A0 might not work correctly.\n"); - - /* Setting up Southbridge. In the northbridge code. */ - printk(BIOS_DEBUG, "Setting up static southbridge registers..."); - pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), RCBA, DEFAULT_RCBA | 1); - - pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), PMBASE, DEFAULT_PMBASE | 1); - pci_conf1_write_config8(PCI_BDF(0, 0x1f, 0), 0x44 /* ACPI_CNTL */ , 0x80); /* Enable ACPI BAR */ - - pci_conf1_write_config32(PCI_BDF(0, 0x1f, 0), GPIOBASE, DEFAULT_GPIOBASE | 1); - pci_conf1_write_config8(PCI_BDF(0, 0x1f, 0), 0x4c /* GC */ , 0x10); /* Enable GPIOs */ - setup_ich7_gpios(); - printk(BIOS_DEBUG, " done.\n"); - - printk(BIOS_DEBUG, "Disabling Watchdog reboot..."); - RCBA32(GCS) = (RCBA32(0x3410)) | (1 << 5); /* No reset */ - outw((1 << 11), DEFAULT_PMBASE | 0x60 | 0x08); /* halt timer */ - printk(BIOS_DEBUG, " done.\n"); - - printk(BIOS_DEBUG, "Setting up static northbridge registers..."); - /* Set up all hardcoded northbridge BARs */ - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), EPBAR, DEFAULT_EPBAR | 1); - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), MCHBAR, DEFAULT_MCHBAR | 1); - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), PCIEXBAR, DEFAULT_PCIEXBAR | 5); /* 64MB - busses 0-63 */ - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), DMIBAR, DEFAULT_DMIBAR | 1); - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), X60BAR, DEFAULT_X60BAR | 1); - - /* Hardware default is 8MB UMA. If someone wants to make this a - * CMOS or compile time option, send a patch. - * pci_conf1_write_config16(PCI_BDF(0, 0x00, 0), GGC, 0x30); - */ - - /* Set C0000-FFFFF to access RAM on both reads and writes */ - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM0, 0x30); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM1, 0x33); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM2, 0x33); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM3, 0x33); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM4, 0x33); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM5, 0x33); - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), PAM6, 0x33); - - pci_conf1_write_config8(PCI_BDF(0, 0x00, 0), TOLUD, 0x40); /* 1G XXX dynamic! */ - - pci_conf1_write_config32(PCI_BDF(0, 0x00, 0), SKPAD, 0xcafebabe); - printk(BIOS_DEBUG, " done.\n"); - - /* Wait for MCH BAR to come up */ - printk(BIOS_DEBUG, "Waiting for MCHBAR to come up..."); - if ((pci_conf1_read_config8(PCI_BDF(0, 0x0f, 0), 0xe6) & 0x2) == 0x00) { /* Bit 49 of CAPID0 */ - do { - reg8 = *(volatile u8 *)0xfed40000; - } while (!(reg8 & 0x80)); - } - printk(BIOS_DEBUG, "ok\n"); -} - -static void i945_setup_egress_port(void) -{ - u32 reg32; - u32 timeout; - - printk(BIOS_DEBUG, "Setting up Egress Port RCRB\n"); - - /* Egress Port Virtual Channel 0 Configuration */ - - /* map only TC0 to VC0 */ - reg32 = EPBAR32(EPVC0RCTL); - reg32 &= 0xffffff01; - EPBAR32(EPVC0RCTL) = reg32; - - - reg32 = EPBAR32(EPPVCCAP1); - reg32 &= ~(7 << 0); - reg32 |= 1; - EPBAR32(EPPVCCAP1) = reg32; - - /* Egress Port Virtual Channel 1 Configuration */ - reg32 = EPBAR32(0x2c); - reg32 &= 0xffffff00; - if ((MCHBAR32(CLKCFG) & 7) == 1) - reg32 |= 0x0d; /* 533MHz */ - if ((MCHBAR32(CLKCFG) & 7) == 3) - reg32 |= 0x10; /* 667MHz */ - EPBAR32(0x2c) = reg32; - - EPBAR32(EPVC1MTS) = 0x0a0a0a0a; - - reg32 = EPBAR32(EPVC1RCAP); - reg32 &= ~(0x7f << 16); - reg32 |= (0x0a << 16); - EPBAR32(EPVC1RCAP) = reg32; - - if ((MCHBAR32(CLKCFG) & 7) == 1) { /* 533MHz */ - EPBAR32(EPVC1IST + 0) = 0x009c009c; - EPBAR32(EPVC1IST + 4) = 0x009c009c; - } - - if ((MCHBAR32(CLKCFG) & 7) == 3) { /* 667MHz */ - EPBAR32(EPVC1IST + 0) = 0x00c000c0; - EPBAR32(EPVC1IST + 4) = 0x00c000c0; - } - - /* Is internal graphics enabled? */ - if (pci_conf1_read_config8(PCI_BDF(0, 0x0, 0), 54) & ((1 << 4) | (1 << 3))) { /* DEVEN */ - MCHBAR32(MMARB1) |= (1 << 17); - } - - /* Assign Virtual Channel ID 1 to VC1 */ - reg32 = EPBAR32(EPVC1RCTL); - reg32 &= ~(7 << 24); - reg32 |= (1 << 24); - EPBAR32(EPVC1RCTL) = reg32; - - reg32 = EPBAR32(EPVC1RCTL); - reg32 &= 0xffffff01; - reg32 |= (1 << 7); - EPBAR32(EPVC1RCTL) = reg32; - - EPBAR32(PORTARB + 0x00) = 0x01000001; - EPBAR32(PORTARB + 0x04) = 0x00040000; - EPBAR32(PORTARB + 0x08) = 0x00001000; - EPBAR32(PORTARB + 0x0c) = 0x00000040; - EPBAR32(PORTARB + 0x10) = 0x01000001; - EPBAR32(PORTARB + 0x14) = 0x00040000; - EPBAR32(PORTARB + 0x18) = 0x00001000; - EPBAR32(PORTARB + 0x1c) = 0x00000040; - - EPBAR32(EPVC1RCTL) |= (1 << 16); - EPBAR32(EPVC1RCTL) |= (1 << 16); - - printk(BIOS_DEBUG, "Loading port arbitration table ..."); - /* Loop until bit 0 becomes 0 */ - timeout = 0x7fffff; - while ((EPBAR16(EPVC1RSTS) & 1) && --timeout) ; - if (!timeout) - printk(BIOS_DEBUG, "timeout!\n"); - else - printk(BIOS_DEBUG, "ok\n"); - - /* Now enable VC1 */ - EPBAR32(EPVC1RCTL) |= (1 << 31); - - printk(BIOS_DEBUG, "Wait for VC1 negotiation ..."); - /* Wait for VC1 negotiation pending */ - timeout = 0x7fff; - while ((EPBAR16(EPVC1RSTS) & (1 << 1)) && --timeout) ; - if (!timeout) - printk(BIOS_DEBUG, "timeout!\n"); - else - printk(BIOS_DEBUG, "ok\n"); - -} - -static void ich7_setup_dmi_rcrb(void) -{ - u16 reg16; - - - reg16 = RCBA16(LCTL); - reg16 &= ~(3 << 0); - reg16 |= 1; - RCBA16(LCTL) = reg16; - - RCBA32(V0CTL) = 0x80000001; - RCBA32(V1CAP) = 0x03128010; - RCBA32(ESD) = 0x00000810; - RCBA32(RP1D) = 0x01000003; - RCBA32(RP2D) = 0x02000002; - RCBA32(RP3D) = 0x03000002; - RCBA32(RP4D) = 0x04000002; - RCBA32(HDD) = 0x0f000003; - RCBA32(RP5D) = 0x05000002; - - RCBA32(RPFN) = 0x00543210; - - pci_conf1_write_config16(PCI_BDF(0, 0x1c, 0), 0x42, 0x0141); - pci_conf1_write_config16(PCI_BDF(0, 0x1c, 4), 0x42, 0x0141); - pci_conf1_write_config16(PCI_BDF(0, 0x1c, 5), 0x42, 0x0141); - - pci_conf1_write_config32(PCI_BDF(0, 0x1c, 4), 0x54, 0x00480ce0); - pci_conf1_write_config32(PCI_BDF(0, 0x1c, 5), 0x54, 0x00500ce0); -} - -static void i945_setup_dmi_rcrb(void) -{ - u32 reg32; - u32 timeout; - - printk(BIOS_DEBUG, "Setting up DMI RCRB\n"); - - /* Virtual Channel 0 Configuration */ - reg32 = DMIBAR32(DMIVC0RCTL0); - reg32 &= 0xffffff01; - DMIBAR32(DMIVC0RCTL0) = reg32; - - reg32 = DMIBAR32(DMIPVCCAP1); - reg32 &= ~(7 << 0); - reg32 |= 1; - DMIBAR32(DMIPVCCAP1) = reg32; - - reg32 = DMIBAR32(DMIVC1RCTL); - reg32 &= ~(7 << 24); - reg32 |= (1 << 24); /* NOTE: This ID must match ICH7 side */ - DMIBAR32(DMIVC1RCTL) = reg32; - - reg32 = DMIBAR32(DMIVC1RCTL); - reg32 &= 0xffffff01; - reg32 |= (1 << 7); - DMIBAR32(DMIVC1RCTL) = reg32; - - /* Now enable VC1 */ - DMIBAR32(DMIVC1RCTL) |= (1 << 31); - - printk(BIOS_DEBUG, "Wait for VC1 negotiation ..."); - /* Wait for VC1 negotiation pending */ - timeout = 0x7ffff; - while ((DMIBAR16(DMIVC1RSTS) & (1 << 1)) && --timeout) ; - if (!timeout) - printk(BIOS_DEBUG, "timeout!\n"); - else - printk(BIOS_DEBUG, "done..\n"); -#if 1 - /* Enable Active State Power Management (ASPM) L0 state */ - - reg32 = DMIBAR32(DMILCAP); - reg32 &= ~(7 << 12); - reg32 |= (2 << 12); - - reg32 &= ~(7 << 15); - - reg32 |= (2 << 15); - DMIBAR32(DMILCAP) = reg32; - - reg32 = DMIBAR32(DMICC); - reg32 &= 0x00ffffff; - reg32 &= ~(3 << 0); - reg32 |= (1 << 0); - DMIBAR32(DMICC) = reg32; - - if (0) { - DMIBAR32(DMILCTL) |= (3 << 0); - } -#endif - - /* Last but not least, some additional steps */ - reg32 = MCHBAR32(FSBSNPCTL); - reg32 &= ~(0xff << 2); - reg32 |= (0xaa << 2); - MCHBAR32(FSBSNPCTL) = reg32; - - DMIBAR32(0x2c) = 0x86000040; - - reg32 = DMIBAR32(0x204); - reg32 &= ~0x3ff; -#if 1 - reg32 |= 0x13f; /* for x4 DMI only */ -#else - reg32 |= 0x1e4; /* for x2 DMI only */ -#endif - DMIBAR32(0x204) = reg32; - - if (pci_conf1_read_config8(PCI_BDF(0, 0x0, 0), 54) & ((1 << 4) | (1 << 3))) { /* DEVEN */ - DMIBAR32(0x200) |= (1 << 21); - } else { - DMIBAR32(0x200) &= ~(1 << 21); - } - - reg32 = DMIBAR32(0x204); - reg32 &= ~((1 << 11) | (1 << 10)); - DMIBAR32(0x204) = reg32; - - reg32 = DMIBAR32(0x204); - reg32 &= ~(0xff << 12); - reg32 |= (0x0d << 12); - DMIBAR32(0x204) = reg32; - - DMIBAR32(DMICTL1) |= (3 << 24); - - reg32 = DMIBAR32(0x200); - reg32 &= ~(0x3 << 26); - reg32 |= (0x02 << 26); - DMIBAR32(0x200) = reg32; - - DMIBAR32(DMIDRCCFG) &= ~(1 << 31); - DMIBAR32(DMICTL2) |= (1 << 31); - - if (i945_silicon_revision() >= 3) { - reg32 = DMIBAR32(0xec0); - reg32 &= 0x0fffffff; - reg32 |= (2 << 28); - DMIBAR32(0xec0) = reg32; - - reg32 = DMIBAR32(0xed4); - reg32 &= 0x0fffffff; - reg32 |= (2 << 28); - DMIBAR32(0xed4) = reg32; - - reg32 = DMIBAR32(0xee8); - reg32 &= 0x0fffffff; - reg32 |= (2 << 28); - DMIBAR32(0xee8) = reg32; - - reg32 = DMIBAR32(0xefc); - reg32 &= 0x0fffffff; - reg32 |= (2 << 28); - DMIBAR32(0xefc) = reg32; - } - - /* wait for bit toggle to 0 */ - printk(BIOS_DEBUG, "Waiting for DMI hardware..."); - timeout = 0x7fffff; - while ((DMIBAR8(0x32) & (1 << 1)) && --timeout) ; - if (!timeout) - printk(BIOS_DEBUG, "timeout!\n"); - else - printk(BIOS_DEBUG, "ok\n"); - - DMIBAR32(0x1c4) = 0xffffffff; - DMIBAR32(0x1d0) = 0xffffffff; - DMIBAR32(0x228) = 0xffffffff; - - DMIBAR32(0x308) = DMIBAR32(0x308); - DMIBAR32(0x314) = DMIBAR32(0x314); - DMIBAR32(0x324) = DMIBAR32(0x324); - DMIBAR32(0x328) = DMIBAR32(0x328); - DMIBAR32(0x338) = DMIBAR32(0x334); - DMIBAR32(0x338) = DMIBAR32(0x338); - - if (i945_silicon_revision() == 1 && ((MCHBAR8(0xe08) & (1 << 5)) == 1)) { - if ((MCHBAR32(0x214) & 0xf) != 0x3) { - printk_info - ("DMI link requires A1 stepping workaround. Rebooting.\n"); - reg32 = MCHBAR32(MMARB1); - reg32 &= 0xfffffff8; - reg32 |= 3; - outb(0x06, 0xcf9); - for (;;) ; /* wait for reset */ - } - } -} - -static void i945_setup_pci_express_x16(void) -{ - u32 timeout; - u32 reg32; - u16 reg16; - u8 reg8; - - /* For now we just disable the x16 link */ - printk(BIOS_DEBUG, "Disabling PCI Express x16 Link\n"); - - MCHBAR16(UPMC1) |= (1 << 5) | (1 << 0); - - reg8 = pcie_read_config8(PCI_BDF(0, 0x01, 0), BCTRL1); - reg8 |= (1 << 6); - pcie_write_config8(PCI_BDF(0, 0x01, 0), BCTRL1, reg8); - - reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x224); - reg32 |= (1 << 8); - pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x224, reg32); - - reg8 = pcie_read_config8(PCI_BDF(0, 0x01, 0), BCTRL1); - reg8 &= ~(1 << 6); - pcie_write_config8(PCI_BDF(0, 0x01, 0), BCTRL1, reg8); - - printk(BIOS_DEBUG, "Wait for link to enter detect state... "); - timeout = 0x7fffff; - for (reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x214); - (reg32 & 0x000f0000) && --timeout;) ; - if (!timeout) - printk(BIOS_DEBUG, "timeout!\n"); - else - printk(BIOS_DEBUG, "ok\n"); - - /* Finally: Disable the PCI config header */ - reg16 = pci_conf1_read_config16(PCI_BDF(0, 0x00, 0), DEVEN); - reg16 &= ~DEVEN_D1F0; - pci_conf1_write_config16(PCI_BDF(0, 0x00, 0), DEVEN, reg16); -} - -static void i945_setup_root_complex_topology(void) -{ - u32 reg32; - - printk(BIOS_DEBUG, "Setting up Root Complex Topology\n"); - /* Egress Port Root Topology */ - reg32 = EPBAR32(EPESD); - reg32 &= 0xff00ffff; - reg32 |= (1 << 16); - EPBAR32(EPESD) = reg32; - - EPBAR32(EPLE1D) |= (1 << 0); - - EPBAR32(EPLE1A) = DEFAULT_PCIEXBAR + 0x4000; - - EPBAR32(EPLE2D) |= (1 << 0); - - /* DMI Port Root Topology */ - reg32 = DMIBAR32(DMILE1D); - reg32 &= 0x00ffffff; - DMIBAR32(DMILE1D) = reg32; - - reg32 = DMIBAR32(DMILE1D); - reg32 &= 0xff00ffff; - reg32 |= (2 << 16); - DMIBAR32(DMILE1D) = reg32; - - DMIBAR32(DMILE1D) |= (1 << 0); - - DMIBAR32(DMILE1A) = DEFAULT_PCIEXBAR + 0x8000; - - DMIBAR32(DMILE2D) |= (1 << 0); - - DMIBAR32(DMILE2A) = DEFAULT_PCIEXBAR + 0x5000; - - /* PCI Express x16 Port Root Topology */ - if (pci_conf1_read_config8(PCI_BDF(0, 0x00, 0), DEVEN) & DEVEN_D1F0) { - pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x158, - DEFAULT_PCIEXBAR + 0x5000); - - reg32 = pcie_read_config32(PCI_BDF(0, 0x01, 0), 0x150); - reg32 |= (1 << 0); - pcie_write_config32(PCI_BDF(0, 0x01, 0), 0x150, reg32); - } -} - -static void ich7_setup_root_complex_topology(void) -{ - RCBA32(0x104) = 0x00000802; - RCBA32(0x110) = 0x00000001; - RCBA32(0x114) = 0x00000000; - RCBA32(0x118) = 0x00000000; -} - -static void ich7_setup_pci_express(void) -{ - RCBA32(CG) |= (1 << 0); - - pci_conf1_write_config32(PCI_BDF(0, 0x1c, 0), 0x54, 0x00000060); - - pci_conf1_write_config32(PCI_BDF(0, 0x1c, 0), 0xd8, 0x00110000); -} - -void i945_early_initialization(void) -{ - /* Print some chipset specific information */ - i945_detect_chipset(); - - /* Setup all BARs required for early PCIe and raminit */ - i945_setup_bars(); - - /* Change port80 to LPC */ - RCBA32(GCS) &= (~0x04); -} - -void i945_late_initialization(void) -{ - i945_setup_egress_port(); - - ich7_setup_root_complex_topology(); - - ich7_setup_pci_express(); - - ich7_setup_dmi_rcrb(); - - i945_setup_dmi_rcrb(); - - i945_setup_pci_express_x16(); - - i945_setup_root_complex_topology(); -} +/* nothing to do here? */ \ No newline at end of file Index: northbridge/intel/i945/Makefile =================================================================== --- northbridge/intel/i945/Makefile (revision 1023) +++ northbridge/intel/i945/Makefile (working copy) @@ -24,6 +24,7 @@ INITRAM_SRC += \ $(src)/northbridge/intel/i945/raminit.c \ $(src)/northbridge/intel/i945/rcven.c \ + $(src)/northbridge/intel/i945/errata.c \ $(src)/lib/clog2.c