Changeset 36 for trunk/src/os2ahci/ahci.c

Timestamp:

Nov 5, 2010, 1:40:22 PM (15 years ago)

Author:

markus

Message:

Heureka! Fixed problems on real hardware (AHCI enabled bit must be set explicitly for each command...)

Location:

trunk/src/os2ahci

Files:

• . (modified) (1 prop)
• ahci.c (modified) (4 diffs)

trunk/src/os2ahci

@@ -8 +8 @@
 *.out
 *.map
+TAGS
+bldday.h

@@ -8 +8 @@
 *.out
 *.map
+TAGS
+bldday.h

trunk/src/os2ahci/ahci.c

@@ -546 +546 @@
   }
 
-  /* clear any pending adapter-level interrupts */
+  /* clear pending interrupt status */
   writel(ai->mmio + HOST_IRQ_STAT, readl(ai->mmio + HOST_IRQ_STAT));
   readl(ai->mmio + HOST_IRQ_STAT); /* flush */
@@ -671 +671 @@
   ahci_start_fis_rx(ai, p);
 
-  /* enable DMA */
+  /* enable command engine */
   ahci_start_engine(ai, p);
 
@@ -752 +752 @@
   }
 
-  /* disable DMA */
+  /* disable command engine */
   if ((rc = ahci_stop_engine(ai, p)) != 0) {
     dprintf("error: failed to stop port HW engine (%d)\n", rc);
@@ -847 +847 @@
   u16 cmd_max = ai->cmd_max;
   int i;
+
+  /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
+   * disabled, either during the boot sequence (by the BIOS) or by
+   * something else. The Linux AHCI drivers have this call in the
+   * command processing chain, and apparently for a good reason because
+   * without this, commands won't be executed.
+   */
+  ahci_enable_ahci(ai);
 
   /* determine whether this will be an NCQ request */

@@ -8 +8 @@
 *.out
 *.map
+TAGS
+bldday.h