diff options
| -rw-r--r-- | src/include/device/device.h | 2 | ||||
| -rw-r--r-- | src/southbridge/amd/amd8111/amd8111.c | 68 |
2 files changed, 67 insertions, 3 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h index 52fb723ebe..439fc606a3 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -101,7 +101,7 @@ device_t dev_find_slot (unsigned int bus, unsigned int devfn); struct device_operations default_dev_ops_root; extern void root_dev_read_resources(device_t dev); extern void root_dev_set_resources(device_t dev); -extern unsigned int walk_static_devices(device_t bus, unsigned int max); +extern unsigned int scan_static_bus(device_t bus, unsigned int max); extern void enable_childrens_resources(device_t dev); extern unsigned int root_dev_scan_pci_bus(device_t root, unsigned int max); diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c index 2c5d1e80fe..74f69ee88d 100644 --- a/src/southbridge/amd/amd8111/amd8111.c +++ b/src/southbridge/amd/amd8111/amd8111.c @@ -13,12 +13,75 @@ void amd8111_enable(device_t dev) uint16_t reg_old, reg; uint8_t byte; + { + uint16_t vendor, device; + vendor = pci_read_config16(dev, PCI_VENDOR_ID); + device = pci_read_config16(dev, PCI_DEVICE_ID); + printk_debug("%s: %s %s [%x/%x]\n", __FUNCTION__, + dev->enabled? "enabling" : "disabling", dev_path(dev), + vendor, device); + } + + /* See if we are on the behind the amd8111 pci bridge */ + bus_dev = dev->bus->dev; + if ((bus_dev->vendor == PCI_VENDOR_ID_AMD) && + (bus_dev->device == PCI_DEVICE_ID_AMD_8111_PCI)) { + unsigned devfn; + devfn = bus_dev->path.u.pci.devfn + (1 << 3); + // devnf = devfn + DEVFN(1,0); + lpc_dev = dev_find_slot(bus_dev->bus->secondary, devfn); + index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8; + } else { + unsigned devfn; + devfn = (dev->path.u.pci.devfn) & ~7; + lpc_dev = dev_find_slot(dev->bus->secondary, devfn); + index = dev->path.u.pci.devfn & 7; + } + + if ((!lpc_dev) || (index >= 16)) { + return; + } + if ((lpc_dev->vendor != PCI_VENDOR_ID_AMD) || + (lpc_dev->device != PCI_DEVICE_ID_AMD_8111_ISA)) { + uint32_t id; + id = pci_read_config32(lpc_dev, PCI_VENDOR_ID); + if (id != (PCI_VENDOR_ID_AMD | (PCI_DEVICE_ID_AMD_8111_ISA << 16))) { + return; + } + } + reg = reg_old = pci_read_config16(lpc_dev, 0x48); + reg &= ~(1 << index); + if (dev->enabled) { + reg |= (1 << index); + } + if (reg != reg_old) { + pci_write_config16(lpc_dev, 0x48, reg); + } +} + +void amd8111_enable_dev(device_t dev) +{ + device_t lpc_dev; + device_t bus_dev; + unsigned index; + uint16_t reg_old, reg; + + { + uint16_t vendor, device; + vendor = pci_read_config16(dev, PCI_VENDOR_ID); + device = pci_read_config16(dev, PCI_DEVICE_ID); + printk_debug("%s: %s %s [%x/%x]\n", __FUNCTION__, + dev->enabled? "enabling" : "disabling", dev_path(dev), + vendor, device); + } + /* See if we are on the behind the amd8111 pci bridge */ bus_dev = dev->bus->dev; if ((bus_dev->vendor == PCI_VENDOR_ID_AMD) && (bus_dev->device == PCI_DEVICE_ID_AMD_8111_PCI)) { unsigned devfn; devfn = bus_dev->path.u.pci.devfn + (1 << 3); + // devnf = devfn + DEVFN(1,0); lpc_dev = dev_find_slot(bus_dev->bus->secondary, devfn); index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8; } else { @@ -42,7 +105,8 @@ void amd8111_enable(device_t dev) if ((dev->vendor == PCI_VENDOR_ID_AMD) && (dev->device == PCI_DEVICE_ID_AMD_8111_USB2)) { - if(!dev->enabled) { + if (!dev->enabled) { + uint8_t byte; byte = pci_read_config8(lpc_dev, 0x47); byte |= (1<<7); pci_write_config8(lpc_dev, 0x47, byte); @@ -64,5 +128,5 @@ void amd8111_enable(device_t dev) struct chip_control southbridge_amd_amd8111_control = { .name = "AMD 8111 Southbridge", - .enable_dev = amd8111_enable, + .enable_dev = amd8111_enable_dev, }; |