Since some people disapprove of white space cleanups mixed in regular commits
[coreboot.git] / src / devices / hypertransport.c
index fd347083df847fe299e0af354ae5cc92228f397c..674971cb949a9499964647214a36b50f7c63773e 100644 (file)
@@ -1,9 +1,32 @@
 /*
-       2005.11 yhlu add let the real sb to use small uintid
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2003-2004 Linux Networx
+ * (Written by Eric Biederman <ebiederman@lnxi.com> for Linux Networx)
+ * Copyright (C) 2004 David Hendricks <sc@flagen.com>
+ * Copyright (C) 2004 Li-Ta Lo <ollie@lanl.gov>
+ * Copyright (C) 2005-2006 Tyan
+ * (Written by Yinghai Lu <yhlu@tyan.com> for Tyan)
+ * Copyright (C) 2005-2006 Stefan Reinauer <stepan@openbios.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
+ * 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
+ */
 
+/*
+       2005.11 yhlu add let the real sb to use small uintid
 */
 
-
 #include <bitops.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/hypertransport.h>
-#include <part/hard_reset.h>
-#include <part/fallback_boot.h>
 
+/* The hypertransport link is already optimized in pre-ram code
+ * so don't do it again
+ */
 #define OPT_HT_LINK 0
-        
+
 #if OPT_HT_LINK == 1
 #include <cpu/amd/model_fxx_rev.h>
 #endif
@@ -28,9 +52,9 @@ static device_t ht_scan_get_devs(device_t *old_devices)
        /* Extract the chain of devices to (first through last)
         * for the next hypertransport device.
         */
-       while(last && last->sibling && 
+       while(last && last->sibling &&
                (last->sibling->path.type == DEVICE_PATH_PCI) &&
-               (last->sibling->path.u.pci.devfn > last->path.u.pci.devfn)) 
+               (last->sibling->path.pci.devfn > last->path.pci.devfn))
        {
                last = last->sibling;
        }
@@ -77,10 +101,12 @@ static unsigned ht_read_freq_cap(device_t dev, unsigned pos)
        }
        /* AMD K8 Unsupported 1Ghz? */
        if ((dev->vendor == PCI_VENDOR_ID_AMD) && (dev->device == 0x1100)) {
-#if K8_HT_FREQ_1G_SUPPORT == 1 
+#if CONFIG_K8_HT_FREQ_1G_SUPPORT == 1
+       #if CONFIG_K8_REV_F_SUPPORT == 0
                if (is_cpu_pre_e0()) { // only e0 later suupport 1GHz HT
                        freq_cap &= ~(1 << HT_FREQ_1000Mhz);
-               } 
+               }
+       #endif
 #else
                freq_cap &= ~(1 << HT_FREQ_1000Mhz);
 #endif
