changeset fc247b9c42b6 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=fc247b9c42b6
description:
config, x86: Properly space pad the X86IntelMPBus Entry descriptions
According to the Intel Multi Processor Specification rev 1.4 (-006) (*),
section 4.3.2 Bus Entries, Bus type strings are >>6-character ASCII
(blank-filled) strings<<.
This patch properly pads the entries with the missing spaces at the end.
(*) http://www.intel.com/design/pentium/datashts/24201606.pdf
Committed by Jason Lowe-Power <[email protected]>
diffstat:
configs/common/FSConfig.py | 4 ++--
src/arch/x86/bios/IntelMP.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 2af4c6a4f3f5 -r fc247b9c42b6 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Thu May 19 15:19:35 2016 -0500
+++ b/configs/common/FSConfig.py Thu May 19 15:19:35 2016 -0500
@@ -553,9 +553,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 2af4c6a4f3f5 -r fc247b9c42b6 src/arch/x86/bios/IntelMP.py
--- a/src/arch/x86/bios/IntelMP.py Thu May 19 15:19:35 2016 -0500
+++ b/src/arch/x86/bios/IntelMP.py Thu May 19 15:19:35 2016 -0500
@@ -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",
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
