儲存庫 vbox 的更動 68611

時間撮記:

2017-9-1 下午06:03:23 (7 年 以前)

作者:

vboxsync

訊息:

BIOS: Implemented timeout when waiting for drives to initialize after port reset.

位置:

trunk/src/VBox/Devices/PC/BIOS

檔案:

• ahci.c (修改) (2 筆差異)
• orgs.asm (修改) (1 筆差異)

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

@@ -637 +637 @@
 }
 
+/* Wait for the specified number of BIOS timer ticks or data bytes. */
+void wait_ticks_device_init( unsigned wait_ticks, unsigned wait_bytes )
+{
+}
+
 void ahci_port_detect_device(ahci_t __far *ahci, uint8_t u8Port)
 {
-    uint32_t            val;
-    bio_dsk_t __far     *bios_dsk;
+    uint32_t                val;
+    bio_dsk_t __far         *bios_dsk;
+    volatile uint32_t __far *ticks;
+    uint32_t                end_tick;
+    int                     device_found = 0;
 
     ahci_port_init(ahci, u8Port);
@@ -654 +662 @@
     VBOXAHCI_PORT_WRITE_REG(ahci->iobase, u8Port, AHCI_REG_PORT_SCTL, 0);
 
-    /* Check if there is a device on the port. */
-    VBOXAHCI_PORT_READ_REG(ahci->iobase, u8Port, AHCI_REG_PORT_SSTS, val);
-    if (ahci_ctrl_extract_bits(val, 0xfL, 0) == 0)
-        return; /* No device detected. */
-
-    do
+    /*
+     * We do however have to wait for the device to initialize (the port reset
+     * to complete). That can take up to 10ms according to the SATA spec (device
+     * must send COMINIT within 10ms of COMRESET). We should be generous with
+     * the wait because in the typical case there are no ports without a device
+     * attached.
+     */
+    ticks = MK_FP( 0x40, 0x6C );
+    end_tick = *ticks + 3;  /* Wait up to five BIOS ticks, something in 150ms range. */
+
+    while( *ticks < end_tick )
     {
+        /* If PxSSTS.DET is 3, everything went fine. */
         VBOXAHCI_PORT_READ_REG(ahci->iobase, u8Port, AHCI_REG_PORT_SSTS, val);
-    } while (ahci_ctrl_extract_bits(val, 0xfL, 0) == 0x1);
+        if (ahci_ctrl_extract_bits(val, 0xfL, 0) == 3) {
+            device_found = 1;
+            break;
+        }
+    }
+
+    /* Timed out, no device detected. */
+    if (!device_found) {
+        DBG_AHCI("AHCI: Timed out, no device detected on port %d\n", u8Port);
+        return;
+    }
 
     if (ahci_ctrl_extract_bits(val, 0xfL, 0) == 0x3)

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -618 +618 @@
 ifdef VBOX_WITH_AHCI
                 ; AHCI driver setup
+                ;; TODO: AHCI initialization needs timer, but enabling
+                ;; interrupts elsewhere may be risky. Just do it around
+                ;; the AHCI init.
+                sti
                 call    _ahci_init
+                cli
 endif