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

Timestamp:

Jan 19, 2011 3:40:11 PM (14 years ago)

Author:

vboxsync

Message:

BusLogic: Properly fail some Adaptec 154xC commands that a guest may send.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (5 diffs)

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

@@ -16 +16 @@
  */
 
-/* Implemented looking at the driver source in the linux kernel (drivers/scsi/BusLogic.[ch]). */
+/* Implemented looking at the driver source in the linux kernel (drivers/scsi/BusLogic.[ch]). 
+ * See also: http://www.drdobbs.com/184410111
+ */
 
 /*******************************************************************************
@@ -140 +142 @@
     BUSLOGICCOMMAND_INQUIRE_TARGET_DEVICES = 0x24,
     BUSLOGICCOMMAND_DISABLE_HOST_ADAPTER_INTERRUPT = 0x25,
+    BUSLOGICCOMMAND_EXT_BIOS_INFO = 0x28,
+    BUSLOGICCOMMAND_UNLOCK_MAILBOX = 0x29,
     BUSLOGICCOMMAND_INITIALIZE_EXTENDED_MAILBOX = 0x81,
     BUSLOGICCOMMAND_EXECUTE_SCSI_COMMAND = 0x83,
@@ -1494 +1498 @@
             break;
         }
+        case BUSLOGICCOMMAND_EXT_BIOS_INFO:
+        case BUSLOGICCOMMAND_UNLOCK_MAILBOX:
+            /* Commands valid for Adaptec 154xC which we don't handle since
+             * we pretend being 154xB compatible. Just mark the command as invalid.
+             */
+            Log(("Command %#x not valid for this adapter\n", pBusLogic->uOperationCode));
+            pBusLogic->cbReplyParametersLeft = 0;
+            pBusLogic->regStatus |= BUSLOGIC_REGISTER_STATUS_COMMAND_INVALID;
+            break;
         case BUSLOGICCOMMAND_EXECUTE_MAILBOX_COMMAND: /* Should be handled already. */
         default:
@@ -1641 +1654 @@
                 pBusLogic->iParameter = 0;
 
-                /* Mark host adapter as busy. */
-                pBusLogic->regStatus &= ~BUSLOGIC_REGISTER_STATUS_HOST_ADAPTER_READY;
+                /* Mark host adapter as busy and clear the invalid status bit. */
+                pBusLogic->regStatus &= ~(BUSLOGIC_REGISTER_STATUS_HOST_ADAPTER_READY | BUSLOGIC_REGISTER_STATUS_COMMAND_INVALID);
 
                 /* Get the number of bytes for parameters from the command code. */
@@ -1673 +1686 @@
                     case BUSLOGICCOMMAND_INITIALIZE_EXTENDED_MAILBOX:
                         pBusLogic->cbCommandParametersLeft = sizeof(RequestInitializeExtendedMailbox);
+                        break;
+                    case BUSLOGICCOMMAND_EXT_BIOS_INFO:
+                    case BUSLOGICCOMMAND_UNLOCK_MAILBOX:
+                        /* Invalid commands. */
+                        pBusLogic->cbCommandParametersLeft = 0;
                         break;
                     case BUSLOGICCOMMAND_EXECUTE_MAILBOX_COMMAND: /* Should not come here anymore. */