Changeset 35746 in vbox

Timestamp:

Jan 27, 2011 7:32:39 PM (14 years ago)

Author:

vboxsync

Message:

dev/serial: add to ACPI tables

Location:

trunk/src/VBox

Files:

• Devices/PC/DevACPI.cpp (modified) (5 diffs)
• Devices/PC/vbox.dsl (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -167 +167 @@
     SYSTEM_INFO_INDEX_PCI_BASE          = 20, /**< PCI bus MCFG MMIO range base */
     SYSTEM_INFO_INDEX_PCI_LENGTH        = 21, /**< PCI bus MCFG MMIO range length */
-    SYSTEM_INFO_INDEX_END               = 22,
+    SYSTEM_INFO_INDEX_SERIAL0_IOBASE    = 22,
+    SYSTEM_INFO_INDEX_SERIAL0_IRQ       = 23,
+    SYSTEM_INFO_INDEX_SERIAL1_IOBASE    = 24,
+    SYSTEM_INFO_INDEX_SERIAL1_IRQ       = 25,
+    SYSTEM_INFO_INDEX_END               = 28,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -282 +286 @@
     /* Length of PCI config space MMIO region */
     uint64_t            u64PciConfigMMioLength;
-
+    /** Serial 0 IRQ number */
+    uint8_t             uSerial0Irq;
+    /** Serial 1 IRQ number */
+    uint8_t             uSerial1Irq;
+    /** Serial 0 IO port base */
+    RTIOPORT            uSerial0IoPortBase;
+    /** Serial 1 IO port base */
+    RTIOPORT            uSerial1IoPortBase;
     /** ACPI port base interface. */
     PDMIBASE            IBase;
@@ -1724 +1735 @@
                     break;
 
+                case SYSTEM_INFO_INDEX_SERIAL0_IOBASE:
+                    *pu32 = s->uSerial0IoPortBase;
+                    break;
+
+                case SYSTEM_INFO_INDEX_SERIAL0_IRQ:
+                    *pu32 = s->uSerial0Irq;
+                    break;
+
+                case SYSTEM_INFO_INDEX_SERIAL1_IOBASE:
+                    *pu32 = s->uSerial1IoPortBase;
+                    break;
+
+                case SYSTEM_INFO_INDEX_SERIAL1_IRQ:
+                    *pu32 = s->uSerial1Irq;
+                    break;
+
+                case SYSTEM_INFO_INDEX_END:
+                    break;
+
                 /* Solaris 9 tries to read from this index */
                 case SYSTEM_INFO_INDEX_INVALID:
@@ -2606 +2636 @@
                               "CpuHotPlug\0"
                               "AmlFilePath\0"
+                              "Serial0IoPortBase\0"
+                              "Serial1IoPortBase\0"
+                              "Serial0Irq\0"
+                              "Serial1Irq\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -2724 +2758 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("configuration error: failed to read R0Enabled as boolean"));
+
+    /* query serial info */
+    rc = CFGMR3QueryU8Def(pCfg, "Serial0Irq", &s->uSerial0Irq, 4);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"Serial0Irq\""));
+
+    rc = CFGMR3QueryU16Def(pCfg, "Serial0IoPortBase", &s->uSerial0IoPortBase, 0x3f8);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"Serial0IoPortBase\""));
+
+    /* Serial 1 is enabled, get config data */
+    rc = CFGMR3QueryU8Def(pCfg, "Serial1Irq", &s->uSerial1Irq, 3);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"Serial1Irq\""));
+
+    rc = CFGMR3QueryU16Def(pCfg, "Serial1IoPortBase", &s->uSerial1IoPortBase, 0x2f8);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"Serial1IoPortBase\""));
 
     /*

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -150 +150 @@
         PCIB,  32, // PCI MCFG base start
         PCIL,  32, // PCI MCFG length
+        SL0B,  32, // Serial0 base IO address  
+        SL0I,  32, // Serial0 IRQ
+        SL1B,  32, // Serial1 base IO address  
+        SL1I,  32, // Serial1 IRQ
         Offset (0x80),
         ININ, 32,
@@ -677 +681 @@
                         IRQNoFlags () {7}
                     })
+                }
+
+                // Serial port 0
+                Device (^SRL0)
+                {
+                    Name (_HID, EisaId ("PNP0501"))
+                    Name (_UID, 0x01)
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        If (LEqual (SL0B, Zero))
+                        {
+                            Return (0x00)
+                        }
+                        Else
+                        {
+                            Return (0x0F)
+                        }
+                    }
+                    Name (CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x03F8, 0x03F8, 0x01, 0x08, _Y14) 
+                        IRQNoFlags (_Y15) {4}
+                    })
+                    Method (_CRS, 0, NotSerialized)
+                    {
+                        CreateWordField (CRS, \_SB.PCI0.SRL0._Y14._MIN, MIN0)
+                        CreateWordField (CRS, \_SB.PCI0.SRL0._Y14._MAX, MAX0)
+                        CreateWordField (CRS, \_SB.PCI0.SRL0._Y15._INT, IRQ0)
+                        Store (SL0B, MIN0)
+                        Store (SL0B, MAX0)
+                        ShiftLeft (0x01, SL0I, IRQ0)
+                        Return (CRS)
+                    }
+                }
+                
+                // Serial port 1
+                Device (^SRL1)
+                {
+                    Name (_HID, EisaId ("PNP0501"))
+                    Name (_UID, 0x02)
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        If (LEqual (SL1B, Zero))
+                        {
+                            Return (0x00)
+                        }
+                        Else
+                        {
+                            Return (0x0F)
+                        }
+                    }
+                    Name (CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x02F8, 0x02F8, 0x01, 0x08, _Y16) 
+                        IRQNoFlags (_Y17) {3}
+                    })
+                    Method (_CRS, 0, NotSerialized)
+                    {
+                        CreateWordField (CRS, \_SB.PCI0.SRL1._Y16._MIN, MIN1)
+                        CreateWordField (CRS, \_SB.PCI0.SRL1._Y16._MAX, MAX1)
+                        CreateWordField (CRS, \_SB.PCI0.SRL1._Y17._INT, IRQ1)
+                        Store (SL1B, MIN1)
+                        Store (SL1B, MAX1)
+                        ShiftLeft (0x01, SL1I, IRQ1)
+                        Return (CRS)
+                    }
                 }
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1824 +1824 @@
          * Serial (UART) Ports
          */