@@ -98,21 +124,23 @@ struct ht_link {
 
 static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
 {
+#if OPT_HT_LINK == 1
        static const uint8_t link_width_to_pow2[]= { 3, 4, 0, 5, 1, 2, 0, 0 };
        static const uint8_t pow2_to_link_width[] = { 0x7, 4, 5, 0, 1, 3 };
-       struct ht_link cur[1];
        unsigned present_width_cap,    upstream_width_cap;
        unsigned present_freq_cap,     upstream_freq_cap;
-       unsigned ln_present_width_in,  ln_upstream_width_in; 
+       unsigned ln_present_width_in,  ln_upstream_width_in;
        unsigned ln_present_width_out, ln_upstream_width_out;
        unsigned freq, old_freq;
        unsigned present_width, upstream_width, old_width;
+#endif
+       struct ht_link cur[1];
        int reset_needed;
        int linkb_to_host;
 
        /* Set the hypertransport link width and frequency */
        reset_needed = 0;
-       /* See which side of the device our previous write to 
+       /* See which side of the device our previous write to
         * set the unitid came from.
         */
        cur->dev = dev;
@@ -136,7 +164,7 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
        upstream_freq_cap  = ht_read_freq_cap(prev->dev, prev->pos + prev->freq_cap_off);
        present_width_cap  = pci_read_config8(cur->dev, cur->pos + cur->config_off);
        upstream_width_cap = pci_read_config8(prev->dev, prev->pos + prev->config_off);
-       
+
        /* Calculate the highest useable frequency */
        freq = log2(present_freq_cap & upstream_freq_cap);
 
@@ -164,11 +192,11 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
                unsigned new_freq;
                pci_write_config8(cur->dev, cur->pos + cur->freq_off, freq);
                reset_needed = 1;
-               printk_spew("HyperT FreqP old %x new %x\n",old_freq,freq);
+               printk(BIOS_SPEW, "HyperT FreqP old %x new %x\n",old_freq,freq);
                new_freq = pci_read_config8(cur->dev, cur->pos + cur->freq_off);
                new_freq &= 0x0f;
                if (new_freq != freq) {
-                       printk_err("%s Hypertransport frequency would not set wanted: %x got: %x\n",
+                       printk(BIOS_ERR, "%s Hypertransport frequency would not set wanted: %x got: %x\n",
                                dev_path(dev), freq, new_freq);
                }
        }
@@ -178,10 +206,10 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
                pci_write_config8(cur->dev, cur->pos + cur->config_off + 1,
                        present_width);
                reset_needed = 1;
-               printk_spew("HyperT widthP old %x new %x\n",old_width, present_width);
+               printk(BIOS_SPEW, "HyperT widthP old %x new %x\n",old_width, present_width);
                new_width = pci_read_config8(cur->dev, cur->pos + cur->config_off + 1);
                if (new_width != present_width) {
-                       printk_err("%s Hypertransport width would not set wanted: %x got: %x\n",
+                       printk(BIOS_ERR, "%s Hypertransport width would not set wanted: %x got: %x\n",
                                dev_path(dev), present_width, new_width);
                }
        }
@@ -193,11 +221,11 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
                unsigned new_freq;
                pci_write_config8(prev->dev, prev->pos + prev->freq_off, freq);
                reset_needed = 1;
-               printk_spew("HyperT freqU old %x new %x\n", old_freq, freq);
+               printk(BIOS_SPEW, "HyperT freqU old %x new %x\n", old_freq, freq);
                new_freq = pci_read_config8(prev->dev, prev->pos + prev->freq_off);
                new_freq &= 0x0f;
                if (new_freq != freq) {
-                       printk_err("%s Hypertransport frequency would not set wanted: %x got: %x\n",
+                       printk(BIOS_ERR, "%s Hypertransport frequency would not set wanted: %x got: %x\n",
                                dev_path(prev->dev), freq, new_freq);
                }
        }
@@ -206,15 +234,15 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
                unsigned new_width;
                pci_write_config8(prev->dev, prev->pos + prev->config_off + 1, upstream_width);
                reset_needed = 1;
-               printk_spew("HyperT widthU old %x new %x\n", old_width, upstream_width);
+               printk(BIOS_SPEW, "HyperT widthU old %x new %x\n", old_width, upstream_width);
                new_width = pci_read_config8(prev->dev, prev->pos + prev->config_off + 1);
                if (new_width != upstream_width) {
-                       printk_err("%s Hypertransport width would not set wanted: %x got: %x\n",
+                       printk(BIOS_ERR, "%s Hypertransport width would not set wanted: %x got: %x\n",
                                dev_path(prev->dev), upstream_width, new_width);
                }
        }
 #endif
-       
+
        /* Remember the current link as the previous link,
         * But look at the other offsets.
         */
@@ -233,7 +261,7 @@ static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)
        }
 
        return reset_needed;
-               
+
 }
 
 static unsigned ht_lookup_slave_capability(struct device *dev)
