summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainboard/asus/mew-am/Kconfig2
-rw-r--r--src/mainboard/asus/mew-am/mainboard.c6
-rw-r--r--src/mainboard/asus/mew-vm/Kconfig2
-rw-r--r--src/mainboard/asus/mew-vm/mainboard.c6
-rw-r--r--src/mainboard/ecs/p6iwp-fe/Kconfig2
-rw-r--r--src/mainboard/ecs/p6iwp-fe/mainboard.c6
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/Kconfig2
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/mainboard.c6
-rw-r--r--src/mainboard/mitac/6513wu/Kconfig2
-rw-r--r--src/mainboard/mitac/6513wu/mainboard.c6
-rw-r--r--src/mainboard/msi/ms6178/Kconfig2
-rw-r--r--src/mainboard/msi/ms6178/mainboard.c6
-rw-r--r--src/mainboard/nec/powermate2000/Kconfig2
-rw-r--r--src/mainboard/nec/powermate2000/mainboard.c6
-rw-r--r--src/northbridge/intel/i82810/northbridge.c117
15 files changed, 122 insertions, 51 deletions
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index 56977b319b..c0a5da9875 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -28,6 +28,8 @@ config BOARD_ASUS_MEW_AM
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c
index 86f22552e5..e5008b9b87 100644
--- a/src/mainboard/asus/mew-am/mainboard.c
+++ b/src/mainboard/asus/mew-am/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("ASUS MEW-AM Mainboard")
};
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index cb6f9df02f..cab90cc46a 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -28,6 +28,8 @@ config BOARD_ASUS_MEW_VM
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c
index 9e325e7165..831be01868 100644
--- a/src/mainboard/asus/mew-vm/mainboard.c
+++ b/src/mainboard/asus/mew-vm/mainboard.c
@@ -1,6 +1,12 @@
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("ASUS MEW-VM Mainboard")
};
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index d2129a8d21..bb2a06dadd 100644
--- a/src/mainboard/ecs/p6iwp-fe/Kconfig
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig
@@ -29,6 +29,8 @@ config BOARD_ECS_P6IWP_FE
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/ecs/p6iwp-fe/mainboard.c b/src/mainboard/ecs/p6iwp-fe/mainboard.c
index b6929e618e..aec12501c6 100644
--- a/src/mainboard/ecs/p6iwp-fe/mainboard.c
+++ b/src/mainboard/ecs/p6iwp-fe/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("ECS P6IWP-Fe Mainboard")
};
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 9c6a43ac1b..67118c0793 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -31,6 +31,8 @@ config BOARD_HP_E_VECTRA_P2706T
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/hp/e_vectra_p2706t/mainboard.c b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
index 1e27514b0e..74339e935c 100644
--- a/src/mainboard/hp/e_vectra_p2706t/mainboard.c
+++ b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("HP e-Vectra P2706T Mainboard")
};
diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index defa44748b..2f66733c8a 100644
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -28,6 +28,8 @@ config BOARD_MITAC_6513WU
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/mitac/6513wu/mainboard.c b/src/mainboard/mitac/6513wu/mainboard.c
index 7d5e19d088..9e4ec8de1d 100644
--- a/src/mainboard/mitac/6513wu/mainboard.c
+++ b/src/mainboard/mitac/6513wu/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("Mitac 6513WU Mainboard")
};
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index a4bb5487b9..b5cef0e695 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -27,6 +27,8 @@ config BOARD_MSI_MS_6178
select ROMCC
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index c3fdd81bbc..e4ba148d40 100644
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("MSI MS-6178 Mainboard")
};
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 0c16cf156b..3a3158381a 100644
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -28,6 +28,8 @@ config BOARD_NEC_POWERMATE_2000
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select HAVE_MAINBOARD_RESOURCES
+ select GFXUMA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c
index a24b548357..a26e8df0a9 100644
--- a/src/mainboard/nec/powermate2000/mainboard.c
+++ b/src/mainboard/nec/powermate2000/mainboard.c
@@ -19,8 +19,14 @@
*/
#include <device/device.h>
+#include <boot/tables.h>
#include "chip.h"
+int add_mainboard_resources(struct lb_memory *mem)
+{
+ return add_northbridge_resources(mem);
+}
+
struct chip_operations mainboard_ops = {
CHIP_NAME("NEC PowerMate 2000 Mainboard")
};
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index 4961366731..2dae1493e8 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2007 Corey Osgood <corey@slightlyhackish.com>
+ * Copyright (C) 2010 Joseph Smith <joe@settoplinux.org>
*
* 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
@@ -29,6 +30,7 @@
#include <bitops.h>
#include <cpu/cpu.h>
#include "chip.h"
+#include <boot/tables.h>
#include "northbridge.h"
#include "i82810.h"
@@ -100,6 +102,18 @@ static uint32_t find_pci_tolm(struct bus *bus)
return tolm;
}
+/* IGD UMA memory */
+uint64_t uma_memory_base=0, uma_memory_size=0;
+
+int add_northbridge_resources(struct lb_memory *mem)
+{
+ printk(BIOS_DEBUG, "Adding IGD UMA memory area\n");
+ lb_add_memory_range(mem, LB_MEM_RESERVED,
+ uma_memory_base, uma_memory_size);
+
+ return 0;
+}
+
/* 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.
@@ -118,66 +132,67 @@ static void pci_domain_set_resources(device_t dev)
{
device_t mc_dev;
uint32_t pci_tolm;
+ int igd_memory = 0;
pci_tolm = find_pci_tolm(dev->link_list);
mc_dev = dev->link_list->children;
+ if (!mc_dev)
+ return;
- if (mc_dev) {
- /* Figure out which areas are/should be occupied by RAM.
- * This is all computed in kilobytes and converted to/from
- * the memory controller right at the edges.
- * Having different variables in different units is
- * too confusing to get right. Kilobytes are good up to
- * 4 Terabytes of RAM...
- */
- unsigned long tomk, tolmk;
- int idx;
- int drp_value;
-
- /* First get the value for DIMM 0. */
- drp_value = pci_read_config8(mc_dev, DRP);
- /* Translate it to MB and add to tomk. */
- tomk = (unsigned long)(translate_i82810_to_mb[drp_value & 0xf]);
- /* Now do the same for DIMM 1. */
- drp_value = drp_value >> 4; // >>= 4; //? mess with later
- tomk += (unsigned long)(translate_i82810_to_mb[drp_value]);
-
- printk(BIOS_DEBUG, "Setting RAM size to %ld MB\n", tomk);
-
- /* Convert tomk from MB to KB. */
- tomk = tomk << 10;
-
-#if CONFIG_VIDEO_MB
- /* Check for VGA reserved memory. */
- if (CONFIG_VIDEO_MB == 512) {
- tomk -= 512;
- printk(BIOS_DEBUG, "Allocating %s RAM for VGA\n", "512KB");
- } else if (CONFIG_VIDEO_MB == 1) {
- tomk -= 1024 ;
- printk(BIOS_DEBUG, "Allocating %s RAM for VGA\n", "1MB");
- } else {
- printk(BIOS_DEBUG, "Allocating %s RAM for VGA\n", "0MB");
- }
-#endif
+ unsigned long tomk, tolmk;
+ 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;
+ }
- /* Compute the top of Low memory. */
- tolmk = pci_tolm >> 10;
- if (tolmk >= tomk) {
- /* The PCI hole does does not overlap the memory. */
- tolmk = tomk;
- }
+ /* 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 -= igd_memory;
+
+ /* For reserving UMA memory in the memory map */
+ uma_memory_base = tomk * 1024ULL;
+ uma_memory_size = igd_memory * 1024ULL;
+ printk(BIOS_DEBUG, "Available memory: %ldKB\n", tomk);
+
+ /* 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, 640);
- ram_resource(dev, idx++, 768, tolmk - 768);
+ /* Report the memory regions. */
+ idx = 10;
+ ram_resource(dev, idx++, 0, 640);
+ ram_resource(dev, idx++, 768, tolmk - 768);
#if CONFIG_WRITE_HIGH_TABLES==1
- /* Leave some space for ACPI, PIRQ and MP tables */
- high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
- high_tables_size = HIGH_TABLES_SIZE * 1024;
+ /* Leave some space for ACPI, PIRQ and MP tables */
+ high_tables_base = (tomk - HIGH_TABLES_SIZE) * 1024;
+ high_tables_size = HIGH_TABLES_SIZE * 1024;
#endif
- }
assign_resources(dev->link_list);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 23:07:44 +0000