+        /* serial enabled mask to be passed to dev ACPI */
+        uint16_t auSerialIoPortBase[SchemaDefs::SerialPortCount] = {0};
+        uint8_t auSerialIrq[SchemaDefs::SerialPortCount] = {0};
         InsertConfigNode(pDevices, "serial", &pDev);
         for (ULONG ulInstance = 0; ulInstance < SchemaDefs::SerialPortCount; ++ulInstance)
@@ -1841 +1844 @@
             hrc = serialPort->COMGETTER(IRQ)(&ulIRQ);                                       H();
             InsertConfigInteger(pCfg, "IRQ", ulIRQ);
+            auSerialIrq[ulInstance] = (uint8_t)ulIRQ;
+
             ULONG ulIOBase;
             hrc = serialPort->COMGETTER(IOBase)(&ulIOBase);                                 H();
             InsertConfigInteger(pCfg, "IOBase", ulIOBase);
+            auSerialIoPortBase[ulInstance] = (uint16_t)ulIOBase;
+
             BOOL  fServer;
             hrc = serialPort->COMGETTER(Server)(&fServer);                                  H();
@@ -2455 +2462 @@
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);
             InsertConfigInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);
+
+            InsertConfigInteger(pCfg,  "Serial0IoPortBase", auSerialIoPortBase[0]);
+            InsertConfigInteger(pCfg,  "Serial0Irq", auSerialIrq[0]);
+
+            InsertConfigInteger(pCfg,  "Serial1IoPortBase", auSerialIoPortBase[1]);
+            InsertConfigInteger(pCfg,  "Serial1Irq", auSerialIrq[1]);
 
             InsertConfigNode(pInst,    "LUN#0", &pLunL0);