GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync the northbridge.c with other family. 

Change-Id: Ice4d0202590fca0169dcda2770ca6add166b5c13
Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Signed-off-by: zbao <fishbaozi@gmail.com>
Reviewed-on: http://review.coreboot.org/1262
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
zbao 2012-07-23 19:41:03 +08:00 committed by Stefan Reinauer
parent 8d32b89fa4
commit d59d62484d
3 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/amd/parmer/devicetree.cb
View File

@ -25,7 +25,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
device pci_domain 0 on device pci_domain 0 on
subsystemid 0x1022 0x1410 inherit subsystemid 0x1022 0x1410 inherit
chip northbridge/amd/agesa/family15tn # CPU side of HT root complex chip northbridge/amd/agesa/family15tn # CPU side of HT root complex
# device pci 18.0 on # northbridge device pci 18.0 on # northbridge
chip northbridge/amd/agesa/family15tn # PCI side of HT root complex chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
device pci 0.0 on end # Root Complex device pci 0.0 on end # Root Complex
device pci 1.0 on end # Internal Graphics P2P bridge 0x9804 device pci 1.0 on end # Internal Graphics P2P bridge 0x9804
@ -37,6 +37,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
device pci 6.0 on end # PCIE Slot1 x1 device pci 6.0 on end # PCIE Slot1 x1
device pci 7.0 on end # LAN device pci 7.0 on end # LAN
device pci 8.0 off end # NB/SB Link P2P bridge device pci 8.0 off end # NB/SB Link P2P bridge
end
end end
chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus chip southbridge/amd/agesa/hudson # it is under NB/SB Link, but on the same pci bus
device pci 10.0 on end # XHCI HC0 device pci 10.0 on end # XHCI HC0
@ -74,7 +75,7 @@ chip northbridge/amd/agesa/family15tn/root_complex
register "boot_switch_sata_ide" = "0" # 0: boot from SATA. 1: IDE register "boot_switch_sata_ide" = "0" # 0: boot from SATA. 1: IDE
register "gpp_configuration" = "4" register "gpp_configuration" = "4"
end #southbridge/amd/hudson end #southbridge/amd/hudson
device pci 18.0 on end # device pci 18.0 on end
#device pci 18.0 on end #device pci 18.0 on end
device pci 18.1 on end device pci 18.1 on end
device pci 18.2 on end device pci 18.2 on end

4
src/mainboard/amd/parmer/mainboard.c
View File

@ -55,8 +55,8 @@ int add_mainboard_resources(struct lb_memory *mem)
/* UMA is removed from system memory in the northbridge code, but /* UMA is removed from system memory in the northbridge code, but
* in some circumstances we want the memory mentioned as reserved. * in some circumstances we want the memory mentioned as reserved.
*/ */
/* TODO: Check out why it is commented. */ /* TODO: Check out why it was commented. */
#if 0 /* (CONFIG_GFXUMA == 1) */ #if CONFIG_GFXUMA
printk(BIOS_INFO, "uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", printk(BIOS_INFO, "uma_memory_start=0x%llx, uma_memory_size=0x%llx \n",
uma_memory_base, uma_memory_size); uma_memory_base, uma_memory_size);
lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base,

43
src/northbridge/amd/agesa/family15tn/northbridge.c
View File