@@ -245,7 +273,7 @@ static unsigned ht_lookup_slave_capability(struct device *dev)
                if (pos) {
                        unsigned flags;
                        flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
-                       printk_spew("flags: 0x%04x\n", flags);
+                       printk(BIOS_SPEW, "flags: 0x%04x\n", flags);
                        if ((flags >> 13) == 0) {
                                /* Entry is a Slave secondary, success... */
                                break;
@@ -278,24 +306,37 @@ static void ht_collapse_early_enumeration(struct bus *bus, unsigned offset_uniti
                }
                /* Has the link failed? */
                if (ctrl & (1 << 4)) {
-                       return;
+                       /*
+                        * Either the link has failed, or we have
+                        * a CRC error.
+                        * Sometimes this can happen due to link
+                        * retrain, so lets knock it down and see
+                        * if its transient
+                        */
+                       ctrl |= ((1 << 4) | (1 <<8)); // Link fail + Crc
+                       pci_write_config16(prev.dev, prev.pos + prev.ctrl_off, ctrl);
+                       ctrl = pci_read_config16(prev.dev, prev.pos + prev.ctrl_off);
+                       if (ctrl & ((1 << 4) | (1 << 8))) {
+                               printk(BIOS_ALERT, "Detected error on Hypertransport Link\n");
+                               return;
+                       }
                }
        } while((ctrl & (1 << 5)) == 0);
 
                //actually, only for one HT device HT chain, and unitid is 0
-#if HT_CHAIN_UNITID_BASE == 0
+#if CONFIG_HT_CHAIN_UNITID_BASE == 0
         if(offset_unitid) {
                 return;
         }
 #endif
 
         /* Check if is already collapsed */
-        if((!offset_unitid)|| (offset_unitid && (!((HT_CHAIN_END_UNITID_BASE == 0) && (HT_CHAIN_END_UNITID_BASE <HT_CHAIN_UNITID_BASE))))) {
+        if((!offset_unitid)|| (offset_unitid && (!((CONFIG_HT_CHAIN_END_UNITID_BASE == 0) && (CONFIG_HT_CHAIN_END_UNITID_BASE <CONFIG_HT_CHAIN_UNITID_BASE))))) {
                 struct device dummy;
                 uint32_t id;
                 dummy.bus              = bus;
                 dummy.path.type        = DEVICE_PATH_PCI;
-                dummy.path.u.pci.devfn = PCI_DEVFN(0, 0);
+                dummy.path.pci.devfn = PCI_DEVFN(0, 0);
                 id = pci_read_config32(&dummy, PCI_VENDOR_ID);
                 if ( ! ( (id == 0xffffffff) || (id == 0x00000000) ||
                     (id == 0x0000ffff) || (id == 0xffff0000) ) ) {
@@ -312,9 +353,9 @@ static void ht_collapse_early_enumeration(struct bus *bus, unsigned offset_uniti
                unsigned pos, flags;
                dummy.bus              = bus;
                dummy.path.type        = DEVICE_PATH_PCI;
-               dummy.path.u.pci.devfn = devfn;
+               dummy.path.pci.devfn = devfn;
                id = pci_read_config32(&dummy, PCI_VENDOR_ID);
-               if (    (id == 0xffffffff) || (id == 0x00000000) || 
+               if (    (id == 0xffffffff) || (id == 0x00000000) ||
                        (id == 0x0000ffff) || (id == 0xffff0000)) {
                        continue;
                }
@@ -330,27 +371,29 @@ static void ht_collapse_early_enumeration(struct bus *bus, unsigned offset_uniti
                flags = pci_read_config16(&dummy, pos + PCI_CAP_FLAGS);
                flags &= ~0x1f;
                pci_write_config16(&dummy, pos + PCI_CAP_FLAGS, flags);
-               printk_spew("Collapsing %s [%04x/%04x]\n", 
+               printk(BIOS_SPEW, "Collapsing %s [%04x/%04x]\n",
                        dev_path(&dummy), dummy.vendor, dummy.device);
        }
 }
 
-unsigned int hypertransport_scan_chain(struct bus *bus, 
-       unsigned min_devfn, unsigned max_devfn, unsigned int max, unsigned offset_unitid)
+unsigned int hypertransport_scan_chain(struct bus *bus,
+       unsigned min_devfn, unsigned max_devfn, unsigned int max, unsigned *ht_unitid_base, unsigned offset_unitid)
 {
-       //even HT_CHAIN_UNITID_BASE == 0, we still can go through this function, because of end_of_chain check, also We need it to optimize link
+       //even CONFIG_HT_CHAIN_UNITID_BASE == 0, we still can go through this function, because of end_of_chain check, also We need it to optimize link
        unsigned next_unitid, last_unitid;
        device_t old_devices, dev, func;
-       unsigned min_unitid = (offset_unitid) ? HT_CHAIN_UNITID_BASE:1;
+       unsigned min_unitid = (offset_unitid) ? CONFIG_HT_CHAIN_UNITID_BASE:1;
        struct ht_link prev;
        device_t last_func = 0;
-
-#if HT_CHAIN_END_UNITID_BASE < HT_CHAIN_UNITID_BASE
-        //let't record the device of last ht device, So we can set the Unitid to HT_CHAIN_END_UNITID_BASE
-        unsigned real_last_unitid; 
-        uint8_t real_last_pos;
-       device_t real_last_dev;
        int ht_dev_num = 0;
+       unsigned max_unitid;
+
+#if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
+        //let't record the device of last ht device, So we can set the Unitid to CONFIG_HT_CHAIN_END_UNITID_BASE
+        unsigned real_last_unitid=0;
+        uint8_t real_last_pos=0;
+       device_t real_last_dev=NULL;
+       unsigned end_used = 0;
 #endif
 
        /* Restore the hypertransport chain to it's unitialized state */
@@ -367,10 +410,10 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
        prev.config_off   = PCI_HT_CAP_HOST_WIDTH;
        prev.freq_off     = PCI_HT_CAP_HOST_FREQ;
        prev.freq_cap_off = PCI_HT_CAP_HOST_FREQ_CAP;
-       
+
        /* If present assign unitid to a hypertransport chain */
        last_unitid = min_unitid -1;
-       next_unitid = min_unitid;
+       max_unitid = next_unitid = min_unitid;
        do {
                uint8_t pos;
                uint16_t flags;
@@ -382,15 +425,28 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
                /* Wait until the link initialization is complete */
                do {
                        ctrl = pci_read_config16(prev.dev, prev.pos + prev.ctrl_off);
-                       /* Is this the end of the hypertransport chain?
-                        * Has the link failed?
-                        * If so further scanning is pointless.
-                        */
-                       if (ctrl & ((1 << 6) | (1 << 4))) {
-                               goto end_of_chain;
+
+                       if (ctrl & (1 << 6))
+                               goto end_of_chain;      // End of chain
+
+                       if (ctrl & ((1 << 4) | (1 << 8))) {
+                               /*
+                                * Either the link has failed, or we have
+                                * a CRC error.
+                                * Sometimes this can happen due to link
+                                * retrain, so lets knock it down and see
+                                * if its transient
+                                */
+                               ctrl |= ((1 << 4) | (1 <<8)); // Link fail + Crc
+                               pci_write_config16(prev.dev, prev.pos + prev.ctrl_off, ctrl);
+                               ctrl = pci_read_config16(prev.dev, prev.pos + prev.ctrl_off);
+                               if (ctrl & ((1 << 4) | (1 << 8))) {
+                                       printk(BIOS_ALERT, "Detected error on Hypertransport Link\n");
+                                       goto end_of_chain;
+                               }
                        }
                } while((ctrl & (1 << 5)) == 0);
-               
+
 
                /* Get and setup the device_structure */
                dev = ht_scan_get_devs(&old_devices);
@@ -406,15 +462,15 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
                /* Find the hypertransport link capability */
                pos = ht_lookup_slave_capability(dev);
                if (pos == 0) {
-                       printk_err("%s Hypertransport link capability not found", 
+                       printk(BIOS_ERR, "%s Hypertransport link capability not found",
                                dev_path(dev));
                        break;
                }
-               
+
                /* Update the Unitid of the current device */
                flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
-        
-               /* If the devices has a unitid set and is at devfn 0 we are done. 
+
+               /* If the devices has a unitid set and is at devfn 0 we are done.
                 * This can happen with shadow hypertransport devices,
                 * or if we have reached the bottom of a
                 * hypertransport device chain.
@@ -422,114 +478,123 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
                if (flags & 0x1f) {
                        break;
                }
-
                flags &= ~0x1f; /* mask out base Unit ID */
-#if CK804_DEVN_BASE==0  
-               if((dev->vendor == 0x10de) && (dev->device == 0x005e)) {
-                       next_unitid = 0;
-               } 
-               else {
-#endif
-                       flags |= next_unitid & 0x1f;
-                       pci_write_config16(dev, pos + PCI_CAP_FLAGS, flags);
-#if CK804_DEVN_BASE==0 
-               }
+
+               count = (flags >> 5) & 0x1f; /* get unit count */
+#if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
+               if(offset_unitid) {
+                       if(next_unitid > (max_devfn>>3)) { // max_devfn will be (0x17<<3)|7 or (0x1f<<3)|7
+                               if(!end_used) {
+                                       next_unitid = CONFIG_HT_CHAIN_END_UNITID_BASE;
+                                       end_used = 1;
+                               } else {
+                                       goto end_of_chain;
+                               }
+                       }
+
+               }
 #endif
 
+                flags |= next_unitid & 0x1f;
+                pci_write_config16(dev, pos + PCI_CAP_FLAGS, flags);
+
                /* Update the Unitd id in the device structure */
                static_count = 1;
                for(func = dev; func; func = func->sibling) {
-                       func->path.u.pci.devfn += (next_unitid << 3);
-                       static_count = (func->path.u.pci.devfn >> 3) 
-                               - (dev->path.u.pci.devfn >> 3) + 1;
+                       func->path.pci.devfn += (next_unitid << 3);
+                       static_count = (func->path.pci.devfn >> 3)
+                               - (dev->path.pci.devfn >> 3) + 1;
                        last_func = func;
                }
-
                /* Compute the number of unitids consumed */
-               count = (flags >> 5) & 0x1f; /* get unit count */
-               printk_spew("%s count: %04x static_count: %04x\n", 
+               printk(BIOS_SPEW, "%s count: %04x static_count: %04x\n",
                        dev_path(dev), count, static_count);
                if (count < static_count) {
                        count = static_count;
                }
 
                /* Update the Unitid of the next device */
-#if HT_CHAIN_END_UNITID_BASE < HT_CHAIN_UNITID_BASE
-               if(offset_unitid) {
-                       real_last_unitid = next_unitid;
+               ht_unitid_base[ht_dev_num] = next_unitid;
+               ht_dev_num++;
+
+#if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
+               if (offset_unitid) {
                        real_last_pos = pos;
+                       real_last_unitid = next_unitid;
                        real_last_dev = dev;
-                       ht_dev_num++;
                }
 #endif
-               next_unitid += count;
+               next_unitid +=  count;
+               if (next_unitid > max_unitid) {
+                       max_unitid = next_unitid;
+               }
 
                /* Setup the hypetransport link */
                bus->reset_needed |= ht_setup_link(&prev, dev, pos);
 
-               printk_debug("%s [%04x/%04x] %s next_unitid: %04x\n",
+               printk(BIOS_DEBUG, "%s [%04x/%04x] %s next_unitid: %04x\n",
                        dev_path(dev),
-                       dev->vendor, dev->device, 
+                       dev->vendor, dev->device,
                        (dev->enabled? "enabled": "disabled"), next_unitid);
 
-#if CK804_DEVN_BASE==0 
-               if ((dev->vendor == 0x10de) && (dev->device == 0x005e)) {
-                      break; // CK804 can not change unitid, so it only can be alone in the link
-                }
-#endif
-
-       } while((last_unitid != next_unitid) && (next_unitid <= (max_devfn >> 3)));
+       } while (last_unitid != next_unitid);
  end_of_chain:
 #if OPT_HT_LINK == 1
        if(bus->reset_needed) {
-               printk_info("HyperT reset needed\n");
+               printk(BIOS_INFO, "HyperT reset needed\n");
        }
        else {
-               printk_debug("HyperT reset not needed\n");
+               printk(BIOS_DEBUG, "HyperT reset not needed\n");
        }
 #endif
 
-#if HT_CHAIN_END_UNITID_BASE < HT_CHAIN_UNITID_BASE
-        if(offset_unitid && (ht_dev_num>0)) {
+#if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
+        if(offset_unitid && (ht_dev_num>1) && (real_last_unitid != CONFIG_HT_CHAIN_END_UNITID_BASE)  && !end_used) {
                 uint16_t flags;
-                int i;
-               device_t last_func = 0;
                 flags = pci_read_config16(real_last_dev, real_last_pos + PCI_CAP_FLAGS);
                 flags &= ~0x1f;
-                flags |= HT_CHAIN_END_UNITID_BASE & 0x1f;
+                flags |= CONFIG_HT_CHAIN_END_UNITID_BASE & 0x1f;
                 pci_write_config16(real_last_dev, real_last_pos + PCI_CAP_FLAGS, flags);
 
                 for(func = real_last_dev; func; func = func->sibling) {
-                        func->path.u.pci.devfn -= ((real_last_unitid - HT_CHAIN_END_UNITID_BASE) << 3);
+                        func->path.pci.devfn -= ((real_last_unitid - CONFIG_HT_CHAIN_END_UNITID_BASE) << 3);
                        last_func = func;
                 }
 
-                next_unitid = real_last_unitid;
+               ht_unitid_base[ht_dev_num-1] = CONFIG_HT_CHAIN_END_UNITID_BASE; // update last one
+
+               printk(BIOS_DEBUG, " unitid: %04x --> %04x\n",
+                               real_last_unitid, CONFIG_HT_CHAIN_END_UNITID_BASE);
+
         }
 #endif
+       next_unitid = max_unitid;
 
-       if (next_unitid > 0x1f) {
-               next_unitid = 0x1f;
+       if (next_unitid > 0x20) {
+               next_unitid = 0x20;
+       }
+       if( (bus->secondary == 0) && (next_unitid > 0x18)) {
+               next_unitid = 0x18; /* avoid K8 on bus 0 */
        }
 
-       /* Die if any leftover Static devices are are found.  
+       /* Die if any leftover Static devices are are found.
         * There's probably a problem in the Config.lb.
         */
        if(old_devices) {
                device_t left;
                for(left = old_devices; left; left = left->sibling) {
-                       printk_debug("%s\n", dev_path(left));
+                       printk(BIOS_DEBUG, "%s\n", dev_path(left));
                }
-               printk_err("HT: Left over static devices.  Check your Config.lb\n");
+               printk(BIOS_ERR, "HT: Left over static devices.  Check your Config.lb\n");
                if(last_func  && !last_func->sibling) // put back the left over static device, and let pci_scan_bus disable it
-                       last_func->sibling = old_devices; 
+                       last_func->sibling = old_devices;
        }
 
        /* Now that nothing is overlapping it is safe to scan the
-        * children. 
+        * children.
         */
-       max = pci_scan_bus(bus, 0x00, (next_unitid << 3)|7, max); 
-       return max; 
+       max = pci_scan_bus(bus, 0x00, ((next_unitid-1) << 3)|7, max);
+       return max;
 }
 
 /**
@@ -545,9 +610,17 @@ unsigned int hypertransport_scan_chain(struct bus *bus,
  *
  * @return The maximum bus number found, after scanning all subordinate busses
  */
+static unsigned int hypertransport_scan_chain_x(struct bus *bus,
+        unsigned min_devfn, unsigned max_devfn, unsigned int max)
+{
+       unsigned ht_unitid_base[4];
+       unsigned offset_unitid = 1;
+       return hypertransport_scan_chain(bus, min_devfn, max_devfn, max, ht_unitid_base, offset_unitid);
+}
+
 unsigned int ht_scan_bridge(struct device *dev, unsigned int max)
 {
-       return do_pci_scan_bridge(dev, max, hypertransport_scan_chain);
+       return do_pci_scan_bridge(dev, max, hypertransport_scan_chain_x);
 }