Changeset 25487 in vbox

Timestamp:

Dec 18, 2009 2:28:03 PM (15 years ago)

Author:

vboxsync

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

56157

Message:

LsiLogic: Implement missing reset method. Fixes Windows 7 guests

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (3 diffs)

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

@@ -2142 +2142 @@
 
 #define LSILOGIC_REG_WRITE_SEQUENCE    0x04
+
 #define LSILOGIC_REG_HOST_DIAGNOSTIC   0x08
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_DIAG_MEM_ENABLE     (RT_BIT(0))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_DISABLE_ARM         (RT_BIT(1))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_RESET_ADAPTER       (RT_BIT(2))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_DIAG_RW_ENABLE      (RT_BIT(4))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_RESET_HISTORY       (RT_BIT(5))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_FLASH_BAD_SIG       (RT_BIT(6))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_DRWE                (RT_BIT(7))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_PREVENT_IOC_BOOT    (RT_BIT(9))
+# define LSILOGIC_REG_HOST_DIAGNOSTIC_CLEAR_FLASH_BAD_SIG (RT_BIT(10))
+
 #define LSILOGIC_REG_TEST_BASE_ADDRESS 0x0c
 #define LSILOGIC_REG_DIAG_RW_DATA      0x10
@@ -2888 +2899 @@
             break;
         }
+        case LSILOGIC_REG_HOST_DIAGNOSTIC:
+        {
+#ifndef IN_RING3
+            return VINF_IOM_HC_IOPORT_WRITE;
+#else
+            if (u32 & LSILOGIC_REG_HOST_DIAGNOSTIC_RESET_ADAPTER)
+            {
+                lsilogicHardReset(pThis);
+            }
+            break;
+#endif
+        }
         default: /* Ignore. */
         {
@@ -2968 +2991 @@
             break;
         }
-        case LSILOGIC_REG_HOST_DIAGNOSTIC: /* The spec doesn't say anything about these registers, so we just ignore them */
-        case LSILOGIC_REG_TEST_BASE_ADDRESS:
+        case LSILOGIC_REG_HOST_DIAGNOSTIC:
+        {
+            if (pThis->fDiagnosticEnabled)
+                u32 = LSILOGIC_REG_HOST_DIAGNOSTIC_DRWE;
+            else
+                u32 = 0;
+            break;
+        }
+        case LSILOGIC_REG_TEST_BASE_ADDRESS: /* The spec doesn't say anything about these registers, so we just ignore them */
         case LSILOGIC_REG_DIAG_RW_DATA:
         case LSILOGIC_REG_DIAG_RW_ADDRESS: