From 4c65398c10fa4583ad6b83ddc7f7873625a6ddbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 17 Jan 2018 15:27:18 +0200 Subject: Intel i82810 boards & chips: Remove - using LATE_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All boards and chips that are still using LATE_CBMEM_INIT are being removed as previously discussed. If these boards and chips are updated to not use LATE_CBMEM_INIT, they can be restored to the active codebase from the 4.7 branch. chips: northbridge/intel/i82810 Mainboards: src/mainboard/asus/mew-am src/mainboard/asus/mew-vm src/mainboard/ecs/p6iwp-fe src/mainboard/hp/e_vectra_p2706t src/mainboard/intel/d810e2cb src/mainboard/mitac/6513wu src/mainboard/msi/ms6178 src/mainboard/nec/powermate2000 Change-Id: Ib273316c59f499e6cd3a0e4c4dc4c2cce94ff291 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/23300 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/northbridge/intel/i82810/Kconfig | 47 --- src/northbridge/intel/i82810/Makefile.inc | 24 -- src/northbridge/intel/i82810/debug.c | 52 ---- src/northbridge/intel/i82810/i82810.h | 48 --- src/northbridge/intel/i82810/northbridge.c | 161 ---------- src/northbridge/intel/i82810/northbridge.h | 22 -- src/northbridge/intel/i82810/raminit.c | 463 ----------------------------- src/northbridge/intel/i82810/raminit.h | 35 --- 8 files changed, 852 deletions(-) delete mode 100644 src/northbridge/intel/i82810/Kconfig delete mode 100644 src/northbridge/intel/i82810/Makefile.inc delete mode 100644 src/northbridge/intel/i82810/debug.c delete mode 100644 src/northbridge/intel/i82810/i82810.h delete mode 100644 src/northbridge/intel/i82810/northbridge.c delete mode 100644 src/northbridge/intel/i82810/northbridge.h delete mode 100644 src/northbridge/intel/i82810/raminit.c delete mode 100644 src/northbridge/intel/i82810/raminit.h (limited to 'src/northbridge/intel') diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig deleted file mode 100644 index 7d8c46b47c..0000000000 --- a/src/northbridge/intel/i82810/Kconfig +++ /dev/null @@ -1,47 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## -## 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. -## - -config NORTHBRIDGE_INTEL_I82810 - bool - select NO_MMCONF_SUPPORT - select HAVE_DEBUG_RAM_SETUP - select LATE_CBMEM_INIT - select UDELAY_IO - -choice - prompt "Onboard graphics" - default I810_VIDEO_MB_1MB - depends on NORTHBRIDGE_INTEL_I82810 - -config I810_VIDEO_MB_OFF - bool "Disabled, 0KB" -config I810_VIDEO_MB_512KB - bool "Enabled, 512KB" -config I810_VIDEO_MB_1MB - bool "Enabled, 1MB" - -endchoice - -config VIDEO_MB - int - default 0 if I810_VIDEO_MB_OFF - default 512 if I810_VIDEO_MB_512KB - default 1 if I810_VIDEO_MB_1MB - depends on NORTHBRIDGE_INTEL_I82810 - -config VGA_BIOS_ID - string - default "8086,7121" - depends on NORTHBRIDGE_INTEL_I82810 diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc deleted file mode 100644 index 474de8caeb..0000000000 --- a/src/northbridge/intel/i82810/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## -## 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; either version 2 of the License, or -## (at your option) any later version. -## -## 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. -## - -ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82810),y) - -ramstage-y += northbridge.c - -romstage-y += raminit.c -romstage-y += debug.c - -endif diff --git a/src/northbridge/intel/i82810/debug.c b/src/northbridge/intel/i82810/debug.c deleted file mode 100644 index d81713859c..0000000000 --- a/src/northbridge/intel/i82810/debug.c +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include -#include -#include "raminit.h" -#include -#include - -#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) -void dump_spd_registers(void) -{ - int i; - printk(BIOS_DEBUG, "\n"); - for (i = 0; i < DIMM_SOCKETS; i++) { - unsigned device; - device = DIMM0 + i; - if (device) { - int j; - printk(BIOS_DEBUG, "DIMM %d: %02x", i, device); - for (j = 0; j < 256; j++) { - int status; - unsigned char byte; - if ((j & 0xf) == 0) { - printk(BIOS_DEBUG, "\n%02x: ", j); - } - status = smbus_read_byte(device, j); - if (status < 0) { - printk(BIOS_DEBUG, "bad device\n"); - break; - } - byte = status & 0xff; - printk(BIOS_DEBUG, "%02x ", byte); - } - printk(BIOS_DEBUG, "\n"); - } - } -} - -void dump_pci_device(unsigned dev) -{ - int i; - printk(BIOS_DEBUG, "PCI: %02x:%02x.%02x\n", (dev >> 20) & 0xff, (dev >> 15) & 0x1f, (dev >> 12) & 7); - - for (i = 0; i <= 255; i++) { - unsigned char val; - val = pci_read_config8(dev, i); - if ((i & 0x0f) == 0) - printk(BIOS_DEBUG, "%02x: %02x", i, val); - if ((i & 0x0f) == 0x0f) - printk(BIOS_DEBUG, "\n"); - } -} -#endif diff --git a/src/northbridge/intel/i82810/i82810.h b/src/northbridge/intel/i82810/i82810.h deleted file mode 100644 index 28a5ca1979..0000000000 --- a/src/northbridge/intel/i82810/i82810.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Corey Osgood - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#ifndef NORTHBRIDGE_INTEL_I82810_I82810_H -#define NORTHBRIDGE_INTEL_I82810_I82810_H - -/* - * Datasheet: - * - Name: Intel 810 Chipset: - * 82810/82810-DC100 Graphics and Memory Controller Hub (GMCH) - * - URL: http://www.intel.com/design/chipsets/datashts/290656.htm - * - PDF: ftp://download.intel.com/design/chipsets/datashts/29065602.pdf - * - Order Number: 290656-002 - */ - -/* - * PCI Configuration Registers. - * - * Any addresses between 0x50 and 0xff not listed below are reserved and - * should not be touched. - */ - -#define GMCHCFG 0x50 /* GMCH Configuration */ -#define PAMR 0x51 /* Programmable Attributes */ -#define DRP 0x52 /* DRAM Row Population */ -#define DRAMT 0x53 /* DRAM Timing */ -#define FDHC 0x58 /* Fixed DRAM Hole Control */ -#define SMRAM 0x70 /* System Management RAM Control */ -#define MISSC 0x72 /* Miscellaneous Control */ -#define MISSC2 0x80 /* Miscellaneous Control 2 */ -#define BUFF_SC 0x92 /* System Memory Buffer Strength Control */ - -int smbus_read_byte(u8 device, u8 address); - -#endif diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c deleted file mode 100644 index 2274c0f5e2..0000000000 --- a/src/northbridge/intel/i82810/northbridge.c +++ /dev/null @@ -1,161 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Corey Osgood - * Copyright (C) 2010 Joseph Smith - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "northbridge.h" -#include "i82810.h" - -static void northbridge_init(device_t dev) -{ - printk(BIOS_SPEW, "Northbridge init\n"); -} - -static struct device_operations northbridge_operations = { - .read_resources = pci_dev_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = northbridge_init, - .enable = 0, - .ops_pci = 0, -}; - -/* Intel 82810/82810-DC100 */ -static const struct pci_driver i810_northbridge_driver __pci_driver = { - .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x7120, -}; - -/* Intel 82810E */ -static const struct pci_driver i810e_northbridge_driver __pci_driver = { - .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_INTEL, - .device = 0x7124, -}; - -/* Table which returns the RAM size in MB when fed the DRP[7:4] or [3:0] value. - * Note that 2 is a value which the DRP should never be programmed to. - * Some size values appear twice, due to single-sided vs dual-sided banks. - */ -static int translate_i82810_to_mb[] = { -/* DRP 0 1 (2) 3 4 5 6 7 8 9 A B C D E F */ -/* MB */0, 8, 0, 16, 16, 24, 32, 32, 48, 64, 64, 96, 128, 128, 192, 256, -}; - -static void pci_domain_set_resources(device_t dev) -{ - device_t mc_dev; - int igd_memory = 0; - uint64_t uma_memory_base = 0, uma_memory_size = 0; - - mc_dev = dev->link_list->children; - if (!mc_dev) - return; - - unsigned long tomk, tomk_stolen; - int idx, drp_value; - u8 reg8; - - reg8 = pci_read_config8(mc_dev, SMRAM); - reg8 &= 0xc0; - - switch (reg8) { - case 0xc0: - igd_memory = 1024; - printk(BIOS_DEBUG, "%dKB IGD UMA\n", igd_memory); - break; - case 0x80: - igd_memory = 512; - printk(BIOS_DEBUG, "%dKB IGD UMA\n", igd_memory); - break; - default: - igd_memory = 0; - printk(BIOS_DEBUG, "No IGD UMA Memory\n"); - break; - } - - /* Get the value for DIMM 0 and translate it to MB. */ - drp_value = pci_read_config8(mc_dev, DRP); - tomk = (unsigned long)(translate_i82810_to_mb[drp_value & 0x0f]); - /* Get the value for DIMM 1 and translate it to MB. */ - drp_value = drp_value >> 4; - tomk += (unsigned long)(translate_i82810_to_mb[drp_value]); - /* Convert tomk from MB to KB. */ - tomk = tomk << 10; - tomk_stolen = tomk - igd_memory; - - /* For reserving UMA memory in the memory map */ - uma_memory_base = tomk_stolen * 1024ULL; - uma_memory_size = igd_memory * 1024ULL; - printk(BIOS_DEBUG, "Available memory: %ldKB\n", tomk_stolen); - - /* Report the memory regions. */ - idx = 10; - ram_resource(dev, idx++, 0, 640); - ram_resource(dev, idx++, 768, tomk - 768); - uma_resource(dev, idx++, uma_memory_base >> 10, uma_memory_size >> 10); - - set_late_cbmem_top(tomk_stolen * 1024); - - assign_resources(dev->link_list); -} - -static struct device_operations pci_domain_ops = { - .read_resources = pci_domain_read_resources, - .set_resources = pci_domain_set_resources, - .enable_resources = NULL, - .init = NULL, - .scan_bus = pci_domain_scan_bus, - .ops_pci_bus = pci_bus_default_ops, -}; - -static void cpu_bus_init(device_t dev) -{ - initialize_cpus(dev->link_list); -} - -static struct device_operations cpu_bus_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, - .init = cpu_bus_init, - .scan_bus = 0, -}; - -static void enable_dev(struct device *dev) -{ - /* Set the operations if it is a special bus type */ - if (dev->path.type == DEVICE_PATH_DOMAIN) { - dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { - dev->ops = &cpu_bus_ops; - } -} - -struct chip_operations northbridge_intel_i82810_ops = { - CHIP_NAME("Intel 82810 Northbridge") - .enable_dev = enable_dev, -}; diff --git a/src/northbridge/intel/i82810/northbridge.h b/src/northbridge/intel/i82810/northbridge.h deleted file mode 100644 index a9b26d5cf9..0000000000 --- a/src/northbridge/intel/i82810/northbridge.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Corey Osgood - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#ifndef NORTHBRIDGE_INTEL_I82810_NORTHBRIDGE_H -#define NORTHBRIDGE_INTEL_I82810_NORTHBRIDGE_H - -extern unsigned int i82810_scan_root_bus(device_t root, unsigned int max); - -#endif /* NORTHBRIDGE_INTEL_I82810_NORTHBRIDGE_H */ diff --git a/src/northbridge/intel/i82810/raminit.c b/src/northbridge/intel/i82810/raminit.c deleted file mode 100644 index 6fe4fb590a..0000000000 --- a/src/northbridge/intel/i82810/raminit.c +++ /dev/null @@ -1,463 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 Uwe Hermann - * Copyright (C) 2007 Corey Osgood - * Copyright (C) 2008-2009 Elia Yehuda - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include "i82810.h" -#include "raminit.h" - -/*----------------------------------------------------------------------------- -Macros and definitions. ------------------------------------------------------------------------------*/ - -/* Debugging macros. */ -#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) -#define PRINT_DEBUG(x...) printk(BIOS_DEBUG, x) -#define DUMPNORTH() dump_pci_device(PCI_DEV(0, 0, 0)) -#else -#define PRINT_DEBUG(x...) -#define DUMPNORTH() -#endif - -/* DRAMT[7:5] - SDRAM Mode Select (SMS). */ -#define RAM_COMMAND_SELF_REFRESH 0x0 /* Disable refresh */ -#define RAM_COMMAND_NORMAL 0x1 /* Refresh: 15.6/11.7us for 100/133MHz */ -#define RAM_COMMAND_NORMAL_FR 0x2 /* Refresh: 7.8/5.85us for 100/133MHz */ -#define RAM_COMMAND_NOP 0x4 /* NOP command */ -#define RAM_COMMAND_PRECHARGE 0x5 /* All bank precharge */ -#define RAM_COMMAND_MRS 0x6 /* Mode register set */ -#define RAM_COMMAND_CBR 0x7 /* CBR */ - -/* - * This table is used to translate the value read from SPD Byte 31 to a value - * the northbridge can understand in DRP, aka Rx52[7:4], [3:0]. Where most - * northbridges have some sort of simple calculation that can be done for this, - * I haven't yet figured out one for this northbridge. Until someone does, - * this table is necessary. - */ -static const u8 translate_spd_to_i82810[] = { - /* Note: 4MB sizes are not supported, so dual-sided DIMMs with a 4MB - * side can't be either, at least for now. - */ - /* TODO: For above case, only use the other side if > 4MB, and get some - * of these DIMMs to test it with. Same for unsupported 128/x sizes. - */ - - /* SPD Byte 31 Memory Size [Side 1/2] */ - 0xff, /* 0x01 No memory */ - 0xff, /* 0x01 4/0 */ - 0x01, /* 0x02 8/0 */ - 0xff, /* 0x03 8/4 */ - 0x04, /* 0x04 16/0 or 16 */ - 0xff, /* 0x05 16/4 */ - 0x05, /* 0x06 16/8 */ - 0xff, /* 0x07 Invalid */ - 0x07, /* 0x08 32/0 or 32 */ - 0xff, /* 0x09 32/4 */ - 0xff, /* 0x0A 32/8 */ - 0xff, /* 0x0B Invalid */ - 0x08, /* 0x0C 32/16 */ - 0xff, 0xff, 0xff, /* 0x0D-0F Invalid */ - 0x0a, /* 0x10 64/0 or 64 */ - 0xff, /* 0x11 64/4 */ - 0xff, /* 0x12 64/8 */ - 0xff, /* 0x13 Invalid */ - 0xff, /* 0x14 64/16 */ - 0xff, 0xff, 0xff, /* 0x15-17 Invalid */ - 0x0b, /* 0x18 64/32 */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x19-1f Invalid */ - 0x0d, /* 0x20 128/0 or 128 */ - /* These configurations are not supported by the i810 */ - 0xff, /* 0x21 128/4 */ - 0xff, /* 0x22 128/8 */ - 0xff, /* 0x23 Invalid */ - 0xff, /* 0x24 128/16 */ - 0xff, 0xff, 0xff, /* 0x25-27 Invalid */ - 0xff, /* 0x28 128/32 */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x29-2f Invalid */ - 0x0e, /* 0x30 128/64 */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, /* 0x31-3f Invalid */ - 0x0f, /* 0x40 256/0 or 256 */ - /* Anything larger is not supported by the 82810. */ -}; - -/* - * Table which returns the RAM size in MB when fed the DRP[7:4] or [3:0] value. - * Note that 2 is a value which the DRP should never be programmed to. - * Some size values appear twice, due to single-sided vs dual-sided banks. - */ -static const u16 translate_i82810_to_mb[] = { -/* DRP 0 1 (2) 3 4 5 6 7 8 9 A B C D E F */ -/* MB */0, 8, 0, 16, 16, 24, 32, 32, 48, 64, 64, 96, 128, 128, 192, 256, -}; - -/* Size of bank#0 for dual-sided DIMMs */ -static const u8 translate_i82810_to_bank[] = { -/* DRP 0 1 (2) 3 4 5 6 7 8 9 A B C D E F */ -/* MB */0, 0, 0, 8, 0, 16, 16, 0, 32, 32, 0, 64, 64, 0, 128, 128, -}; - -struct dimm_info { - u8 ds; /* dual-sided */ - u8 ss; /* single-sided */ - u8 size; -}; - -/*----------------------------------------------------------------------------- -SDRAM configuration functions. ------------------------------------------------------------------------------*/ - -/** - * Send the specified RAM command to all DIMMs. - * - * @param command The RAM command to send to the DIMM(s). - */ -static void do_ram_command(u8 command) -{ - u32 *addr, addr_offset; - u16 dimm_size, dimm_start, dimm_bank; - u8 reg8, drp; - int i, caslatency; - - /* Configure the RAM command. */ - reg8 = pci_read_config8(PCI_DEV(0, 0, 0), DRAMT); - reg8 &= 0x1f; /* Clear bits 7-5. */ - reg8 |= command << 5; - pci_write_config8(PCI_DEV(0, 0, 0), DRAMT, reg8); - - /* - * RAM_COMMAND_NORMAL affects only the memory controller and - * doesn't need to be "sent" to the DIMMs. - */ - if (command == RAM_COMMAND_NORMAL) - return; - - dimm_start = 0; - for (i = 0; i < DIMM_SOCKETS; i++) { - /* - * Calculate the address offset where we need to "send" the - * DIMM command to. For most commands the offset is 0, only - * RAM_COMMAND_MRS needs special values, see below. - * The final address offset bits depend on three things: - * - * (1) Some hardcoded values specified in the datasheet. - * (2) Which CAS latency we will use/set. This is the SMAA[4] - * bit, which is 1 for CL3, and 0 for CL2. The bitstring - * so far has the form '00000001X1010', X being SMAA[4]. - * (3) The DIMM to which we want to send the command. For - * DIMM0 no special handling is needed, but for DIMM1 we - * must invert the four bits SMAA[7:4] (see datasheet). - * - * Finally, the bitstring has to be shifted 3 bits to the left. - * See i810 datasheet pages 43, 85, and 86 for details. - */ - addr_offset = 0; - caslatency = 3; /* TODO: Dynamically get CAS latency later. */ - if (i == 0 && command == RAM_COMMAND_MRS && caslatency == 3) - addr_offset = 0x1d0; /* DIMM0, CL3, 0000111010000 */ - if (i == 1 && command == RAM_COMMAND_MRS && caslatency == 3) - addr_offset = 0x650; /* DIMM1, CL3, 0011001010000 */ - if (i == 0 && command == RAM_COMMAND_MRS && caslatency == 2) - addr_offset = 0x150; /* DIMM0, CL2, 0000101010000 */ - if (i == 1 && command == RAM_COMMAND_MRS && caslatency == 2) - addr_offset = 0x1a0; /* DIMM1, CL2, 0000110100000 */ - - drp = pci_read_config8(PCI_DEV(0, 0, 0), DRP); - drp = (drp >> (i * 4)) & 0x0f; - - dimm_size = translate_i82810_to_mb[drp]; - if (dimm_size) { - addr = (u32 *)((dimm_start * 1024 * 1024) + addr_offset); - PRINT_DEBUG(" Sending RAM command 0x%02x to 0x%p\n", reg8, addr); - read32(addr); - } - - dimm_bank = translate_i82810_to_bank[drp]; - if (dimm_bank) { - addr = (u32 *)(((dimm_start + dimm_bank) * 1024 * 1024) + addr_offset); - PRINT_DEBUG(" Sending RAM command 0x%02x to 0x%p\n", reg8, addr); - read32(addr); - } - - dimm_start += dimm_size; - } -} - -/*----------------------------------------------------------------------------- -DIMM-independent configuration functions. ------------------------------------------------------------------------------*/ - -/* - * Set DRP - DRAM Row Population Register (Device 0). - */ -static void spd_set_dram_size(void) -{ - /* The variables drp and dimm_size have to be ints since all the - * SMBus-related functions return ints, and its just easier this way. - */ - int i, drp, dimm_size; - - drp = 0x00; - - for (i = 0; i < DIMM_SOCKETS; i++) { - /* First check if a DIMM is actually present. */ - if (smbus_read_byte(DIMM0 + i, 2) == 4) { - printk(BIOS_DEBUG, "Found DIMM in slot %d\n", i); - - dimm_size = smbus_read_byte(DIMM0 + i, 31); - - printk(BIOS_DEBUG, "DIMM is %dMB\n", dimm_size * 4); - - /* The i810 can't handle DIMMs larger than 128MB per - * side. This will fail if the DIMM uses a - * non-supported DRAM tech, and can't be used until - * buffers are done dynamically. - * Note: the factory BIOS just dies if it spots this :D - */ - if (dimm_size > 32) { - printk(BIOS_ERR, "DIMM row sizes larger than 128MB not" - "supported on i810\n"); - printk - (BIOS_ERR, "Attempting to treat as 128MB DIMM\n"); - dimm_size = 32; - } else if (dimm_size < 0) { - /* On smbus error, set DIMM size to 0 */ - printk(BIOS_ERR, "Error reading DIMM size\n"); - dimm_size = 0; - } - - if (dimm_size > 0) { - /* This array is provided in raminit.h, because it got - * extremely messy. The above way is cleaner, but - * doesn't support any asymmetrical/odd configurations. - */ - dimm_size = translate_spd_to_i82810[dimm_size]; - - printk(BIOS_DEBUG, "After translation, dimm_size is %d\n", - dimm_size); - - /* If the DIMM is dual-sided, the DRP value is +2 */ - /* TODO: Figure out asymmetrical configurations. */ - if ((smbus_read_byte(DIMM0 + i, 127) | 0xf) == 0xff) { - printk(BIOS_DEBUG, "DIMM is dual-sided\n"); - dimm_size += 2; - } - } - } else { - printk(BIOS_DEBUG, "No DIMM found in slot %d\n", i); - - /* If there's no DIMM in the slot, set value to 0. */ - dimm_size = 0x00; - } - - /* Put in dimm_size to reflect the current DIMM. */ - drp |= dimm_size << (i * 4); - } - - printk(BIOS_DEBUG, "DRP calculated to 0x%02x\n", drp); - - pci_write_config8(PCI_DEV(0, 0, 0), DRP, drp); -} - -static void set_dram_timing(void) -{ - /* TODO, for now using default, hopefully safe values. */ - // pci_write_config8(PCI_DEV(0, 0, 0), DRAMT, 0x00); -} - -/* - * TODO: BUFF_SC needs to be set according to the DRAM tech (x8, x16, - * or x32), but the datasheet doesn't list all the details. Currently, it - * needs to be pulled from the output of 'lspci -xxx Rx92'. - * - * Common results (tested on actual hardware) are: - * - * (DRP: c = 128MB dual sided, d = 128MB single sided, f = 256MB dual sided) - * - * BUFF_SC TOM DRP DIMM0 DIMM1 - * ---------------------------------------------------------------------------- - * 0x3356 128MB 0x0c 128MB dual-sided - - * 0xcc56 128MB 0xc0 - 128MB dual-sided - * 0x77da 128MB 0x0d 128MB single-sided - - * 0xddda 128MB 0xd0 - 128MB single-sided - * 0x0001 256MB 0xcc 128MB dual-sided 128MB dual-sided - * 0x55c6 256MB 0xdd 128MB single-sided 128MB single-sided - * 0x4445 256MB 0xcd 128MB single-sided 128MB dual-sided - * 0x1145 256MB 0xdc 128MB dual-sided 128MB single-sided - * 0x3356 256MB 0x0f 256MB dual-sided - - * 0xcc56 256MB 0xf0 - 256MB dual-sided - * 0x0001 384MB 0xcf 256MB dual-sided 128MB dual-sided - * 0x0001 384MB 0xfc 128MB dual-sided 256MB dual-sided - * 0x1145 384MB 0xdf 256MB dual-sided 128MB single-sided - * 0x4445 384MB 0xfd 128MB single-sided 256MB dual-sided - * 0x0001 512MB 0xff 256MB dual-sided 256MB dual-sided - * - * See also: - * https://www.coreboot.org/pipermail/coreboot/2009-May/047966.html - */ -static void set_dram_buffer_strength(void) -{ - struct dimm_info d0, d1; - u16 buff_sc; - - /* Check first slot. */ - d0.size = d0.ds = d0.ss = 0; - if (smbus_read_byte(DIMM0, SPD_MEMORY_TYPE) == SPD_MEMORY_TYPE_SDRAM) { - d0.size = smbus_read_byte(DIMM0, SPD_BANK_DENSITY); - d0.ds = smbus_read_byte(DIMM0, SPD_NUM_DIMM_BANKS) > 1; - d0.ss = !d0.ds; - } - - /* Check second slot. */ - d1.size = d1.ds = d1.ss = 0; - if (smbus_read_byte(DIMM0 + 1, SPD_MEMORY_TYPE) - == SPD_MEMORY_TYPE_SDRAM) { - d1.size = smbus_read_byte(DIMM0 + 1, SPD_BANK_DENSITY); - d1.ds = smbus_read_byte(DIMM0 + 1, SPD_NUM_DIMM_BANKS) > 1; - d1.ss = !d1.ds; - } - - buff_sc = 0; - - /* Tame the beast... */ - if ((d0.ds && d1.ds) || (d0.ds && d1.ss) || (d0.ss && d1.ds)) - buff_sc |= 1; - if ((d0.size && !d1.size) || (!d0.size && d1.size) || (d0.ss && d1.ss)) - buff_sc |= 1 << 1; - if ((d0.ds && !d1.size) || (!d0.size && d1.ds) || (d0.ss && d1.ss) - || (d0.ds && d1.ss) || (d0.ss && d1.ds)) - buff_sc |= 1 << 2; - if ((d0.ss && !d1.size) || (!d0.size && d1.ss)) - buff_sc |= 1 << 3; - if ((d0.size && !d1.size) || (!d0.size && d1.size)) - buff_sc |= 1 << 4; - if ((d0.ds && !d1.size) || (!d0.size && d1.ds) || (d0.ds && d1.ss) - || (d0.ss && d1.ds)) - buff_sc |= 1 << 6; - if ((d0.ss && !d1.size) || (!d0.size && d1.ss) || (d0.ss && d1.ss)) - buff_sc |= 3 << 6; - if ((!d0.size && d1.ss) || (d0.ds && d1.ss) || (d0.ss && d1.ss)) - buff_sc |= 1 << 8; - if (d0.size && !d1.size) - buff_sc |= 3 << 8; - if ((d0.ss && !d1.size) || (d0.ss && d1.ss) || (d0.ss && d1.ds)) - buff_sc |= 1 << 10; - if (!d0.size && d1.size) - buff_sc |= 3 << 10; - if ((d0.size && !d1.size) || (d0.ss && !d1.size) || (!d0.size && d1.ss) - || (d0.ss && d1.ss) || (d0.ds && d1.ss)) - buff_sc |= 1 << 12; - if (d0.size && !d1.size) - buff_sc |= 1 << 13; - if ((!d0.size && d1.size) || (d0.ss && !d1.size) || (d0.ss && d1.ss) - || (d0.ss && d1.ds)) - buff_sc |= 1 << 14; - if (!d0.size && d1.size) - buff_sc |= 1 << 15; - - printk(BIOS_DEBUG, "BUFF_SC calculated to 0x%04x\n", buff_sc); - - pci_write_config16(PCI_DEV(0, 0, 0), BUFF_SC, buff_sc); -} - -/*----------------------------------------------------------------------------- -Public interface. ------------------------------------------------------------------------------*/ - -void sdram_set_registers(void) -{ - u8 reg8; - u16 did; - - did = pci_read_config16(PCI_DEV(0, 0, 0), PCI_DEVICE_ID); - - /* Ideally, this should be R/W for as many ranges as possible. */ - pci_write_config8(PCI_DEV(0, 0, 0), PAMR, 0xff); - - /* Set size for onboard-VGA framebuffer. */ - reg8 = pci_read_config8(PCI_DEV(0, 0, 0), SMRAM); - reg8 &= 0x3f; /* Disable graphics (for now). */ -#if CONFIG_VIDEO_MB - if (CONFIG_VIDEO_MB == 512) - reg8 |= (1 << 7); /* Enable graphics (512KB RAM). */ - else if (CONFIG_VIDEO_MB == 1) - reg8 |= (1 << 7) | (1 << 6); /* Enable graphics (1MB RAM). */ -#endif - pci_write_config8(PCI_DEV(0, 0, 0), SMRAM, reg8); - - /* MISSC2: Bits 1, 2, 6, 7 must be set for VGA (see datasheet). */ - reg8 = pci_read_config8(PCI_DEV(0, 0, 0), MISSC2); - reg8 |= (1 << 1); /* Instruction Parser Unit-Level Clock Gating */ - reg8 |= (1 << 2); /* Palette Load Select */ - if (did == 0x7124) { - /* Bits 6 and 7 are only available on 82810E (not 82810). */ - reg8 |= (1 << 6); /* Text Immediate Blit */ - reg8 |= (1 << 7); /* Must be 1 as per datasheet. */ - } - pci_write_config8(PCI_DEV(0, 0, 0), MISSC2, reg8); -} - -void sdram_set_spd_registers(void) -{ - spd_set_dram_size(); - set_dram_buffer_strength(); - set_dram_timing(); -} - -/** - * Enable SDRAM. - */ -void sdram_enable(void) -{ - int i; - - /* 1. Apply NOP. */ - PRINT_DEBUG("RAM Enable 1: Apply NOP\n"); - do_ram_command(RAM_COMMAND_NOP); - udelay(200); - - /* 2. Precharge all. Wait tRP. */ - PRINT_DEBUG("RAM Enable 2: Precharge all\n"); - do_ram_command(RAM_COMMAND_PRECHARGE); - udelay(1); - - /* 3. Perform 8 refresh cycles. Wait tRC each time. */ - PRINT_DEBUG("RAM Enable 3: CBR\n"); - for (i = 0; i < 8; i++) { - do_ram_command(RAM_COMMAND_CBR); - udelay(1); - } - - /* 4. Mode register set. Wait two memory cycles. */ - PRINT_DEBUG("RAM Enable 4: Mode register set\n"); - do_ram_command(RAM_COMMAND_MRS); - udelay(2); - - /* 5. Normal operation (enables refresh at 15.6usec). */ - PRINT_DEBUG("RAM Enable 5: Normal operation\n"); - do_ram_command(RAM_COMMAND_NORMAL); - udelay(1); - - PRINT_DEBUG("Northbridge following SDRAM init:\n"); - DUMPNORTH(); -} diff --git a/src/northbridge/intel/i82810/raminit.h b/src/northbridge/intel/i82810/raminit.h deleted file mode 100644 index 6b9d175d88..0000000000 --- a/src/northbridge/intel/i82810/raminit.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Corey Osgood - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#ifndef NORTHBRIDGE_INTEL_I82810_RAMINIT_H -#define NORTHBRIDGE_INTEL_I82810_RAMINIT_H - -/* The 82810 supports max. 2 dual-sided DIMMs. */ -#define DIMM_SOCKETS 2 - -/* Function prototypes. */ -void sdram_set_registers(void); -void sdram_set_spd_registers(void); -void sdram_enable(void); - -/* Debug */ -#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) -void dump_spd_registers(void); -void dump_pci_device(unsigned dev); -#else -#define dump_spd_registers() -#endif -#endif -- cgit v1.2.3