Revert sblk/sblink change, use sblk like the rest of the codebase does.

[coreboot.git] / src / southbridge / amd / rs780 / rs780_gfx.c

diff --git a/src/southbridge/amd/rs780/rs780_gfx.c b/src/southbridge/amd/rs780/rs780_gfx.c
index 7208acd864b17a0f41c030b06227b2973ebed59f..a9801a17cd4283c6fbb95e3dda7c56d18ba190ca 100644 (file)
--- a/src/southbridge/amd/rs780/rs780_gfx.c
+++ b/src/southbridge/amd/rs780/rs780_gfx.c
@@ -304,7 +304,7 @@ static void internal_gfx_pci_dev_init(struct device *dev)
        volatile u32 * pointer;
        int i;
        u16 command;
-       u32 value;
+       u32 value, sblk;
        u16 deviceid, vendorid;
        device_t nb_dev = dev_find_slot(0, 0);
        device_t k8_f2 = dev_find_slot(0, PCI_DEVFN(0x18, 2));
@@ -453,9 +453,15 @@ static void internal_gfx_pci_dev_init(struct device *dev)
        vgainfo.usMinNBVoltage = 0;
        vgainfo.usBootUpNBVoltage = 0x1a;
 
+       /* Get SBLink value (HyperTransport I/O Hub Link ID). */
+       value = pci_read_config32(k8_f0, 0x64);
+       sblk = (value >> 8) & 0x3;
+       printk(BIOS_DEBUG, "SBLINK = %d.\n", sblk);
+
+       /* HT speed */
        value = pci_read_config32(nb_dev, 0xd0);
        printk(BIOS_DEBUG, "NB HT speed = %x.\n", value);
-       value = pci_read_config32(k8_f0, 0x88);
+       value = pci_read_config32(k8_f0, 0x88 + (sblk * 0x20));
        printk(BIOS_DEBUG, "CPU HT speed = %x.\n", value);
        vgainfo.ulHTLinkFreq = 100 * 100; /* set HT speed. */