Ticket #12357: ahci-rework-v1.diff

src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h

@@ -130 +130 @@
     PORT_CMD_ATAPI  = (1 << 24),    // Device is ATAPI
     PORT_CMD_CR     = (1 << 15),    // Command List Running (DMA active)
     PORT_CMD_FR     = (1 << 14),    // FIS Receive Running
-    PORT_CMD_FER    = (1 << 4),     // FIS Receive Enable
+    PORT_CMD_FRE    = (1 << 4),     // FIS Receive Enable
     PORT_CMD_CLO    = (1 << 3),     // Command List Override
     PORT_CMD_POD    = (1 << 2),     // Power On Device
     PORT_CMD_SUD    = (1 << 1),     // Spin-up Device

src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp

@@ -132 +132 @@
     fRegs->cmd = (fRegs->cmd & ~PORT_CMD_ICC_MASK) | PORT_CMD_ICC_ACTIVE;
 
     // enable FIS receive
-    fRegs->cmd |= PORT_CMD_FER;
+    fRegs->cmd |= PORT_CMD_FRE;
 
     FlushPostedWrites();
 
@@ -146 +146 @@
 {
     TRACE("AHCIPort::Init2 port %d\n", fIndex);
 
-    // start DMA engine
-    fRegs->cmd |= PORT_CMD_ST;
+    // enable port
+    Enable(true);
 
     // enable interrupts
     fRegs->ie = PORT_INT_MASK;
 
     FlushPostedWrites();
 
-    ResetPort(true);
-
     TRACE("ie   0x%08" B_PRIx32 "\n", fRegs->ie);
     TRACE("is   0x%08" B_PRIx32 "\n", fRegs->is);
     TRACE("cmd  0x%08" B_PRIx32 "\n", fRegs->cmd);
@@ -181 +179 @@
 {
     TRACE("AHCIPort::Uninit port %d\n", fIndex);
 
-    // disable FIS receive
-    fRegs->cmd &= ~PORT_CMD_FER;
-
-    // wait for receive completion, up to 500ms
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) {
-        TRACE("AHCIPort::Uninit port %d error FIS rx still running\n", fIndex);
-    }
-
-    // stop DMA engine
-    fRegs->cmd &= ~PORT_CMD_ST;
-
-    // wait for DMA completion
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
-        TRACE("AHCIPort::Uninit port %d error DMA engine still running\n",
-            fIndex);
-    }
+    // shutdown the port
+    Enable(false);
 
     // disable interrupts
     fRegs->ie = 0;
@@ -240 +224 @@
 AHCIPort::ResetPort(bool forceDeviceReset)
 {
     if (!fTestUnitReadyActive)
-        TRACE("AHCIPort::ResetPort port %d\n", fIndex);
+        TRACE("%s: port %d\n", __func__, fIndex);
 
-    // stop DMA engine
-    fRegs->cmd &= ~PORT_CMD_ST;
-    FlushPostedWrites();
-
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
-        TRACE("AHCIPort::ResetPort port %d error DMA engine doesn't stop\n",
-            fIndex);
-    }
+    // stop port, flush transactions
+    Enable(false);
 
     bool deviceBusy = fRegs->tfd & (ATA_BSY | ATA_DRQ);
 
@@ -261 +239 @@
     if (deviceBusy || forceDeviceReset)
         ResetDevice();
 
-    // start DMA engine
-    fRegs->cmd |= PORT_CMD_ST;
-    FlushPostedWrites();
+    // start port
+    Enable(true);
 
     return PostReset();
 }
@@ -417 +394 @@
         TRACE("Port Connect Change\n");
         // Spec v1.3, §6.2.2.3 Recovery of Unsolicited COMINIT
 
+        // TODO: Do we need to disable the port here? Or is ST clear?
+
         // perform a hard reset
         _HardReset();
 
@@ -1320 +1299 @@
 
 
 void
+AHCIPort::Enable(bool enable)
+{
+    TRACE("%s: port %d\n", __func__, fIndex);
+
+    if ((fRegs->cmd & PORT_CMD_ST) != 0) {
+        if (enable) {
+            TRACE("%s: Starting port already running!\n", __func__);
+            return;
+        }
+
+        // wait for DMA completion if port running
+        if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
+            TRACE("AHCIPort::Uninit port %d error DMA engine still running\n",
+                fIndex);
+        }
+    }
+
+    if (enable) {
+        // Start port
+        fRegs->cmd |= PORT_CMD_FRE;
+        fRegs->cmd |= PORT_CMD_ST;
+        FlushPostedWrites();
+        return;
+    }
+
+    // Clear FRE and wait for completion
+    fRegs->cmd &= ~PORT_CMD_FRE;
+    FlushPostedWrites();
+    if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) {
+        TRACE("%s: port %d error FIS receive still running\n", __func__,
+            fIndex);
+    }
+
+    // Clear DMA engine and wait for completion
+    fRegs->cmd &= ~PORT_CMD_ST;
+    FlushPostedWrites();
+    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
+        TRACE("%s: port %d error DMA engine still running\n", __func__,
+            fIndex);
+    }
+}
+
+
+void
 AHCIPort::_HardReset()
 {
+    TRACE("%s: Called on port %d\n", __func__, fIndex);
     if ((fRegs->cmd & PORT_CMD_ST) != 0) {
         // We shouldn't perform a reset, but at least document it
-        TRACE("AHCIPort::_HardReset() PORT_CMD_ST set, behaviour undefined\n");
+        TRACE("%s: PORT_CMD_ST set, bypassing hard reset\n", __func__);
+        return;
     }
 
     fRegs->sctl = (fRegs->sctl & ~SATA_CONTROL_DET_MASK)

src/add-ons/kernel/busses/scsi/ahci/ahci_port.h

@@ -50 +50 @@
     void        ResetDevice();
     status_t    ResetPort(bool forceDeviceReset = false);
     status_t    PostReset();
+    void        Enable(bool enabled);
+
     void        FlushPostedWrites();
     void        DumpD2HFis();