Changeset 29326 in vbox for trunk/src/VBox/Devices/PC/BIOS

Timestamp:

May 11, 2010 10:08:13 AM (15 years ago)

Author:

vboxsync

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

61431

Message:

LsiLogic: Make the SAS controller a separate device to make it possible to have both types in one VM

File:

• trunk/src/VBox/Devices/PC/BIOS/scsi.c (modified) (5 diffs)

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -20 +20 @@
 /* The I/O port of the LsiLogic SCSI adapter. */
 #define LSILOGIC_ISA_IO_PORT 0x340
+/* The I/O port of the LsiLogic SAS adapter. */
+#define LSILOGIC_SAS_ISA_IO_PORT 0x350
 
 #define VBOXSCSI_REGISTER_STATUS   0
@@ -284 +286 @@
 
     ebda_seg = read_word(0x0040, 0x000E);
-
-    write_byte(ebda_seg, &EbdaData->scsi.hdcount, 0);
 
     /* Go through target devices. */
@@ -366 +366 @@
                     cylinders = (uint32_t)(sectors / (heads * sectors_per_track));
                 }
-                else if (io_base == LSILOGIC_ISA_IO_PORT)
+                else if (io_base == LSILOGIC_ISA_IO_PORT || io_base == LSILOGIC_SAS_ISA_IO_PORT)
                 {
                     /* This is from the BusLogic driver in the Linux kernel. */
@@ -442 +442 @@
 {
     Bit8u identifier;
+    Bit16u ebda_seg;
+
+
+    ebda_seg = read_word(0x0040, 0x000E);
+    write_byte(ebda_seg, &EbdaData->scsi.hdcount, 0);
 
     identifier = 0;
@@ -476 +481 @@
         VBOXSCSI_DEBUG("scsi_init: LsiLogic SCSI adapter not detected\n");
     }
+
+    /* Detect LsiLogic SAS adapter. */
+    outb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY, 0x55);
+    identifier = inb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_IDENTIFY);
+
+    if (identifier == 0x55)
+    {
+        /* Detected - Enumerate attached devices. */
+        VBOXSCSI_DEBUG("scsi_init: LsiLogic SAS adapter detected\n");
+        outb(LSILOGIC_SAS_ISA_IO_PORT+VBOXSCSI_REGISTER_RESET, 0);
+        scsi_enumerate_attached_devices(LSILOGIC_SAS_ISA_IO_PORT);
+    }
+    else
+    {
+        VBOXSCSI_DEBUG("scsi_init: LsiLogic SAS adapter not detected\n");
+    }
 }