Changeset 81367 in vbox

Timestamp:

Oct 18, 2019 7:24:25 PM (6 years ago)

Author:

vboxsync

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

134080

Message:

Storage/DevVirtioSCSI.cpp: While trying to diagnose issue seen with EFI boot, fixed problem it had working on Windows. At least Windows was able to find and format a disk

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (2 diffs)
• EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c (modified) (1 diff)
• EFI/Firmware/OvmfPkg/VirtioScsiDxe/VirtioScsi.c (modified) (1 diff)
• EFI/Firmware/vbox-tools_def.txt (modified) (2 diffs)
• Storage/DevVirtioSCSI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -1492 +1492 @@
                 pThis->szMsg[pThis->iMsg] = '\0';
                 if (pThis->iMsg)
-                    LogRel2(("efi: %s\n", pThis->szMsg));
+                    LogRel(("efi: %s\n", pThis->szMsg));
                 pThis->iMsg = 0;
             }
@@ -1500 +1500 @@
                 {
                     pThis->szMsg[pThis->iMsg] = '\0';
-                    LogRel2(("efi: %s\n", pThis->szMsg));
+                    LogRel(("efi: %s\n", pThis->szMsg));
                     pThis->iMsg = 0;
                 }

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c

@@ -38 +38 @@
 #include "ParseInf.h"
 #include "PeCoffLib.h"
+/*
 
 #ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #endif
-
+*/
 //
 // Utility global variables

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/VirtioScsiDxe/VirtioScsi.c

@@ -338 +338 @@
   // response code
   //
+  DEBUG((DEBUG_VERBOSE, "virtio: Response = %d\n", Response->Response));
+
   switch (Response->Response) {
   case VIRTIO_SCSI_S_OK:

trunk/src/VBox/Devices/EFI/Firmware/vbox-tools_def.txt

@@ -241 +241 @@
 *_*_*_DTC_PATH                     = DEF(DTC_BIN)
 
-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common
+DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall  -Wno-array-bounds -include AutoGen.h -fno-common
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe @VBOX_MINGW32_Wno@
 DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe @VBOX_MINGW32_Wno@
@@ -259 +259 @@
 DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386    --rename-section .data=.hii
 
-DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall  -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
 DEFINE GCC48_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20
 DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -Wno-address -fno-pie -fno-pic

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -92 +92 @@
 #define VIRTIOSCSI_REQ_QUEUE_CNT                    1            /**< Number of req queues exposed by dev.            */
 #define VIRTIOSCSI_QUEUE_CNT                        VIRTIOSCSI_REQ_QUEUE_CNT + 2
-#define VIRTIOSCSI_MAX_LUN                          256          /* < VirtIO specification, section 5.6.4             */
-#define VIRTIOSCSI_MAX_COMMANDS_PER_LUN             128            /* < T.B.D. What is a good value for this?           */
-#define VIRTIOSCSI_MAX_SEG_COUNT                    126         /* < T.B.D. What is a good value for this?           */
+#define VIRTIOSCSI_MAX_LUN                          1            /* < VirtIO specification, section 5.6.4             */
+#define VIRTIOSCSI_MAX_COMMANDS_PER_LUN             128          /* < T.B.D. What is a good value for this?           */
+#define VIRTIOSCSI_MAX_SEG_COUNT                    126          /* < T.B.D. What is a good value for this?           */
 #define VIRTIOSCSI_MAX_SECTORS_HINT                 0x10000      /* < VirtIO specification, section 5.6.4             */
 #define VIRTIOSCSI_MAX_CHANNEL_HINT                 0            /* < VirtIO specification, section 5.6.4 should be 0 */
@@ -781 +781 @@
     RT_NOREF(pszCtrlRespText);
 
-    RTSGSEG aReqSegs[2];
-    aReqSegs[0].cbSeg = sizeof(pRespHdr);
-    aReqSegs[0].pvSeg = pRespHdr;
-    aReqSegs[1].cbSeg = pThis->virtioScsiConfig.uSenseSize;
-    aReqSegs[1].pvSeg = abSenseBuf;
+    RTSGSEG aRespSegs[2];
+    aRespSegs[0].cbSeg = sizeof(struct REQ_RESP_HDR);
+    aRespSegs[0].pvSeg = pRespHdr;
+    aRespSegs[1].cbSeg = pThis->virtioScsiConfig.uSenseSize;
+    aRespSegs[1].pvSeg = abSenseBuf;
 
     if (pbSense && pRespHdr->uSenseLen)
@@ -792 +792 @@
         pRespHdr->uSenseLen = 0;
 
-    RTSGBUF reqSegBuf;
-    RTSgBufInit(&reqSegBuf, aReqSegs, RT_ELEMENTS(aReqSegs));
+    RTSGBUF respSegBuf;
+    RTSgBufInit(&respSegBuf, aRespSegs, RT_ELEMENTS(aRespSegs));
 
     if (pThis->fResetting)
         pRespHdr->uResponse = VIRTIOSCSI_S_RESET;
 
-    virtioQueuePut(pThis->hVirtio, qIdx, &reqSegBuf, pDescChain, true /* fFence */);
+    virtioQueuePut(pThis->hVirtio, qIdx, &respSegBuf, pDescChain, true /* fFence */);
     virtioQueueSync(pThis->hVirtio, qIdx);
 
@@ -966 +966 @@
         RTSGSEG aReqSegs[4];
         aReqSegs[cSegs].pvSeg = &respHdr;
-        aReqSegs[cSegs++].cbSeg = sizeof(respHdr);
+        aReqSegs[cSegs++].cbSeg = sizeof(x);
 
         aReqSegs[cSegs].pvSeg = pReq->pbSense;
@@ -1145 +1145 @@
     }
     else