@ -399,7 +399,7 @@ static void create_vga_resource(device_t dev, unsigned nodeid)
* we only deal with the 'first' vga card */ * we only deal with the 'first' vga card */
for (link = dev->link_list; link; link = link->next) { for (link = dev->link_list; link; link = link->next) {
if (link->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { if (link->bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
#if CONFIG_MULTIPLE_VGA_ADAPTERS == 1 #if CONFIG_MULTIPLE_VGA_ADAPTERS
extern device_t vga_pri; // the primary vga device, defined in device.c extern device_t vga_pri; // the primary vga device, defined in device.c
printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary, printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary,
link->secondary,link->subordinate); link->secondary,link->subordinate);
@ -447,12 +447,35 @@ static void northbridge_init(struct device *dev)
{ {
} }
static unsigned scan_chains(device_t dev, unsigned max)
{
unsigned nodeid;
struct bus *link;
device_t io_hub = NULL;
u32 next_unitid = 0x18;
nodeid = amdfam15_nodeid(dev);
if (nodeid == 0) {
for (link = dev->link_list; link; link = link->next) {
//if (link->link_num == sblink) { /* devicetree put IO Hub on link_lsit[sblink] */
if (link->link_num == 0) { /* devicetree put IO Hub on link_lsit[0] */
io_hub = link->children;
if (!io_hub || !io_hub->enabled) {
die("I can't find the IO Hub, or IO Hub not enabled, please check the device tree.\n");
}
/* Now that nothing is overlapping it is safe to scan the children. */
max = pci_scan_bus(link, 0x00, ((next_unitid - 1) << 3) | 7, 0);
}
}
}
return max;
}
static struct device_operations northbridge_operations = { static struct device_operations northbridge_operations = {
.read_resources = read_resources, .read_resources = read_resources,
.set_resources = set_resources, .set_resources = set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = northbridge_init, .init = northbridge_init,
.scan_bus = 0, /*scan_chains, */ .scan_bus = scan_chains,
.enable = 0, .enable = 0,
.ops_pci = 0, .ops_pci = 0,
}; };
@ -508,7 +531,7 @@ static void domain_read_resources(device_t dev)
/* FIXME: do we need to check extend conf space? /* FIXME: do we need to check extend conf space?
I don't believe that much preset value */ I don't believe that much preset value */
#if CONFIG_PCI_64BIT_PREF_MEM == 0 #if !CONFIG_PCI_64BIT_PREF_MEM
pci_domain_read_resources(dev); pci_domain_read_resources(dev);
#else #else
@ -663,7 +686,7 @@ void setup_uma_memory(void)
static void domain_set_resources(device_t dev) static void domain_set_resources(device_t dev)
{ {
#if CONFIG_PCI_64BIT_PREF_MEM == 1 #if CONFIG_PCI_64BIT_PREF_MEM
struct resource *io, *mem1, *mem2; struct resource *io, *mem1, *mem2;
struct resource *res; struct resource *res;
#endif #endif
@ -676,7 +699,7 @@ static void domain_set_resources(device_t dev)
u32 reset_memhole = 1; u32 reset_memhole = 1;
#endif #endif
#if CONFIG_PCI_64BIT_PREF_MEM == 1 #if CONFIG_PCI_64BIT_PREF_MEM
for (link = dev->link_list; link; link = link->next) { for (link = dev->link_list; link; link = link->next) {
/* Now reallocate the pci resources memory with the /* Now reallocate the pci resources memory with the
@ -791,10 +814,10 @@ static void domain_set_resources(device_t dev)
ram_resource(dev, (idx | i), basek, pre_sizek); ram_resource(dev, (idx | i), basek, pre_sizek);
idx += 0x10; idx += 0x10;
sizek -= pre_sizek; sizek -= pre_sizek;
#if CONFIG_WRITE_HIGH_TABLES==1 #if CONFIG_WRITE_HIGH_TABLES
if (high_tables_base==0) { if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */ /* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1 #if CONFIG_GFXUMA
high_tables_base = uma_memory_base - HIGH_MEMORY_SIZE; high_tables_base = uma_memory_base - HIGH_MEMORY_SIZE;
#else #else
high_tables_base = (mmio_basek * 1024) - HIGH_MEMORY_SIZE; high_tables_base = (mmio_basek * 1024) - HIGH_MEMORY_SIZE;
@ -818,12 +841,12 @@ static void domain_set_resources(device_t dev)
ram_resource(dev, (idx | i), basek, sizek); ram_resource(dev, (idx | i), basek, sizek);
idx += 0x10; idx += 0x10;
#if CONFIG_WRITE_HIGH_TABLES==1 #if CONFIG_WRITE_HIGH_TABLES
printk(BIOS_DEBUG, "node %d: mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", printk(BIOS_DEBUG, "node %d: mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n",
i, mmio_basek, basek, limitk); i, mmio_basek, basek, limitk);
if (high_tables_base==0) { if (high_tables_base==0) {
/* Leave some space for ACPI, PIRQ and MP tables */ /* Leave some space for ACPI, PIRQ and MP tables */
#if CONFIG_GFXUMA == 1 #if CONFIG_GFXUMA
high_tables_base = uma_memory_base - HIGH_MEMORY_SIZE; high_tables_base = uma_memory_base - HIGH_MEMORY_SIZE;
#else #else
high_tables_base = (limitk * 1024) - HIGH_MEMORY_SIZE; high_tables_base = (limitk * 1024) - HIGH_MEMORY_SIZE;
@ -1018,7 +1041,7 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
* otherwise the device under it will not be scanned * otherwise the device under it will not be scanned
*/ */
int linknum; int linknum;
#if CONFIG_HT3_SUPPORT==1 #if CONFIG_HT3_SUPPORT
linknum = 8; linknum = 8;
#else #else
linknum = 4; linknum = 4;