diff -r 9c7b55faea5d configs/common/FSConfig.py --- a/configs/common/FSConfig.py Tue Apr 05 08:08:12 2016 -0500 +++ b/configs/common/FSConfig.py Wed Apr 13 14:21:48 2016 +0000 @@ -553,9 +573,9 @@ # In gem5 Pc::calcPciConfigAddr(), it required "assert(bus==0)", # but linux kernel cannot config PCI device if it was not connected to PCI bus, # so we fix PCI bus id to 0, and ISA bus id to 1. - pci_bus = X86IntelMPBus(bus_id = 0, bus_type='PCI') + pci_bus = X86IntelMPBus(bus_id = 0, bus_type='PCI ') base_entries.append(pci_bus) - isa_bus = X86IntelMPBus(bus_id = 1, bus_type='ISA') + isa_bus = X86IntelMPBus(bus_id = 1, bus_type='ISA ') base_entries.append(isa_bus) connect_busses = X86IntelMPBusHierarchy(bus_id=1, subtractive_decode=True, parent_bus=0) diff -r 9c7b55faea5d src/arch/x86/bios/IntelMP.py --- a/src/arch/x86/bios/IntelMP.py Tue Apr 05 08:08:12 2016 -0500 +++ b/src/arch/x86/bios/IntelMP.py Wed Apr 13 14:21:48 2016 +0000 @@ -115,7 +115,7 @@ bus_id = Param.UInt8(0, 'bus id assigned by the bios') bus_type = Param.String("", 'string that identify the bus type') - # Legal values for bus_type are: + # Legal values for bus_type are [space padded to 6 bytes]: # # "CBUS", "CBUSII", "EISA", "FUTURE", "INTERN", "ISA", "MBI", "MBII", # "MCA", "MPI", "MPSA", "NUBUS", "PCI", "PCMCIA", "TC", "VL", "VME",