+    if (RT_UNLIKELY(uTarget >= pThis->cTargets || !pTarget->fPresent))
+    {
+        Log2Func(("Error submitting request, target not present!!\n"));
+        uint8_t abSense[] = { RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED,
+                              0, SCSI_SENSE_NOT_READY, 0, 0, 0, 0, 10, 0, 0, 0 };
+        struct REQ_RESP_HDR respHdr = { 0 };
+        respHdr.uSenseLen = sizeof(abSense);
+        respHdr.uStatus   = SCSI_STATUS_CHECK_CONDITION;
+        respHdr.uResponse = VIRTIOSCSI_S_BAD_TARGET;
+        respHdr.uResidual = cbDataIn + cbDataOut;
+        virtioScsiReqErr(pThis, qIdx, pDescChain, &respHdr , abSense);
+        return VINF_SUCCESS;
+    }
+    else
     if (RT_UNLIKELY(uScsiLun != 0))
     {
-        Log2Func(("Error submitting request to bad target (%d) or bad LUN (%d)\n", uTarget, uScsiLun));
+        Log2Func(("Error submitting request to bad LUN (%d)\n", uScsiLun));
         uint8_t abSense[] = { RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED,
                               0, SCSI_SENSE_ILLEGAL_REQUEST,
@@ -1157 +1171 @@
         respHdr.uResidual = cbDataOut + cbDataIn;
         virtioScsiReqErr(pThis, qIdx, pDescChain, &respHdr, abSense);
-        return VINF_SUCCESS;
-    }
-    else
-    if (RT_UNLIKELY(uTarget >= pThis->cTargets || !pTarget->fPresent))
-    {
-        Log2Func(("Error submitting request, target not present!!\n"));
-        uint8_t abSense[] = { RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED,
-                              0, SCSI_SENSE_NOT_READY, 0, 0, 0, 0, 10, 0, 0, 0 };
-        struct REQ_RESP_HDR respHdr = { 0 };
-        respHdr.uSenseLen = sizeof(abSense);
-        respHdr.uStatus   = SCSI_STATUS_CHECK_CONDITION;
-        respHdr.uResponse = VIRTIOSCSI_S_BAD_TARGET;
-        respHdr.uResidual = cbDataIn + cbDataOut;
-        virtioScsiReqErr(pThis, qIdx, pDescChain, &respHdr , abSense);
         return VINF_SUCCESS;
     }