During the suspend/resume programming I came to an issue that first 4KB of

memory must be clear with 0s because otherwise the resources of K8 will be
totally messed up.

res = probe_resource(dev, 0x100 + (reg | link));

This is called with dev = NULL and this is no good for probe_resource at all.
The attached patch fixes the potential problems and of course the problem
itself. On one particular place was missing test if the device really exists.
This was copied to fam10 and perhaps the same issue is in v3 (DID NOT check).
The rest of the patch is just very paranoid and do all checkings.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Myles Watson <mylesgw@gmail.com>
--This line, and those below, will be igno
red--

M    src/devices/pci_ops.c
M    src/northbridge/amd/amdk8/northbridge.c
M    src/northbridge/amd/amdfam10/northbridge.c

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4030 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/devices/pci_ops.c b/src/devices/pci_ops.c
index c6d85f284e2af3b8ff4ce7ff1a2c97cfab7cf733..08792f209d7ca80419cfbbbfc89e7e4564d97621 100644 (file)
--- a/src/devices/pci_ops.c
+++ b/src/devices/pci_ops.c
@@ -27,7 +27,13 @@
 
 static struct bus *get_pbus(device_t dev)
 {
-       struct bus *pbus = dev->bus;
+       struct bus *pbus;
+
+       if (!dev)
+               printk_alert("get_pbus: dev is NULL!\n");
+
+       pbus = dev->bus;
+
        while(pbus && pbus->dev && !ops_pci_bus(pbus)) {
                if (pbus == pbus->dev->bus) {
                        printk_alert("%s in endless loop looking for a parent "

diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index bdb743387d5eeedfdbdf065f7463a7e40ddedfcd..95e09f4c6a26ab625e4da326638a9282e89a2059 100644 (file)
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -338,6 +338,8 @@ static int reg_useable(u32 reg,device_t goal_dev, u32 goal_nodeid,
        for(nodeid = 0; !res && (nodeid < NODE_NUMS); nodeid++) {
                device_t dev;
                dev = __f0_dev[nodeid];
+               if (!dev)
+                       continue;
                for(link = 0; !res && (link < 8); link++) {
                        res = probe_resource(dev, 0x1000 + reg + (link<<16)); // 8 links, 0x1000 man f1,
                }

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index c2c89d1ffb8d35737e1789a6e9189494ba40632b..59cbbff4d0d8395db1a12922df8b039986c920f1 100644 (file)
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -291,9 +291,11 @@ static int reg_useable(unsigned reg,
        unsigned nodeid, link;
        int result;
        res = 0;
-       for(nodeid = 0; !res && (nodeid < 8); nodeid++) {
+       for(nodeid = 0; !res && (nodeid < FX_DEVS); nodeid++) {
                device_t dev;
                dev = __f0_dev[nodeid];
+               if (!dev)
+                       continue;
                for(link = 0; !res && (link < 3); link++) {
                        res = probe_resource(dev, 0x100 + (reg | link));
                }
@@ -760,14 +762,15 @@ static struct hw_mem_hole_info get_hw_mem_hole_info(void)
                mem_hole.hole_startk = HW_MEM_HOLE_SIZEK;
                mem_hole.node_id = -1;
 
-               for (i = 0; i < 8; i++) {
+               for (i = 0; i < FX_DEVS; i++) {
                        uint32_t base;
                        uint32_t hole;
                        base  = f1_read_config32(0x40 + (i << 3));
                        if ((base & ((1<<1)|(1<<0))) != ((1<<1)|(1<<0))) {
                                continue;
                        }
-
+                       if (!__f1_dev[i])
+                               continue;
                        hole = pci_read_config32(__f1_dev[i], 0xf0);
                        if(hole & 1) { // we find the hole
                                mem_hole.hole_startk = (hole & (0xff<<24)) >> 10;
@@ -834,15 +837,15 @@ static void disable_hoist_memory(unsigned long hole_startk, int i)
        limit = f1_read_config32(0x44 + (i << 3));
        f1_write_config32(0x44 + (i << 3),limit - (hole_sizek << 2));
        dev = __f1_dev[i];
-       hoist = pci_read_config32(dev, 0xf0);
-       if(hoist & 1) {
-               pci_write_config32(dev, 0xf0, 0);
-       }
-       else {
-               base = pci_read_config32(dev, 0x40 + (i << 3));
-               f1_write_config32(0x40 + (i << 3),base - (hole_sizek << 2));
+       if (dev) {
+               hoist = pci_read_config32(dev, 0xf0);
+               if(hoist & 1) {
+                       pci_write_config32(dev, 0xf0, 0);
+               } else {
+                       base = pci_read_config32(dev, 0x40 + (i << 3));
+                       f1_write_config32(0x40 + (i << 3),base - (hole_sizek << 2));
+               }
        }
-
 }
 
 static uint32_t hoist_memory(unsigned long hole_startk, int i)
@@ -878,7 +881,7 @@ static uint32_t hoist_memory(unsigned long hole_startk, int i)
                base |= (4*1024*1024)<<2;
                f1_write_config32(0x40 + (i<<3), base);
        }
-       else
+       else if (dev)
        {
                hoist = /* hole start address */
                        ((hole_startk << 10) & 0xff000000) +
@@ -1020,7 +1023,7 @@ static void pci_domain_set_resources(device_t dev)
                #if HW_MEM_HOLE_SIZE_AUTO_INC == 1
                        //We need to double check if the mmio_basek is valid for hole setting, if it is equal to basek, we need to decrease it some
                        uint32_t basek_pri;
-                       for (i = 0; i < 8; i++) {
+                       for (i = 0; i < FX_DEVS; i++) {
                                uint32_t base;
                                uint32_t basek;
                                base  = f1_read_config32(0x40 + (i << 3));
@@ -1045,7 +1048,7 @@ static void pci_domain_set_resources(device_t dev)
 #endif
 
        idx = 0x10;
-       for(i = 0; i < 8; i++) {
+       for(i = 0; i < FX_DEVS; i++) {
                uint32_t base, limit;
                unsigned basek, limitk, sizek;
                base  = f1_read_config32(0x40 + (i << 3));