X86: Configure the first PCI interrupt.

[gem5.git] / src / dev / x86 / SouthBridge.py

diff --git a/src/dev/x86/SouthBridge.py b/src/dev/x86/SouthBridge.py
index 15ffe153f452a07b4971807230fe4fd36467a189..d89ed9dc6134b59f473dd010916a9f4cb9b1d911 100644 (file)
--- a/src/dev/x86/SouthBridge.py
+++ b/src/dev/x86/SouthBridge.py
@@ -29,10 +29,14 @@
 from m5.params import *
 from m5.proxy import *
 from Cmos import Cmos
+from I8042 import I8042
 from I82094AA import I82094AA
+from I8237 import I8237
 from I8254 import I8254
 from I8259 import I8259
+from Ide import IdeController
 from PcSpeaker import PcSpeaker
+from X86IntPin import X86IntLine
 from m5.SimObject import SimObject
 
 def x86IOAddress(port):
@@ -47,28 +51,72 @@ class SouthBridge(SimObject):
     _pic1 = I8259(pio_addr=x86IOAddress(0x20), mode='I8259Master')
     _pic2 = I8259(pio_addr=x86IOAddress(0xA0), mode='I8259Slave')
     _cmos = Cmos(pio_addr=x86IOAddress(0x70))
+    _dma1 = I8237(pio_addr=x86IOAddress(0x0))
+    _keyboard = I8042(data_port=x86IOAddress(0x60), \
+            command_port=x86IOAddress(0x64))
     _pit = I8254(pio_addr=x86IOAddress(0x40))
     _speaker = PcSpeaker(pio_addr=x86IOAddress(0x61))
     _io_apic = I82094AA(pio_addr=0xFEC00000)
+    # This is to make sure the interrupt lines are instantiated. Don't use
+    # it for anything directly.
+    int_lines = VectorParam.X86IntLine([], "Interrupt lines")
 
     pic1 = Param.I8259(_pic1, "Master PIC")
     pic2 = Param.I8259(_pic2, "Slave PIC")
     cmos = Param.Cmos(_cmos, "CMOS memory and real time clock device")
+    dma1 = Param.I8237(_dma1, "The first dma controller")
+    keyboard = Param.I8042(_keyboard, "The keyboard controller")
     pit = Param.I8254(_pit, "Programmable interval timer")
     speaker = Param.PcSpeaker(_speaker, "PC speaker")
     io_apic = Param.I82094AA(_io_apic, "I/O APIC")
 
+    def connectPins(self, source, sink):
+        self.int_lines.append(X86IntLine(source=source, sink=sink))
+
+    # IDE controller
+    ide = IdeController(disks=[], pci_func=0, pci_dev=4, pci_bus=0)
+    ide.BAR0 = 0x1f0
+    ide.BAR0LegacyIO = True
+    ide.BAR1 = 0x3f4
+    ide.BAR1Size = '3B'
+    ide.BAR1LegacyIO = True
+    ide.BAR2 = 0x170
+    ide.BAR2LegacyIO = True
+    ide.BAR3 = 0x374
+    ide.BAR3Size = '3B'
+    ide.BAR3LegacyIO = True
+    ide.BAR4 = 1
+    ide.Command = 1
+    ide.InterruptLine = 14
+    ide.InterruptPin = 1
+
     def attachIO(self, bus):
-        # Make internal connections
-        self.pic1.output = self.io_apic.pin(0)
-        self.pic2.output = self.pic1.pin(2)
-        self.cmos.int_pin = self.pic2.pin(0)
-        self.pit.int_pin = self.pic1.pin(0)
+        # Route interupt signals
+        self.connectPins(self.pic1.output, self.io_apic.pin(0))
+        self.connectPins(self.pic2.output, self.pic1.pin(2))
+        self.connectPins(self.cmos.int_pin, self.pic2.pin(0))
+        self.connectPins(self.pit.int_pin, self.pic1.pin(0))
+        self.connectPins(self.pit.int_pin, self.io_apic.pin(2))
+#        self.connectPins(self.keyboard.keyboard_int_pin,
+#                         self.pic1.pin(1))
+        self.connectPins(self.keyboard.keyboard_int_pin,
+                         self.io_apic.pin(1))
+#        self.connectPins(self.keyboard.mouse_int_pin,
+#                         self.pic2.pin(4))
+        self.connectPins(self.keyboard.mouse_int_pin,
+                         self.io_apic.pin(12))
+        # Tell the devices about each other
+        self.pic1.slave = self.pic2
         self.speaker.i8254 = self.pit
+        self.io_apic.external_int_pic = self.pic1
         # Connect to the bus
         self.cmos.pio = bus.port
+        self.dma1.pio = bus.port
+        self.ide.pio = bus.port
+        self.keyboard.pio = bus.port
         self.pic1.pio = bus.port
         self.pic2.pio = bus.port
         self.pit.pio = bus.port
         self.speaker.pio = bus.port
         self.io_apic.pio = bus.port
+        self.io_apic.int_port = bus.port