Changeset 33115 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 13, 2010 8:13:45 PM (14 years ago)

Author:

vboxsync

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

66647

Message:

LsiLogic: Implement enough of the FW Upload/Download requests to make OS X work

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevLsiLogicSCSI.cpp (modified) (3 diffs)
• DevLsiLogicSCSI.h (modified) (4 diffs)

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

@@ -923 +923 @@
             rc = lsilogicProcessConfigurationRequest(pLsiLogic, pConfigurationReq, &pReply->Configuration);
             AssertRC(rc);
+            break;
+        }
+        case MPT_MESSAGE_HDR_FUNCTION_FW_UPLOAD:
+        {
+            PMptFWUploadRequest pFWUploadReq = (PMptFWUploadRequest)pMessageHdr;
+
+            pReply->FWUpload.u8ImageType        = pFWUploadReq->u8ImageType;
+            pReply->FWUpload.u8MessageLength    = 6;
+            pReply->FWUpload.u32ActualImageSize = 0;
+            break;
+        }
+        case MPT_MESSAGE_HDR_FUNCTION_FW_DOWNLOAD:
+        {
+            //PMptFWDownloadRequest pFWDownloadReq = (PMptFWDownloadRequest)pMessageHdr;
+
+            pReply->FWDownload.u8MessageLength    = 5;
             break;
         }
@@ -3565 +3581 @@
                 break;
             case MPT_MESSAGE_HDR_FUNCTION_FW_DOWNLOAD:
-                AssertMsgFailed(("todo\n"));
+                cbRequest = sizeof(MptFWDownloadRequest);
+                break;
+            case MPT_MESSAGE_HDR_FUNCTION_FW_UPLOAD:
+                cbRequest = sizeof(MptFWUploadRequest);
                 break;
             default:
@@ -3686 +3705 @@
 
             rc = pTaskState->pTargetDevice->pDrvSCSIConnector->pfnSCSIRequestSend(pTaskState->pTargetDevice->pDrvSCSIConnector,
-                                                                                    &pTaskState->PDMScsiRequest);
+                                                                                  &pTaskState->PDMScsiRequest);
             AssertMsgRCReturn(rc, ("Sending request to SCSI layer failed rc=%Rrc\n", rc), rc);
             return VINF_SUCCESS;

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h

@@ -226 +226 @@
 #define MPT_MESSAGE_HDR_FUNCTION_TARGET_STATUS_SEND     (0x0C)
 #define MPT_MESSAGE_HDR_FUNCTION_TARGET_MODE_ABORT      (0x0D)
+#define MPT_MESSAGE_HDR_FUNCTION_FW_UPLOAD              (0x12)
 
 #ifdef DEBUG
@@ -627 +628 @@
 
 /**
+ * FW download request.
+ */
+#pragma pack(1)
+typedef struct MptFWDownloadRequest
+{
+    /** Switch - Turns event notification on and off. */
+    uint8_t     u8ImageType;
+    /** Reserved. */
+    uint8_t     u8Reserved1;
+    /** Chain offset. */
+    uint8_t     u8ChainOffset;
+    /** Function number. */
+    uint8_t     u8Function;
+    /** Reserved. */
+    uint8_t     u8Reserved2[3];
+    /** Message flags. */
+    uint8_t     u8MessageFlags;
+    /** Message context ID. */
+    uint32_t    u32MessageContext;
+} MptFWDownloadRequest, *PMptFWDownloadRequest;
+#pragma pack()
+AssertCompileSize(MptFWDownloadRequest, 12);
+
+#define MPT_FW_DOWNLOAD_REQUEST_IMAGE_TYPE_RESERVED 0
+#define MPT_FW_DOWNLOAD_REQUEST_IMAGE_TYPE_FIRMWARE 1
+#define MPT_FW_DOWNLOAD_REQUEST_IMAGE_TYPE_MPI_BIOS 2
+#define MPT_FW_DOWNLOAD_REQUEST_IMAGE_TYPE_NVDATA   3
+
+/**
+ * FW download reply.
+ */
+#pragma pack(1)
+typedef struct MptFWDownloadReply
+{
+    /** Reserved. */
+    uint16_t    u16Reserved1;
+    /** Message length. */
+    uint8_t     u8MessageLength;
+    /** Function number. */
+    uint8_t     u8Function;
+    /** Reserved. */
+    uint8_t     u8Reserved2[3];
+    /** Message flags. */
+    uint8_t     u8MessageFlags;
+    /** Message context ID. */
+    uint32_t    u32MessageContext;
+    /** Reserved. */
+    uint16_t    u16Reserved2;
+    /** IO controller status. */
+    uint16_t    u16IOCStatus;
+    /** IO controller log information. */
+    uint32_t    u32IOCLogInfo;
+} MptFWDownloadReply, *PMptFWDownloadReply;
+#pragma pack()
+AssertCompileSize(MptFWDownloadReply, 20);
+
+/**
+ * FW upload request.
+ */
+#pragma pack(1)
+typedef struct MptFWUploadRequest
+{
+    /** Requested image type. */
+    uint8_t     u8ImageType;
+    /** Reserved. */
+    uint8_t     u8Reserved1;
+    /** Chain offset. */
+    uint8_t     u8ChainOffset;
+    /** Function number. */
+    uint8_t     u8Function;
+    /** Reserved. */
+    uint8_t     u8Reserved2[3];
+    /** Message flags. */
+    uint8_t     u8MessageFlags;
+    /** Message context ID. */
+    uint32_t    u32MessageContext;
+} MptFWUploadRequest, *PMptFWUploadRequest;
+#pragma pack()
+AssertCompileSize(MptFWUploadRequest, 12);
+
+/**
+ * FW upload reply.
+ */
+#pragma pack(1)
+typedef struct MptFWUploadReply
+{
+    /** Image type. */
+    uint8_t     u8ImageType;
+    /** Reserved. */
+    uint8_t     u8Reserved1;
+    /** Message length. */
+    uint8_t     u8MessageLength;
+    /** Function number. */
+    uint8_t     u8Function;
+    /** Reserved. */
+    uint8_t     u8Reserved2[3];
+    /** Message flags. */
+    uint8_t     u8MessageFlags;
+    /** Message context ID. */
+    uint32_t    u32MessageContext;
+    /** Reserved. */
+    uint16_t    u16Reserved2;
+    /** IO controller status. */
+    uint16_t    u16IOCStatus;
+    /** IO controller log information. */
+    uint32_t    u32IOCLogInfo;
+    /** Uploaded image size. */
+    uint32_t    u32ActualImageSize;
+} MptFWUploadReply, *PMptFWUploadReply;
+#pragma pack()
+AssertCompileSize(MptFWUploadReply, 24);
+
+/**
  * SCSI IO Request
  */
@@ -1013 +1127 @@
     MptSCSITaskManagementRequest SCSITaskManagement;
     MptConfigurationRequest      Configuration;
+    MptFWDownloadRequest         FWDownload;
+    MptFWUploadRequest           FWUpload;
 } MptRequestUnion, *PMptRequestUnion;
 
@@ -1031 +1147 @@
     MptSCSITaskManagementReply SCSITaskManagement;
     MptConfigurationReply      Configuration;
+    MptFWDownloadReply         FWDownload;
+    MptFWUploadReply           FWUpload;
 } MptReplyUnion, *PMptReplyUnion;