Changeset 101619 in vbox for trunk/src

Timestamp:

Oct 27, 2023 12:49:16 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159706

Message:

Main/src-client/ConsoleImpl: Preliminary code to hook up the power button requests to the GPIO interface for an ARM guest, bugref:10538

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• ConsoleImplConfigArmV8.cpp (modified) (4 diffs)

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

@@ -2716 +2716 @@
         PPDMIBASE pBase = NULL;
         int vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), "acpi", 0, 0, &pBase);
+        /** @todo r=aeichner Think about a prettier way to do this without relying on hardocded device/driver names. */
+        if (vrc == VERR_PDM_DEVICE_INSTANCE_NOT_FOUND) /* Try GPIO device for ARM VMs */
+            vrc = ptrVM.vtable()->pfnPDMR3QueryDriverOnLun(ptrVM.rawUVM(), "arm-pl061-gpio", 0, 0, "GpioButton", &pBase);
         if (RT_SUCCESS(vrc))
         {
@@ -2823 +2826 @@
                 vrc = VERR_PDM_MISSING_INTERFACE;
         }
+
+        if (vrc == VERR_PDM_DEVICE_INSTANCE_NOT_FOUND)
+        {
+            /* Might be an ARM VM. */
+            /** @todo r=aeichner Think about a prettier way to do this without relying on hardocded device/driver names,
+             *                   and this shouldn't be here as it is not about ACPI but needs a dedicated interface. */
+            vrc = ptrVM.vtable()->pfnPDMR3QueryDriverOnLun(ptrVM.rawUVM(), "arm-pl061-gpio", 0, 0, "GpioButton", &pBase);
+            if (RT_SUCCESS(vrc))
+            {
+                Assert(pBase);
+                PPDMIEVENTBUTTONPORT pPort = PDMIBASE_QUERY_INTERFACE(pBase, PDMIEVENTBUTTONPORT);
+                if (pPort)
+                {
+                    bool fEntered = false;
+                    vrc = pPort->pfnQueryGuestCanHandleButtonEvents(pPort, &fEntered);
+                    if (RT_SUCCESS(vrc))
+                        *aEntered = fEntered;
+                }
+                else
+                    vrc = VERR_PDM_MISSING_INTERFACE;
+            }
+        }
     }
 
@@ -2850 +2875 @@
         PPDMIBASE pBase = NULL;
         int vrc = ptrVM.vtable()->pfnPDMR3QueryDeviceLun(ptrVM.rawUVM(), "acpi", 0, 0, &pBase);
+        /** @todo r=aeichner Think about a prettier way to do this without relying on hardocded device/driver names. */
+        if (vrc == VERR_PDM_DEVICE_INSTANCE_NOT_FOUND) /* Try GPIO device for ARM VMs */
+            vrc = ptrVM.vtable()->pfnPDMR3QueryDriverOnLun(ptrVM.rawUVM(), "arm-pl061-gpio", 0, 0, "GpioButton", &pBase);
         if (RT_SUCCESS(vrc))
         {

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

@@ -248 +248 @@
                                            0x01, 0x0a, 0x104);                              VRC();
         vrc = RTFdtNodePropertyAddEmpty(   hFdt, "always-on");                              VRC();
-        vrc = RTFdtNodePropertyAddString(  hFdt, "compatible",       "arm,armv7-timer");    VRC();
+        vrc = RTFdtNodePropertyAddString(  hFdt, "compatible",       "arm,armv8-timer");    VRC();
         vrc = RTFdtNodeFinalize(hFdt);
 
@@ -258 +258 @@
         vrc = RTFdtNodePropertyAddString(  hFdt, "compatible",         "fixed-clock");      VRC();
         vrc = RTFdtNodeFinalize(hFdt);
-
-        /* Configure gpio keys (non functional at the moment). */
-        vrc = RTFdtNodeAdd(hFdt, "gpio-keys");                                              VRC();
-        vrc = RTFdtNodePropertyAddString(hFdt, "compatible",           "gpio-keys");        VRC();
-
-        vrc = RTFdtNodeAdd(hFdt, "poweroff");                                               VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "gpios", 3, idPHandleGpio, 3, 0);          VRC();
-        vrc = RTFdtNodePropertyAddU32(     hFdt, "linux,code", 0x74);                       VRC();
-        vrc = RTFdtNodePropertyAddString(  hFdt, "label",      "GPIO Key Poweroff");        VRC();
-        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
-
-        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
         /*
@@ -535 +523 @@
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
+        /* Configure gpio keys. */
         InsertConfigNode(pDevices, "arm-pl061-gpio",&pDev);
         InsertConfigNode(pDev,     "0",            &pInst);
@@ -550 +539 @@
                                              "arm,pl061", "arm,primecell");                 VRC();
         vrc = RTFdtNodePropertyAddCellsU64(hFdt, "reg", 2, 0x09030000, _4K);                VRC();
+        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
+        InsertConfigNode(pInst,    "LUN#0",           &pLunL0);
+        InsertConfigString(pLunL0, "Driver",          "GpioButton");
+        InsertConfigNode(pLunL0,   "Config",          &pCfg);
+        InsertConfigInteger(pCfg,  "PowerButtonGpio", 3);
+        InsertConfigInteger(pCfg,  "SleepButtonGpio", 4);
+
+        vrc = RTFdtNodeAdd(hFdt, "gpio-keys");                                              VRC();
+        vrc = RTFdtNodePropertyAddString(hFdt, "compatible",           "gpio-keys");        VRC();
+
+        vrc = RTFdtNodeAdd(hFdt, "poweroff");                                               VRC();
+        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "gpios", 3, idPHandleGpio, 3, 0);          VRC();
+        vrc = RTFdtNodePropertyAddU32(     hFdt, "linux,code", 0x74);                       VRC();
+        vrc = RTFdtNodePropertyAddString(  hFdt, "label",      "GPIO Key Poweroff");        VRC();
+        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
+
+        vrc = RTFdtNodeAdd(hFdt, "suspend");                                                VRC();
+        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "gpios", 3, idPHandleGpio, 4, 0);          VRC();
+        vrc = RTFdtNodePropertyAddU32(     hFdt, "linux,code", 0xcd);                       VRC();
+        vrc = RTFdtNodePropertyAddString(  hFdt, "label",      "GPIO Key Suspend");         VRC();
+        vrc = RTFdtNodeFinalize(hFdt);  
+
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();