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

Print an error and correct pci scan limits. Skip sb700 ISA DMA init if needed. 

Signed-off-by: Juhana Helovuo <juhe@iki.fi>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5805 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Juhana Helovuo 2010-09-13 14:43:02 +00:00 committed by Myles Watson
parent cb817beb67
commit 50b78b66d3
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/pci_device.c
View File

@ -1019,6 +1019,14 @@ unsigned int pci_scan_bus(struct bus *bus,
printk(BIOS_DEBUG, "PCI: pci_scan_bus for bus %02x\n", bus->secondary); printk(BIOS_DEBUG, "PCI: pci_scan_bus for bus %02x\n", bus->secondary);
#endif #endif
// Maximum sane devfn is 0xFF
if (max_devfn > 0xff) {
printk(BIOS_ERR, "PCI: pci_scan_bus limits devfn %x - devfn %x\n",
min_devfn, max_devfn );
printk(BIOS_ERR, "PCI: pci_scan_bus upper limit too big. Using 0xff.\n");
max_devfn=0xff;
}
old_devices = bus->children; old_devices = bus->children;
bus->children = NULL; bus->children = NULL;

6
src/southbridge/amd/sb700/Kconfig
View File

@ -20,3 +20,9 @@
config SOUTHBRIDGE_AMD_SB700 config SOUTHBRIDGE_AMD_SB700
bool bool
select IOAPIC select IOAPIC
config SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
bool
default n
depends on SOUTHBRIDGE_AMD_SB700

4
src/southbridge/amd/sb700/sb700_lpc.c
View File

@ -42,7 +42,11 @@ static void lpc_init(device_t dev)
pci_write_config32(sm_dev, 0x64, dword); pci_write_config32(sm_dev, 0x64, dword);
/* Initialize isa dma */ /* Initialize isa dma */
#if CONFIG_SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
printk(BIOS_DEBUG, "Skipping isa_dma_init() to avoid getting stuck.\n");
#else
isa_dma_init(); isa_dma_init();
#endif
/* Enable DMA transaction on the LPC bus */ /* Enable DMA transaction on the LPC bus */
byte = pci_read_config8(dev, 0x40); byte = pci_read_config8(dev, 0x40);