Changeset 60793 in vbox for trunk/src/VBox/ValidationKit/utils/usb/UsbTestServicePlatform-linux.cpp

Timestamp:

May 2, 2016 4:12:43 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/UsbTestService: Updates, implement the protocol bits for passing extended configuration from the client to the gadget, detect multiple busses from dummy_hcd which creates a separate bus for high-speed and super-speed gadgets, some smaller fixes

File:

• trunk/src/VBox/ValidationKit/utils/usb/UsbTestServicePlatform-linux.cpp (modified) (8 diffs)

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServicePlatform-linux.cpp

@@ -45 +45 @@
 
 /**
- * A dummy UDC descriptor.
- */
-typedef struct UTSPLATFORMLNXDUMMYHCD
-{
-    /* Index of the dummy hcd entry. */
-    uint32_t                  idxDummyHcd;
+ * A USB bus provided by the dummy HCD.
+ */
+typedef struct UTSPLATFORMLNXDUMMYHCDBUS
+{
     /** The bus ID on the host the dummy HCD is serving. */
     uint32_t                  uBusId;
+    /** Flag whether this is a super speed bus. */
+    bool                      fSuperSpeed;
+} UTSPLATFORMLNXDUMMYHCDBUS;
+/** Pointer to a Dummy HCD bus. */
+typedef UTSPLATFORMLNXDUMMYHCDBUS *PUTSPLATFORMLNXDUMMYHCDBUS;
+
+/**
+ * A dummy UDC descriptor.
+ */
+typedef struct UTSPLATFORMLNXDUMMYHCD
+{
+    /** Index of the dummy hcd entry. */
+    uint32_t                   idxDummyHcd;
     /** Flag whether this HCD is free for use. */
-    bool                      fAvailable;
+    bool                       fAvailable;
+    /** Number of busses this HCD instance serves. */
+    unsigned                   cBusses;
+    /** Bus structures the HCD serves.*/
+    PUTSPLATFORMLNXDUMMYHCDBUS paBusses;
 } UTSPLATFORMLNXDUMMYHCD;
 /** Pointer to a dummy HCD entry. */
@@ -75 +90 @@
 
 /**
- * Queries the assigned bus ID for the given dummy HCD index.
+ * Queries the assigned busses for the given dummy HCD instance.
  *
  * @returns IPRT status code.
- * @param   idxHcd            The HCD index to query the bus number for.
- * @param   puBusId           Where to store the bus number on success.
- */
-static int utsPlatformLnxDummyHcdQueryBusId(uint32_t idxHcd, uint32_t *puBusId)
+ * @param   pHcd              The dummy HCD bus instance.
+ */
+static int utsPlatformLnxDummyHcdQueryBusses(PUTSPLATFORMLNXDUMMYHCD pHcd)
 {
     int rc = VINF_SUCCESS;
     char aszPath[RTPATH_MAX + 1];
-
-    size_t cchPath = RTStrPrintf(&aszPath[0], RT_ELEMENTS(aszPath), UTS_PLATFORM_LNX_DUMMY_HCD_PATH "/dummy_hcd.%u/usb*", idxHcd);
+    unsigned idxBusCur = 0;
+    unsigned idxBusMax = 0;
+
+    size_t cchPath = RTStrPrintf(&aszPath[0], RT_ELEMENTS(aszPath), UTS_PLATFORM_LNX_DUMMY_HCD_PATH "/dummy_hcd.%u/usb*", pHcd->idxDummyHcd);
     if (cchPath == RT_ELEMENTS(aszPath))
         return VERR_BUFFER_OVERFLOW;
@@ -94 +110 @@
     if (RT_SUCCESS(rc))
     {
-        RTDIRENTRY DirFolderContent;
-        rc = RTDirRead(pDir, &DirFolderContent, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            /* Extract the bus number - it is after "usb", i.e. "usb9" indicates a bus ID of 9. */
-            rc = RTStrToUInt32Ex(&DirFolderContent.szName[3], NULL, 10, puBusId);
+        do
+        {
+            RTDIRENTRY DirFolderContent;
+            rc = RTDirRead(pDir, &DirFolderContent, NULL);
             if (RT_SUCCESS(rc))
             {
-                /* Make sure there is no other entry or something screwed us up. */
-                rc = RTDirRead(pDir, &DirFolderContent, NULL);
+                uint32_t uBusId = 0;
+
+                /* Extract the bus number - it is after "usb", i.e. "usb9" indicates a bus ID of 9. */
+                rc = RTStrToUInt32Ex(&DirFolderContent.szName[3], NULL, 10, &uBusId);
                 if (RT_SUCCESS(rc))
-                    rc = VERR_INVALID_STATE;
-                else if (rc == VERR_NO_MORE_FILES)
-                    rc = VINF_SUCCESS;
+                {
+                    /* Check whether this is a super speed bus. */
+                    int64_t iSpeed = 0;
+                    bool fSuperSpeed = false;
+                    rc = RTLinuxSysFsReadIntFile(10, &iSpeed, UTS_PLATFORM_LNX_DUMMY_HCD_PATH "/dummy_hcd.%u/%s/speed",
+                                                 pHcd->idxDummyHcd, DirFolderContent.szName);
+                    if (   RT_SUCCESS(rc)
+                        && (iSpeed == 5000 || iSpeed == 10000))
+                        fSuperSpeed = true;
+
+                    /* Add to array of available busses for this HCD. */
+                    if (idxBusCur == idxBusMax)
+                    {
+                        size_t cbNew = (idxBusMax + 10) * sizeof(UTSPLATFORMLNXDUMMYHCDBUS);
+                        PUTSPLATFORMLNXDUMMYHCDBUS pNew = (PUTSPLATFORMLNXDUMMYHCDBUS)RTMemRealloc(pHcd->paBusses, cbNew);
+                        if (pNew)
+                        {
+                            idxBusMax += 10;
+                            pHcd->paBusses = pNew;
+                        }
+                    }
+
+                    if (idxBusCur < idxBusMax)
+                    {
+                        pHcd->paBusses[idxBusCur].uBusId      = uBusId;
+                        pHcd->paBusses[idxBusCur].fSuperSpeed = fSuperSpeed;
+                        idxBusCur++;
+                    }
+                    else
+                        rc = VERR_NO_MEMORY;
+                }
             }
-        }
+        } while (RT_SUCCESS(rc));
+
+        pHcd->cBusses = idxBusCur;
+
+        if (rc == VERR_NO_MORE_FILES)
+            rc = VINF_SUCCESS;
 
         RTDirClose(pDir);
@@ -124 +173 @@
     if (RT_SUCCESS(rc))
     {
-        const char *pszArg = "num=2"; /** @todo: Make configurable from config. */
-        rc = utsPlatformModuleLoad("dummy_hcd", &pszArg, 1);
+        const char *apszArg[] = { "num=2", "is_super_speed=1" }; /** @todo: Make configurable from config. */
+        rc = utsPlatformModuleLoad("dummy_hcd", &apszArg[0], RT_ELEMENTS(apszArg));
         if (RT_SUCCESS(rc))
         {
@@ -157 +206 @@
                             if (RT_SUCCESS(rc))
                             {
-                                uint32_t uBusId = 0;
-                                rc = utsPlatformLnxDummyHcdQueryBusId(idxHcd, &uBusId);
-                                if (RT_SUCCESS(rc))
+                                /* Add to array of available HCDs. */
+                                if (idxHcdCur == idxHcdMax)
                                 {
-                                    /* Add to array of available HCDs. */
-                                    if (idxHcdCur == idxHcdMax)
+                                    size_t cbNew = (idxHcdMax + 10) * sizeof(UTSPLATFORMLNXDUMMYHCD);
+                                    PUTSPLATFORMLNXDUMMYHCD pNew = (PUTSPLATFORMLNXDUMMYHCD)RTMemRealloc(g_paDummyHcd, cbNew);
+                                    if (pNew)
                                     {
-                                        size_t cbNew = (idxHcdMax + 10) * sizeof(UTSPLATFORMLNXDUMMYHCD);
-                                        PUTSPLATFORMLNXDUMMYHCD pNew = (PUTSPLATFORMLNXDUMMYHCD)RTMemRealloc(g_paDummyHcd, cbNew);
-                                        if (pNew)
-                                        {
-                                            idxHcdMax += 10;
-                                            g_paDummyHcd = pNew;
-                                        }
-                                    }
-
-                                    if (idxHcdCur < idxHcdMax)
-                                    {
-                                        g_paDummyHcd[idxHcdCur].idxDummyHcd = idxHcd;
-                                        g_paDummyHcd[idxHcdCur].uBusId      = uBusId;
-                                        g_paDummyHcd[idxHcdCur].fAvailable  = true;
-                                        idxHcdCur++;
+                                        idxHcdMax += 10;
+                                        g_paDummyHcd = pNew;
                                     }
                                 }
+
+                                if (idxHcdCur < idxHcdMax)
+                                {
+                                    g_paDummyHcd[idxHcdCur].idxDummyHcd = idxHcd;
+                                    g_paDummyHcd[idxHcdCur].fAvailable  = true;
+                                    g_paDummyHcd[idxHcdCur].cBusses     = 0;
+                                    g_paDummyHcd[idxHcdCur].paBusses    = NULL;
+                                    rc = utsPlatformLnxDummyHcdQueryBusses(&g_paDummyHcd[idxHcdCur]);
+                                    if (RT_SUCCESS(rc))
+                                        idxHcdCur++;
+                                }
+                                else
+                                    rc = VERR_NO_MEMORY;
                             }
                         }
@@ -222 +271 @@
     unsigned idx;
     for (idx = 0; idx < cArgv; idx++)
-        papszArgs[2+idx] = papszArgs[idx];
+        papszArgs[2+idx] = papszArgv[idx];
     papszArgs[2+idx] = NULL;
 
@@ -271 +320 @@
 
 
-DECLHIDDEN(int) utsPlatformLnxAcquireUDC(char **ppszUdc, uint32_t *puBusId)
+DECLHIDDEN(int) utsPlatformLnxAcquireUDC(bool fSuperSpeed, char **ppszUdc, uint32_t *puBusId)
 {
     int rc = VERR_NOT_FOUND;
@@ -277 +326 @@
     for (unsigned i = 0; i < g_cDummyHcd; i++)
     {
-        if (g_paDummyHcd[i].fAvailable)
-        {
-            rc = VINF_SUCCESS;
-            int cbRet = RTStrAPrintf(ppszUdc, "dummy_udc.%u", g_paDummyHcd[i].idxDummyHcd);
-            if (cbRet == -1)
-                rc = VERR_NO_STR_MEMORY;
-            *puBusId = g_paDummyHcd[i].uBusId;
-            g_paDummyHcd[i].fAvailable = false;
-            break;
+        PUTSPLATFORMLNXDUMMYHCD pHcd = &g_paDummyHcd[i];
+
+        if (pHcd->fAvailable)
+        {
+            /* Check all assigned busses for a speed match. */
+            for (unsigned idxBus = 0; idxBus < pHcd->cBusses; idxBus++)
+            {
+                if (pHcd->paBusses[idxBus].fSuperSpeed == fSuperSpeed)
+                {
+                    rc = VINF_SUCCESS;
+                    int cbRet = RTStrAPrintf(ppszUdc, "dummy_udc.%u", pHcd->idxDummyHcd);
+                    if (cbRet == -1)
+                        rc = VERR_NO_STR_MEMORY;
+                    *puBusId = pHcd->paBusses[idxBus].uBusId;
+                    pHcd->fAvailable = false;
+                    break;
+                }
+            }
+
+            if (rc != VERR_NOT_FOUND)
+                break;
         }
     }